Use more variables especially from aute-deploy

acdh-oeaw · May 13, 2024 · e64dba4 · e64dba4
1 parent 793de5d
commit e64dba4
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 62 deletions.
diff --git a/chart/templates/acme-certificate.yaml b/chart/templates/acme-certificate.yaml
diff --git a/chart/templates/deployment-iipsrv.yaml b/chart/templates/deployment-iipsrv.yaml
@@ -11,7 +11,7 @@ spec:
   selector:
     matchLabels:
       {{- include "iipimage.selectorLabels" . | nindent 6 }}
-      app.kubernetes.io/component: iipsrv
+      app.kubernetes.io/component: {{ .Chart.Name }}-iipsrv
   template:
     metadata:
       {{- with .Values.podAnnotations }}
@@ -20,12 +20,22 @@ spec:
       {{- end }}
       labels:
         {{- include "iipimage.selectorLabels" . | nindent 8 }}
-        app.kubernetes.io/component: iipsrv
+        app.kubernetes.io/component: {{ .Chart.Name }}-iipsrv
     spec:
       containers:
-      - env:
-        - name: FILESYSTEM_PREFIX
-          value: /data/forIIIF/
+      - name: {{ .Chart.Name }}-iipsrv
+#        image: {{ template "iipimage.imagename" . }}
+        image: "ghcr.io/acdh-oeaw/iipsrv/iipsrv"
+        imagePullPolicy: {{ .Values.image.pullPolicy }}
+        {{- if .Values.application.secretName }}
+        envFrom:
+        - secretRef:
+            name: {{ .Values.application.secretName }}
+{{- if .Values.extraEnvFrom }}
+{{- toYaml .Values.extraEnvFrom | nindent 8 }}
+{{- end }}
+        {{- end }}
+        env:
         - name: JPEG_QUALITY
           value: "50"
         - name: LOGFILE
@@ -38,10 +48,7 @@ spec:
           value: iiif/images=>IIIF
         - name: VERBOSITY
           value: "5"
-        image: "ghcr.io/acdh-oeaw/iipsrv/iipsrv"
 # {{ .Values.image.tag | default .Chart.AppVersion }}
-        imagePullPolicy: IfNotPresent
-        name: {{ .Chart.Name }}-iipsrv
         ports:
         - containerPort: 9000
           name: iipsrv
@@ -92,4 +99,4 @@ spec:
       volumes:
       - name: image-data
         persistentVolumeClaim:
-          claimName: iiif-picture-storage
+          claimName: {{ .Values.persistence.imageStoragePVC }}
diff --git a/chart/templates/deployment-imageserver-rev-proxy.yaml b/chart/templates/deployment-imageserver-rev-proxy.yaml
@@ -82,6 +82,6 @@ spec:
       volumes:
       - name: image-data
         persistentVolumeClaim:
-          claimName: iiif-picture-storage
+          claimName: {{ .Values.persistence.imageStoragePVC }}
       - emptyDir: {}
         name: lighttpd-tmp
diff --git a/chart/templates/deployment-node.yaml b/chart/templates/deployment-node.yaml
@@ -11,7 +11,7 @@ spec:
   selector:
     matchLabels:
       {{- include "iipimage.selectorLabels" . | nindent 6 }}
-      app.kubernetes.io/component: node
+      app.kubernetes.io/component: {{ .Chart.Name }}-node
   template:
     metadata:
       {{- with .Values.podAnnotations }}
@@ -20,26 +20,25 @@ spec:
       {{- end }}
       labels:
         {{- include "iipimage.selectorLabels" . | nindent 8 }}
-        app.kubernetes.io/component: node
+        app.kubernetes.io/component: {{ .Chart.Name }}-node
     spec:
       containers:
-      - env:
-        - name: IIIF_DATA_PATH
-          value: /data/forIIIF
-        - name: IMAGE_DATA_PATH
-          value: /data/upload
-        - name: IMAGE_MD5_CHECKSUMS_PATH
-          value: /data/upload/md5
+      - name: {{ .Chart.Name }}-node
+#        image: {{ template "iipimage.imagename" . }}
+        image: ghcr.io/acdh-oeaw/jpeg2000-conversion-and-iiif-presentation/jp2-conv-iiif-pres
+        imagePullPolicy: {{ .Values.image.pullPolicy }}
+        {{- if .Values.application.secretName }}
+        envFrom:
+        - secretRef:
+            name: {{ .Values.application.secretName }}
+{{- if .Values.extraEnvFrom }}
+{{- toYaml .Values.extraEnvFrom | nindent 8 }}
+{{- end }}
+        {{- end }}
+        env:
         - name: MEMCACHED_SERVERS
           value: {{ include "iipimage.fullname" . }}-memcached
-        - name: NO_VALIDATION_AT_STARTUP
-          value: "true"
-        - name: DEFAULT_COLLECTION
-          value: "{{ .Values.iiifDefaultCollection }}"
-        image: "ghcr.io/acdh-oeaw/jpeg2000-conversion-and-iiif-presentation/jp2-conv-iiif-pres"
 # {{ .Values.image.tag }}
-        imagePullPolicy: IfNotPresent
-        name: node
         ports:
         - containerPort: 3000
           name: node
@@ -95,4 +94,4 @@ spec:
       volumes:
       - name: image-data
         persistentVolumeClaim:
-          claimName: iiif-picture-storage
+          claimName: {{ .Values.persistence.imageStoragePVC }}
diff --git a/chart/templates/service-iipsrv.yaml b/chart/templates/service-iipsrv.yaml
@@ -4,7 +4,7 @@ metadata:
   name: {{ include "iipimage.fullname" . }}-iipsrv
   labels:
     {{- include "iipimage.labels" . | nindent 4 }}
-    app.kubernetes.io/component: iipsrv-svc
+    app.kubernetes.io/component: {{ .Chart.Name }}-iipsrv-svc
 spec:
   ports:
   - name: iipsrv
@@ -13,5 +13,5 @@ spec:
     targetPort: 9000
   selector:
     {{- include "iipimage.selectorLabels" . | nindent 4 }}
-    app.kubernetes.io/component: iipsrv
+    app.kubernetes.io/component: {{ .Chart.Name }}-iipsrv
   type: ClusterIP
diff --git a/chart/templates/service-imageserver-rev-proxy.yaml b/chart/templates/service-imageserver-rev-proxy.yaml
@@ -4,7 +4,7 @@ metadata:
   name: {{ include "iipimage.fullname" . }}-imageserver-rev-proxy
   labels:
     {{- include "iipimage.labels" . | nindent 4 }}
-    app.kubernetes.io/component: imageserver-rev-proxy-svc
+    app.kubernetes.io/component: {{ .Chart.Name }}-rev-proxy-svc
 spec:
   ports:
   - name: http
@@ -13,5 +13,5 @@ spec:
     targetPort: 8080
   selector:
     {{- include "iipimage.selectorLabels" . | nindent 4 }}
-    app.kubernetes.io/component: imageserver-rev-proxy
+    app.kubernetes.io/component: {{ .Chart.Name }}-rev-proxy
   type: ClusterIP
diff --git a/chart/templates/service-node.yaml b/chart/templates/service-node.yaml
@@ -4,7 +4,7 @@ metadata:
   name: {{ include "iipimage.fullname" . }}-node
   labels:
     {{- include "iipimage.labels" . | nindent 4 }}
-    app.kubernetes.io/component: node-svc
+    app.kubernetes.io/component: {{ .Chart.Name }}-node-svc
 spec:
   ports:
   - name: node
@@ -13,5 +13,5 @@ spec:
     targetPort: 3000
   selector:
     {{- include "iipimage.selectorLabels" . | nindent 4 }}
-    app.kubernetes.io/component: node
+    app.kubernetes.io/component: {{ .Chart.Name }}-node
   type: ClusterIP
diff --git a/chart/values.yaml b/chart/values.yaml
@@ -5,7 +5,7 @@ replicaCount: 1
 
 image:
   repository: ghcr.io/acdh-oeaw/iiif-service/iiif-service
-  pullPolicy: IfNotPresent
+  pullPolicy: Always
   # Overrides the image tag whose default is the chart appVersion.
   tag: "latest"
 application:
@@ -82,3 +82,6 @@ nodeSelector: {}
 tolerations: []
 
 affinity: {}
+
+persistence:
+  imageStoragePVC: iiif-picture-storage