diff --git a/charts/core-crd/Chart.yaml b/charts/core-crd/Chart.yaml index 3f6223b..5062b58 100644 --- a/charts/core-crd/Chart.yaml +++ b/charts/core-crd/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 name: core-crd description: A Helm chart for Kubernetes type: application -version: 3.2.0 -appVersion: "v3.2.0" +version: 3.2.1 +appVersion: "v3.2.1" maintainers: - name: Calyptia email: hello@calyptia.com diff --git a/charts/core-crd/values.yaml b/charts/core-crd/values.yaml index fd72e4d..1f247c1 100644 --- a/charts/core-crd/values.yaml +++ b/charts/core-crd/values.yaml @@ -1,6 +1,5 @@ # Turn this chart off/on enabled: true - images: hotReload: registry: ghcr.io diff --git a/charts/core-instance/Chart.yaml b/charts/core-instance/Chart.yaml index 768f019..f31b2ff 100644 --- a/charts/core-instance/Chart.yaml +++ b/charts/core-instance/Chart.yaml @@ -4,8 +4,8 @@ description: Calyptia Core Instance chart home: https://calyptia.com/products/core/ icon: https://storage.googleapis.com/calyptia_public_resources_bucket/logo-darkmode.svg type: application -version: 3.2.0 -appVersion: "v3.2.0" +version: 3.2.1 +appVersion: "v3.2.1" maintainers: - name: Calyptia email: hello@calyptia.com diff --git a/charts/core-instance/templates/NOTES.txt b/charts/core-instance/templates/NOTES.txt new file mode 100644 index 0000000..f7f5640 --- /dev/null +++ b/charts/core-instance/templates/NOTES.txt @@ -0,0 +1,21 @@ +Thank you for installing the Calyptia Core instance chart: {{ .Chart.Name }}. + +Your release is named {{ .Release.Name }}. + +Review the Calyptia Core documentation for full details: + +{{- if not (empty .Values.http_proxy) }} +WARNING: using deprecated 'http_proxy' setting, please use 'httpProxy'. +{{- end -}} + +{{- if not (empty .Values.https_proxy) }} +WARNING: using deprecated 'https_proxy' setting, please use 'httpsProxy'. +{{- end -}} + +{{- if not (empty .Values.no_proxy) }} +WARNING: using deprecated 'no_proxy' setting, please use 'noProxy'. +{{- end -}} + +{{- if not (empty .Values.cloud_proxy) }} +WARNING: using deprecated 'cloud_proxy' setting, please use 'cloudProxy'. +{{- end -}} diff --git a/charts/core-instance/templates/_helpers.tpl b/charts/core-instance/templates/_helpers.tpl index ca5cab7..35226a1 100644 --- a/charts/core-instance/templates/_helpers.tpl +++ b/charts/core-instance/templates/_helpers.tpl @@ -65,4 +65,39 @@ Return the proper Container Registry Secret Names {{- with .Values.imageCredentials }} {{- printf "{\"auths\":{\"%s\":{\"username\":\"%s\",\"password\":\"%s\",\"email\":\"%s\",\"auth\":\"%s\"}}}" .registry .username .password .email (printf "%s:%s" .username .password | b64enc) | b64enc }} {{- end -}} -{{- end -}} \ No newline at end of file +{{- end -}} + +{{/* +Support httpProxy and backwards-compatible http_proxy +*/}} +{{- define "instance.httpProxy" -}} + {{- if not (empty .Values.http_proxy) -}} + {{- printf "%s" .Values.http_proxy -}} + {{- else -}} + {{ default "" .Values.httpProxy }} + {{- end -}} +{{- end -}} + +{{- define "instance.httpsProxy" -}} + {{- if not (empty .Values.https_proxy) -}} + {{- printf "%s" .Values.https_proxy -}} + {{- else -}} + {{ default "" .Values.httpsProxy }} + {{- end -}} +{{- end -}} + +{{- define "instance.noProxy" -}} + {{- if not (empty .Values.no_proxy) -}} + {{- printf "%s" .Values.no_proxy -}} + {{- else -}} + {{ default "" .Values.noProxy }} + {{- end -}} +{{- end -}} + +{{- define "instance.cloudProxy" -}} + {{- if not (empty .Values.cloud_proxy) -}} + {{- printf "%s" .Values.cloud_proxy -}} + {{- else -}} + {{ default "" .Values.cloudProxy }} + {{- end -}} +{{- end -}} diff --git a/charts/core-instance/templates/deployment.yaml b/charts/core-instance/templates/deployment.yaml index 270bd7a..04fddec 100644 --- a/charts/core-instance/templates/deployment.yaml +++ b/charts/core-instance/templates/deployment.yaml @@ -65,13 +65,13 @@ spec: - name: TOLERATIONS value: {{ .Values.calyptiaTolerations }} - name: HTTP_PROXY - value: {{ .Values.httpProxy | quote }} + value: {{ template "instance.httpProxy" . }} - name: HTTPS_PROXY - value: {{ .Values.httpsProxy | quote }} + value: {{ template "instance.httpsProxy" . }} - name: NO_PROXY - value: {{ .Values.noProxy | quote }} + value: {{ template "instance.noProxy" . }} - name: CLOUD_PROXY - value: {{ .Values.cloudProxy | quote }} + value: {{ template "instance.cloudProxy" . }} - name: METRICS value: {{ default false .Values.metrics | quote }} image: {{ template "fromCloud.image" . }} @@ -84,7 +84,7 @@ spec: - name: CORE_INSTANCE value: {{ default .Release.Name .Values.coreInstance | quote }} - name: NAMESPACE - value: {{ .Release.Namespace | quote }} + value: {{ include "common.names.namespace" . | quote }} - name: CLOUD_URL value: {{ default "https://cloud-api.calyptia.com" .Values.cloudUrl | quote }} - name: TOKEN @@ -103,13 +103,13 @@ spec: - name: METRICS_PORT value: {{ .Values.metricsPort | toYaml }} - name: HTTP_PROXY - value: {{ .Values.httpProxy | quote }} + value: {{ template "instance.httpProxy" . }} - name: HTTPS_PROXY - value: {{ .Values.httpsProxy | quote }} + value: {{ template "instance.httpsProxy" . }} - name: NO_PROXY - value: {{ .Values.noProxy | quote }} + value: {{ template "instance.noProxy" . }} - name: CLOUD_PROXY - value: {{ .Values.cloudProxy | quote }} + value: {{ template "instance.cloudProxy" . }} - name: METRICS value: {{ default false .Values.metrics | quote }} image: {{ template "toCloud.image" . }} diff --git a/charts/core-instance/tests/core-instance_test.yaml b/charts/core-instance/tests/core-instance_test.yaml index 3d8d22d..0283f4f 100644 --- a/charts/core-instance/tests/core-instance_test.yaml +++ b/charts/core-instance/tests/core-instance_test.yaml @@ -36,8 +36,9 @@ tests: registry: custom.io repository: test/ingestcheck tag: 1.2.3 + # Use alternative forms to verify backwards compatible httpProxy: https - cloudProxy: cloud + cloud_proxy: cloud asserts: # From Cloud - equal: diff --git a/charts/core-instance/values.yaml b/charts/core-instance/values.yaml index 9acedc9..fbb2dc8 100644 --- a/charts/core-instance/values.yaml +++ b/charts/core-instance/values.yaml @@ -22,12 +22,12 @@ images: fromCloud: registry: ghcr.io repository: calyptia/core-operator/sync-from-cloud - tag: 3.2.0 + tag: 3.2.1 pullSecrets: [] toCloud: registry: ghcr.io repository: calyptia/core-operator/sync-to-cloud - tag: 3.2.0 + tag: 3.2.1 pullSecrets: [] hotReload: registry: ghcr.io diff --git a/charts/core-operator/Chart.yaml b/charts/core-operator/Chart.yaml index d760e66..194c208 100644 --- a/charts/core-operator/Chart.yaml +++ b/charts/core-operator/Chart.yaml @@ -4,8 +4,8 @@ description: Calyptia Core Operator chart home: https://calyptia.com/products/core/ icon: https://storage.googleapis.com/calyptia_public_resources_bucket/logo-darkmode.svg type: application -version: 3.2.0 -appVersion: "v3.2.0" +version: 3.2.1 +appVersion: "v3.2.1" maintainers: - name: Calyptia email: hello@calyptia.com diff --git a/charts/core-operator/templates/NOTES.txt b/charts/core-operator/templates/NOTES.txt index 88fc369..1ce574c 100644 --- a/charts/core-operator/templates/NOTES.txt +++ b/charts/core-operator/templates/NOTES.txt @@ -2,9 +2,7 @@ Thank you for installing the Calyptia Core operator chart: {{ .Chart.Name }}. Your release is named {{ .Release.Name }}. -Review the Calyptia Core documentation for full details: - -Support can be accessed via: +Review the Calyptia Core documentation for full details: To run post-installation tests please use the standard helm approach: diff --git a/charts/core-operator/values.yaml b/charts/core-operator/values.yaml index 4bb3bdf..5f60854 100644 --- a/charts/core-operator/values.yaml +++ b/charts/core-operator/values.yaml @@ -4,7 +4,7 @@ images: operator: registry: ghcr.io repository: calyptia/core-operator - tag: 3.2.0 + tag: 3.2.1 pullSecrets: [] hotReload: registry: ghcr.io