merge commit 401

Twingate · Sep 5, 2024 · 0a35d50 · 0a35d50
2 parents c888c79 + 5d0cfa7
commit 0a35d50
Show file tree

Hide file tree

Showing 10 changed files with 113 additions and 5 deletions.
diff --git a/index.yaml b/index.yaml
@@ -1,6 +1,17 @@
 apiVersion: v1
 entries:
   connector:
+  - apiVersion: v1
+    appVersion: latest
+    created: "2024-09-05T16:01:46.866022786Z"
+    description: Twingate Connector helm chart
+    digest: 206968f3351cd119c80150ed59cf370c7f8241571fc3cbc1deea6ecaf3df8387
+    home: https://www.twingate.com
+    icon: https://www.twingate.com/twingate.png
+    name: connector
+    urls:
+    - https://twingate.github.io/helm-charts/packages/connector-0.1.27.tgz
+    version: 0.1.27
   - apiVersion: v1
     appVersion: latest
     created: "2024-09-05T15:35:16.795919302Z"
@@ -189,4 +200,4 @@ entries:
     urls:
     - https://twingate.github.io/helm-charts/packages/connector-0.1.9.tgz
     version: 0.1.9
-generated: "2024-09-05T15:35:16.795164Z"
+generated: "2024-09-05T16:01:46.864896325Z"
diff --git a/packages/connector-0.1.27.tgz b/packages/connector-0.1.27.tgz
diff --git a/stable/connector/Chart.yaml b/stable/connector/Chart.yaml
@@ -4,4 +4,4 @@ home: https://www.twingate.com
 description: Twingate Connector helm chart
 icon: https://www.twingate.com/twingate.png
 name: connector
-version: 0.1.26
+version: 0.1.27
diff --git a/stable/connector/README.md b/stable/connector/README.md
@@ -72,7 +72,7 @@ The following table lists the configurable parameters of the Twingate chart and
 | `image.repository`                      | Twingate image name                                                                                                         | `twingate/connector`                                    |
 | `image.tag`                             | Twingate image tag                                                                                                          | `latest`                                                |
 | `image.pullPolicy`                      | Twingate image pull policy                                                                                                  | `Always`                                                |
-| `image.pullSecrets`                     | Specify docker-registry secret names as an array                                                                            | `[]` (does not add image pull secrets to deployed pods) |
+| `image.imagePullSecrets`                | Specify docker-registry secret names as an array                                                                            | `[]` (does not add image pull secrets to deployed pods) |
 | `nameOverride`                          | String to partially override twingate.fullname template                                                                     | `nil`                                                   |
 | `fullnameOverride`                      | String to fully override twingate.fullname template                                                                         | `nil`                                                   |
 | `icmpSupport.enabled`                   | Enable the ICMP securityContext. See more in values file                                                                    | `false`                                                 |

diff --git a/stable/connector/templates/deployment.yaml b/stable/connector/templates/deployment.yaml
@@ -34,6 +34,12 @@ spec:
     {{- end }}
     {{- if .Values.hostNetwork }}
       hostNetwork: true
+    {{- end }}
+    {{- if .Values.image.imagePullSecrets}}
+      imagePullSecrets:
+      {{- range .Values.image.imagePullSecrets }}
+        - name: {{ . }}
+      {{- end }}
     {{- end }}
       containers:
         - name: {{ .Chart.Name }}

diff --git a/stable/connector/values.schema.json b/stable/connector/values.schema.json
@@ -35,12 +35,22 @@
                         "IfNotPresent",
                         "Never"
                     ]
+                },
+                "imagePullSecrets": {
+                    "type": "array",
+                    "default": [],
+                    "title": "The imagePullSecrets Schema",
+                    "items": {
+                        "type": "string"
+                    }
                 }
             },
             "examples": [{
                 "repository": "twingate/connector",
                 "tag": 1,
-                "pullPolicy": "Always"
+                "pullPolicy": "Always",
+                "imagePullSecrets":
+                    ["dockerhub-secret"]
             }]
         },
         "hostNetwork": {
@@ -131,7 +141,9 @@
         "image": {
             "repository": "twingate/connector",
             "tag": 1,
-            "pullPolicy": "Always"
+            "pullPolicy": "Always",
+            "imagePullSecrets":
+                ["dockerhub-secret"]
         },
         "hostNetwork": false,
         "resources": {

diff --git a/stable/connector/values.yaml b/stable/connector/values.yaml
@@ -9,6 +9,7 @@ image:
   repository: twingate/connector
   tag: 1
   pullPolicy: Always
+  imagePullSecrets: []
 
 ## Enable/Disable host network for the pod
 ##

diff --git a/test/golden/default-values.yaml b/test/golden/default-values.yaml
@@ -2,6 +2,7 @@ image:
   repository: twingate/connector
   tag: 1
   pullPolicy: Always
+  imagePullSecrets: []
 
 resources:
   requests:

diff --git a/test/golden/image-pull-secrets.golden.yaml b/test/golden/image-pull-secrets.golden.yaml
@@ -0,0 +1,69 @@
+---
+# Source: connector/templates/secret.yaml
+apiVersion: v1
+kind: Secret
+metadata:
+  name: test-connector
+  labels:
+    app.kubernetes.io/name: connector
+    helm.sh/chart: connector-major.minor.patch-test
+    app.kubernetes.io/instance: test
+    app.kubernetes.io/version: "latest"
+    app.kubernetes.io/managed-by: Helm
+type: Opaque
+data:
+  TWINGATE_ACCESS_TOKEN: "QUNDRVNTX1RPS0VO"
+  TWINGATE_REFRESH_TOKEN: "UkVGUkVTSF9UT0tFTg=="
+---
+# Source: connector/templates/deployment.yaml
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: test-connector
+  labels:
+    app.kubernetes.io/name: connector
+    helm.sh/chart: connector-major.minor.patch-test
+    app.kubernetes.io/instance: test
+    app.kubernetes.io/version: "latest"
+    app.kubernetes.io/managed-by: Helm
+spec:
+  replicas: 1
+  selector:
+    matchLabels:
+      app.kubernetes.io/name: connector
+      app.kubernetes.io/instance: test
+  template:
+    metadata:
+      labels:
+        app.kubernetes.io/name: connector
+        app.kubernetes.io/instance: test
+    spec:
+      imagePullSecrets:
+        - name: docker-hub-registry
+      containers:
+        - name: connector
+          image: "twingate/connector:1"
+          imagePullPolicy: Always
+          envFrom:
+            - secretRef:
+                name: test-connector
+                optional: false
+          env:
+            - name: TWINGATE_LABEL_DEPLOYED_BY
+              value: helm
+            - name: TWINGATE_LABEL_HELM_CHART
+              value: connector-major.minor.patch-test
+            - name: TWINGATE_URL
+              value: "https://test-tenant.twingate.com"
+            - name: TWINGATE_LOG_LEVEL
+              value: "3"
+          securityContext:
+            allowPrivilegeEscalation: false
+            capabilities:
+              drop: ["ALL"]
+            runAsNonRoot: true
+            runAsUser: 65532
+          resources:
+            requests:
+              cpu: 50m
+              memory: 200Mi
diff --git a/test/golden/image-pull-secrets.yaml b/test/golden/image-pull-secrets.yaml
@@ -0,0 +1,8 @@
+image:
+  imagePullSecrets:
+    - docker-hub-registry
+
+connector:
+  network: "test-tenant"
+  accessToken: "ACCESS_TOKEN"
+  refreshToken: "REFRESH_TOKEN"