-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
OPSEXP-2291 Bump Search services chart to most recent conventions (#179)
- Loading branch information
Showing
40 changed files
with
545 additions
and
415 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,9 @@ | ||
| dependencies: | ||
| - name: alfresco-insight-zeppelin | ||
| repository: "" | ||
| version: 2.2.0 | ||
| version: 3.0.0-alpha.0 | ||
| - name: alfresco-common | ||
| repository: https://alfresco.github.io/alfresco-helm-charts/ | ||
| version: 2.1.0 | ||
| digest: sha256:d936b2a9611e46791878d3a7ead2d61fc97e65e343955aeb247b4709f124a725 | ||
| generated: "2023-09-13T17:05:38.325916+02:00" | ||
| version: 3.1.0 | ||
| digest: sha256:611a989ecff183861c046d6090836371cac0abb9fee3e05278d239769a568cbc | ||
| generated: "2024-01-08T17:15:25.064429+01:00" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 3 additions & 3 deletions
6
charts/alfresco-search-service/charts/alfresco-insight-zeppelin/Chart.lock
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| dependencies: | ||
| - name: alfresco-common | ||
| repository: https://alfresco.github.io/alfresco-helm-charts/ | ||
| version: 2.1.0 | ||
| digest: sha256:fa11b87976e8340dfe349a0bc7d672c197decf3303de5bbe102c19f6216690fa | ||
| generated: "2023-08-18T17:03:16.720641+02:00" | ||
| version: 3.1.0 | ||
| digest: sha256:9c28428c3dce7c46decd859744075a51482adc21b4c21427840695fcaa23039d | ||
| generated: "2024-01-05T16:35:03.929458+01:00" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
4 changes: 4 additions & 0 deletions
4
charts/alfresco-search-service/charts/alfresco-insight-zeppelin/templates/_helpers-name.tpl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,4 @@ | ||
| {{- define "alfresco-insight-zeppelin.deployment.name" -}} | ||
| {{- $scope := (dict "Values" (dict "nameOverride" "insight-zeppelin" ) "Chart" .Chart "Release" .Release) }} | ||
| {{- include "alfresco-insight-zeppelin.fullname" $scope }} | ||
| {{- end }} |
68 changes: 51 additions & 17 deletions
68
charts/alfresco-search-service/charts/alfresco-insight-zeppelin/templates/_helpers.tpl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,28 +1,62 @@ | ||
| {{/* | ||
| Get Alfresco Insight Zeppelin Full Name | ||
| Expand the name of the chart. | ||
| */}} | ||
| {{- define "alfresco-insight-zeppelin.fullName" -}} | ||
| {{- $name := default .Chart.Name .Values.nameOverride -}} | ||
| {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" -}} | ||
| {{- end -}} | ||
| {{- define "alfresco-insight-zeppelin.name" -}} | ||
| {{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }} | ||
| {{- end }} | ||
|
|
||
| {{/* | ||
| Get Alfresco Zeppelin Host | ||
| Create a default fully qualified app name. | ||
| We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). | ||
| If release name contains chart name it will be used as a full name. | ||
| */}} | ||
| {{- define "alfresco-insight-zeppelin.host" -}} | ||
| {{- printf "%s-%s" .Release.Name "alfresco-insight-zeppelin" -}} | ||
| {{- end -}} | ||
| {{- define "alfresco-insight-zeppelin.fullname" -}} | ||
| {{- if .Values.fullnameOverride }} | ||
| {{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }} | ||
| {{- else }} | ||
| {{- $name := default .Chart.Name .Values.nameOverride }} | ||
| {{- if contains $name .Release.Name }} | ||
| {{- .Release.Name | trunc 63 | trimSuffix "-" }} | ||
| {{- else }} | ||
| {{- printf "%s-%s" .Release.Name $name | trunc 63 | trimSuffix "-" }} | ||
| {{- end }} | ||
| {{- end }} | ||
| {{- end }} | ||
|
|
||
| {{/* | ||
| Get Alfresco Repo Host | ||
| Create chart name and version as used by the chart label. | ||
| */}} | ||
| {{- define "alfresco-repo-host" -}} | ||
| {{- .Values.repository.host | default (printf "%s-repository" (include "content-services.shortname" $)) }} | ||
| {{- end -}} | ||
| {{- define "alfresco-insight-zeppelin.chart" -}} | ||
| {{- printf "%s-%s" .Chart.Name .Chart.Version | replace "+" "_" | trunc 63 | trimSuffix "-" }} | ||
| {{- end }} | ||
|
|
||
| {{/* | ||
| Get Alfresco Repo Port | ||
| Common labels | ||
| */}} | ||
| {{- define "alfresco-repo-port" -}} | ||
| {{- .Values.repository.port | default 80 }} | ||
| {{- end -}} | ||
| {{- define "alfresco-insight-zeppelin.labels" -}} | ||
| helm.sh/chart: {{ include "alfresco-insight-zeppelin.chart" . }} | ||
| {{ include "alfresco-insight-zeppelin.selectorLabels" . }} | ||
| {{- if .Chart.AppVersion }} | ||
| app.kubernetes.io/version: {{ .Chart.AppVersion | quote }} | ||
| {{- end }} | ||
| app.kubernetes.io/managed-by: {{ .Release.Service }} | ||
| {{- end }} | ||
|
|
||
| {{/* | ||
| Selector labels | ||
| */}} | ||
| {{- define "alfresco-insight-zeppelin.selectorLabels" -}} | ||
| app.kubernetes.io/name: {{ include "alfresco-insight-zeppelin.name" . }} | ||
| app.kubernetes.io/instance: {{ .Release.Name }} | ||
| {{- end }} | ||
|
|
||
| {{/* | ||
| Create the name of the service account to use | ||
| */}} | ||
| {{- define "alfresco-insight-zeppelin.serviceAccountName" -}} | ||
| {{- if .Values.serviceAccount.create }} | ||
| {{- default (include "alfresco-insight-zeppelin.fullname" .) .Values.serviceAccount.name }} | ||
| {{- else }} | ||
| {{- default "default" .Values.serviceAccount.name }} | ||
| {{- end }} | ||
| {{- end }} |
20 changes: 9 additions & 11 deletions
20
charts/alfresco-search-service/charts/alfresco-insight-zeppelin/templates/config.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,15 @@ | ||
| --- | ||
| # Defines the config for the Alfresco Insight Zeppelin App | ||
| {{- if not .Values.repository.existingConfigMap.name }} | ||
| apiVersion: v1 | ||
| kind: ConfigMap | ||
| metadata: | ||
| name: {{ template "alfresco-insight-zeppelin.fullName" . }}-configmap | ||
| name: {{ template "alfresco-insight-zeppelin.deployment.name" . }} | ||
| labels: | ||
| heritage: {{ .Release.Service }} | ||
| release: {{ .Release.Name }} | ||
| chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} | ||
| component: zeppelin | ||
| {{- include "alfresco-insight-zeppelin.labels" . | nindent 4 }} | ||
| data: | ||
| REPO_HOST: "{{ template "alfresco-repo-host" . }}" | ||
| REPO_PORT: "{{ template "alfresco-repo-port" . }}" | ||
| {{- range $key, $value := .Values.environment }} | ||
| {{ $key }}: {{ $value }} | ||
| {{- with .Values.repository }} | ||
| REPO_HOST: >- | ||
| {{ template "alfresco-common.url.host" .url }} | ||
| REPO_PORT: >- | ||
| {{ template "alfresco-common.url.port" .url }} | ||
| {{- end }} | ||
| {{- end }} |
Oops, something went wrong.