Merge pull request #44 from mirekys/pull-secrets

Add imagePullSecrets to deployments
cs3org · Oct 31, 2022 · 6df8562 · 6df8562
2 parents 764b84f + 5e1a256
commit 6df8562
Show file tree

Hide file tree

Showing 8 changed files with 84 additions and 57 deletions.
diff --git a/revad/Chart.yaml b/revad/Chart.yaml
@@ -2,9 +2,9 @@ apiVersion: v2
 name: revad
 description: The Reva daemon (revad) helm chart
 type: application
-version: 1.4.1
+version: 1.4.2
 appVersion: v1.18.0
-kubeVersion: ">= 1.19.0"
+kubeVersion: '>= 1.19.0'
 icon: https://reva.link/logo.svg
 home: https://reva.link
 sources:
@@ -23,7 +23,7 @@ keywords:
   - sync-and-share
 annotations:
   artifacthub.io/changes: |
-    - "Update revad image to v1.18.0"
+    - "Add imagePullSecrets to deployment"
   artifacthub.io/images: |
     - name: revad
       image: cs3org/revad:v1.18.0
diff --git a/revad/README.md b/revad/README.md
diff --git a/revad/templates/deployment.yaml b/revad/templates/deployment.yaml
@@ -20,6 +20,7 @@ spec:
         - name: {{ .Chart.Name }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
+
           ports:
             - name: http
               containerPort: {{ .Values.service.http.port }}
@@ -57,6 +58,12 @@ spec:
           envFrom:
             {{ toYaml .Values.envFrom | indent 12 }}
           {{- end }}
+      {{- if .Values.image.pullSecrets }}
+      imagePullSecrets:
+      {{- range (default .Values.image.pullSecrets) }}
+        - name: {{ . }}
+      {{- end }}
+      {{- end }}
       volumes:
         - name: {{ include "revad.fullname" . }}-configfiles
           configMap:

diff --git a/revad/values.yaml b/revad/values.yaml
@@ -4,6 +4,8 @@ image:
   repository: cs3org/revad
   tag: v1.18.0
   pullPolicy: Always
+  pullSecrets:
+    []
 
 service:
   type: ClusterIP
@@ -16,7 +18,7 @@ extraVolumeMounts: []
 extraVolumes: []
 
 emptyDir:
-  sizeLimit: ""
+  sizeLimit: ''
 
 persistentVolume:
   ## If true, revad will create/use a Persistent Volume Claim
@@ -31,25 +33,26 @@ persistentVolume:
   annotations: {}
 
   ## If defined, PVC MUST be created manually before volume will be bound
-  existingClaim: ""
+  existingClaim: ''
 
   mountPath: /var/tmp/reva
   ## Subdirectory of the PV to mount. If the root directory is not empty
-  subPath: ""
+  subPath: ''
   size: 2Gi
 
   ## If set to "-", storageClassName: "": disables dynamic provisioning
   ## If undefined or null, chooses the default provisioner.
   # storageClass: "-"
-
   # volumeBindingMode: ""
 
 ## Environment variables in NAME:VALUE (dict) form
-env: {}
+env:
+  {}
   # REVA_ENV: value
 
 ## Environment variables in {name,value/valueFrom} (list) form
-extraEnv: []
+extraEnv:
+  []
   # - name: REVA_ENV
   #   value: value
   # - name: REVA_ENV_FROM
@@ -63,7 +66,8 @@ extraEnv: []
   #       name: secret
   #       key: secret_key
 
-envFrom: []
+envFrom:
+  []
   # - configMapRef:
   #     name: reva-envars
   # - secretRef:
@@ -75,22 +79,26 @@ ingress:
     http:
       hostname: http.revad.local
       path: /
-      annotations: {}
+      annotations:
+        {}
         # kubernetes.io/ingress.class: nginx
         # nginx.ingress.kubernetes.io/ssl-redirect: "true"
-      tls: []
+      tls:
+        []
         # Secrets must be present in the namespace beforehand.
         # - secretName: http-revad-tls
         #   hosts:
         #     - http.revad.local
     grpc:
       hostname: grpc.revad.local
       path: /
-      annotations: {}
+      annotations:
+        {}
         # kubernetes.io/ingress.class: nginx
         # nginx.ingress.kubernetes.io/ssl-redirect: "true"
         # nginx.ingress.kubernetes.io/backend-protocol: "GRPC"
-      tls: []
+      tls:
+        []
         # - secretName: grpc-revad-tls
         #   hosts:
         #     - grpc.revad.local

diff --git a/wopiserver/Chart.yaml b/wopiserver/Chart.yaml
@@ -2,9 +2,9 @@ apiVersion: v2
 name: wopiserver
 description: A Vendor-neutral Web-application Open Platform Interface (WOPI) gateway for EFSS systems
 type: application
-version: 0.5.1
+version: 0.5.2
 appVersion: v8.3.3
-kubeVersion: ">= 1.19.0"
+kubeVersion: '>= 1.19.0'
 home: https://github.com/cs3org/wopiserver
 sources:
   - https://github.com/cs3org/wopiserver
@@ -18,8 +18,8 @@ keywords:
   - efss
 annotations:
   artifacthub.io/changes: |
-    - "update image to cs3org/wopiserver:v8.3.3"
+    - "Add imagePullSecrets to deployment"
   artifacthub.io/images: |
     - name: wopiserver
       image: cs3org/wopiserver:v8.3.3
-  artifacthub.io/containsSecurityUpdates: "false"
+  artifacthub.io/containsSecurityUpdates: 'false'
diff --git a/wopiserver/README.md b/wopiserver/README.md
@@ -40,6 +40,7 @@ The following configurations may be set. It is recommended to use `values.yaml`
 | `image.pullPolicy`             | The kubernetes image pull policy.                                                        | `IfNotPresent`                                                    |
 | `image.repository`             | Name of the image to run, without the tag.                                               | [`cs3org/wopiserver`](https://hub.docker.com/r/cs3org/wopiserver) |
 | `image.tag`                    | The image tag to use.                                                                    | `v8.3.2`                                                          |
+| `image.pullSecrets`            | List of names of secrets containing container image registry access keys.                | `[]`                                                              |
 | `ingress.annotations`          | Ingress annotations.                                                                     | `{}`                                                              |
 | `ingress.enabled`              | Whether to create an Ingress resource to access the wopiserver.                          | `false`                                                           |
 | `ingress.hostname`             | The ingress hostname.                                                                    | `wopi.local`                                                      |

diff --git a/wopiserver/templates/deployment.yaml b/wopiserver/templates/deployment.yaml
@@ -55,6 +55,12 @@ spec:
             httpGet:
               path: /
               port: http
+      {{- if .Values.image.pullSecrets }}
+      imagePullSecrets:
+      {{- range (default .Values.image.pullSecrets) }}
+        - name: {{ . }}
+      {{- end }}
+      {{- end }}
       volumes:
         - name: tmp-volume
           emptyDir: {}

diff --git a/wopiserver/values.yaml b/wopiserver/values.yaml
@@ -4,7 +4,8 @@ image:
   repository: cs3org/wopiserver
   tag: v8.3.3
   pullPolicy: IfNotPresent
-
+  pullSecrets:
+    []
 service:
   type: ClusterIP
   port: 8880
@@ -41,10 +42,12 @@ ingress:
   enabled: false
   hostname: wopi.local
   path: /wopi
-  annotations: {}
+  annotations:
+    {}
     # kubernetes.io/ingress.class: nginx
     # nginx.ingress.kubernetes.io/ssl-redirect: "true"
-  tls: []
+  tls:
+    []
     # Secrets must be present in the namespace beforehand.
     # - secretName: wopi-tls
     #   hosts:
@@ -60,7 +63,8 @@ securityContext:
   runAsGroup: 1000
 
 # -- Resources to apply to all services.
-resources: {}
+resources:
+  {}
   # limits:
   #   cpu: 100m
   #   memory: 128Mi