From 2a2f1e8b5a74560a96c3cc8197ef66a9f892479c Mon Sep 17 00:00:00 2001 From: Floris van der Grinten Date: Thu, 29 Apr 2021 12:24:32 +0200 Subject: [PATCH 1/6] Update Connect server to v1.1.0 --- connect/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/connect/Chart.yaml b/connect/Chart.yaml index 5aa339b..f7d2fe3 100644 --- a/connect/Chart.yaml +++ b/connect/Chart.yaml @@ -11,4 +11,4 @@ maintainers: - name: 1Password Secrets Integrations Team email: support+business@1password.com icon: https://avatars.githubusercontent.com/u/38230737 -appVersion: "1.0.0" +appVersion: "1.1.0" From 830c3af0d6d37b7156f5cb780edd66ff6ff81d34 Mon Sep 17 00:00:00 2001 From: Floris van der Grinten Date: Thu, 29 Apr 2021 12:36:19 +0200 Subject: [PATCH 2/6] Remove redundant version pin from default values.yaml The version is already pinned in the Chart.yaml --- connect/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/connect/values.yaml b/connect/values.yaml index 83702a6..e51516d 100644 --- a/connect/values.yaml +++ b/connect/values.yaml @@ -16,7 +16,7 @@ connect: type: emptyDir values: {} imagePullPolicy: IfNotPresent - version: "1.0.0" + version: nodeSelector: {} operator: From 428f32550b3bc6aa75c8fef3b077eaf1d40b0f6b Mon Sep 17 00:00:00 2001 From: Floris van der Grinten Date: Thu, 29 Apr 2021 12:42:12 +0200 Subject: [PATCH 3/6] Update README with new default --- connect/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/connect/README.md b/connect/README.md index 3705ea6..adb79cf 100644 --- a/connect/README.md +++ b/connect/README.md @@ -61,7 +61,7 @@ $ helm install --set connect.applicationName=connect connect ./connect | connect.sync.imageRepository | string | `"1password/connect-sync` | The 1Password Connect Sync repository | | connect.sync.name | string | `"connect-sync"` | The name of the 1Password Connect Sync container | | connect.sync.resources | object | `{}` | The resources requests/limits for the 1Password Connect Sync pod | -| connect.version | string | `"0.3"` | The 1Password Connect version to pull | +| connect.version | string | `{{ .Chart.AppVersion }}` | The 1Password Connect version to pull | | operator.autoRestart | boolean | `false` | Denotes whether the 1Password Connect Operator will automatically restart deployments based on associated updated secrets. | | operator.create | boolean | `false` | Denotes whether the 1Password Connect Operator will be deployed | | operator.imagePullPolicy | string | `"IfNotPresent` | The 1Password Connect Operator image pull policy | From 2857245ad8c8418d72bd1f22b71b9decf485a51b Mon Sep 17 00:00:00 2001 From: Floris van der Grinten Date: Thu, 29 Apr 2021 16:40:09 +0200 Subject: [PATCH 4/6] Explicitly set Chart AppVersion as default value --- connect/templates/connect-deployment.yaml | 6 +++--- connect/values.yaml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/connect/templates/connect-deployment.yaml b/connect/templates/connect-deployment.yaml index 5d91b20..9cd4b89 100644 --- a/connect/templates/connect-deployment.yaml +++ b/connect/templates/connect-deployment.yaml @@ -13,7 +13,7 @@ spec: metadata: labels: app: {{ .Values.connect.applicationName }} - version: "{{ .Values.connect.version }}" + version: "{{ tpl .Values.connect.version . }}" spec: {{- with .Values.connect.nodeSelector }} nodeSelector: @@ -38,7 +38,7 @@ spec: name: {{ .Values.connect.dataVolume.name }} containers: - name: {{ .Values.connect.api.name }} - image: {{ .Values.connect.api.imageRepository }}:{{ .Values.connect.version | default .Chart.AppVersion }} + image: {{ .Values.connect.api.imageRepository }}:{{ tpl .Values.connect.version . }} imagePullPolicy: {{ .Values.connect.imagePullPolicy }} securityContext: runAsUser: 999 @@ -63,7 +63,7 @@ spec: - mountPath: /home/opuser/.op/data name: {{ .Values.connect.dataVolume.name }} - name: connect-sync - image: {{ .Values.connect.sync.imageRepository }}:{{ .Values.connect.version | default .Chart.AppVersion }} + image: {{ .Values.connect.sync.imageRepository }}:{{ tpl .Values.connect.version . }} imagePullPolicy: {{ .Values.connect.imagePullPolicy }} securityContext: runAsUser: 999 diff --git a/connect/values.yaml b/connect/values.yaml index e51516d..5844190 100644 --- a/connect/values.yaml +++ b/connect/values.yaml @@ -16,7 +16,7 @@ connect: type: emptyDir values: {} imagePullPolicy: IfNotPresent - version: + version: "{{ .Chart.AppVersion }}" nodeSelector: {} operator: From f11b7603a9f0274673e5021a562b8444a46866b4 Mon Sep 17 00:00:00 2001 From: Floris van der Grinten Date: Thu, 29 Apr 2021 16:40:47 +0200 Subject: [PATCH 5/6] Move tpl note to top of values.yaml file Now that we're using it more and more. --- connect/values.yaml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/connect/values.yaml b/connect/values.yaml index 5844190..99cb72c 100644 --- a/connect/values.yaml +++ b/connect/values.yaml @@ -1,3 +1,7 @@ +# Note: values.yaml files don't support templating out of the box, so that means +# that every value "{{ .Between.Curly.Braces }}" in this file needs to be +# explicitly interpolated on the template side by using the `tpl` function. + connect: applicationName: onepassword-connect api: @@ -29,23 +33,23 @@ operator: version: "1.0.0" nodeSelector: {} watchNamespace: - - "{{ .Release.Namespace }}" # This will be interpolated in the templates, using the tpl function + - "{{ .Release.Namespace }}" token: name: onepassword-token key: token value: serviceAccount: - create: "{{ .Values.operator.create }}" # This will be interpolated in the templates, using the tpl function + create: "{{ .Values.operator.create }}" annotations: {} name: onepassword-connect-operator roleBinding: - create: "{{ .Values.operator.create }}" # This will be interpolated in the templates, using the tpl function + create: "{{ .Values.operator.create }}" name: onepassword-connect-operator clusterRole: - create: "{{ .Values.operator.create }}" # This will be interpolated in the templates, using the tpl function + create: "{{ .Values.operator.create }}" name: onepassword-connect-operator service: From 57fd9b8a24c67ef43a368c5c55be5f63b82a7903 Mon Sep 17 00:00:00 2001 From: Floris van der Grinten Date: Thu, 29 Apr 2021 16:42:33 +0200 Subject: [PATCH 6/6] Format YAML --- connect/values.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/connect/values.yaml b/connect/values.yaml index 99cb72c..50d5029 100644 --- a/connect/values.yaml +++ b/connect/values.yaml @@ -1,5 +1,5 @@ -# Note: values.yaml files don't support templating out of the box, so that means -# that every value "{{ .Between.Curly.Braces }}" in this file needs to be +# Note: values.yaml files don't support templating out of the box, so that means +# that every value "{{ .Between.Curly.Braces }}" in this file needs to be # explicitly interpolated on the template side by using the `tpl` function. connect: