Merge pull request #40 from 1Password/connect-1.1.0

Update Connect server to v1.1.0
1Password · Apr 29, 2021 · 3868ab8 · 3868ab8
2 parents 1b97756 + 57fd9b8
commit 3868ab8
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 10 deletions.
diff --git 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"
diff --git 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 |

diff --git 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
@@ -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:
@@ -16,7 +20,7 @@ connect:
     type: emptyDir
     values: {}
   imagePullPolicy: IfNotPresent
-  version: "1.0.0"
+  version: "{{ .Chart.AppVersion }}"
   nodeSelector: {}
 
 operator:
@@ -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: