XM2C-68 remove auto-created pull secrets

* XM2C-68 remove auto-created pull secrets * XM2C-68 format readme
xenit-eu · Nov 22, 2022 · 0dac4c2 · 0dac4c2
1 parent e3e7646
commit 0dac4c2
Show file tree

Hide file tree

Showing 19 changed files with 344 additions and 202 deletions.
diff --git a/README.md b/README.md
diff --git a/integration-testing/src/test/java/eu/xenit/testing/k8s/kind/HelmAlfrescoTest.java b/integration-testing/src/test/java/eu/xenit/testing/k8s/kind/HelmAlfrescoTest.java
@@ -36,13 +36,6 @@ void smallSetup() throws IOException {
                   host: test
                   protocol: http
                   kubernetes.io/ingress.class: {}
-                imageCredentials:
-                  private:
-                    username: hello
-                    password: world
-                  alfresco:
-                    username: hello
-                    password: world
                 acs:
                   replicas: 1
                   resources:

diff --git a/local-values.yaml b/local-values.yaml
@@ -2,13 +2,6 @@ ingress:
   host: test
   protocol: http
   kubernetes.io/ingress.class: {}
-imageCredentials:
-  private:
-    username: #!Important: add your LDAP user name and do not commit them 
-    password: #!Important: add your LDAP password and do not commit them 
-  alfresco:
-    username: #!Important: add your alfresco user name and do not commit them 
-    password: #!Important: add your alfresco password and do not commit them 
 acs:
   resources:
     requests:

diff --git a/xenit-alfresco/templates/acs/acs-deployment.yaml b/xenit-alfresco/templates/acs/acs-deployment.yaml
@@ -105,7 +105,9 @@ spec:
             claimName: alfresco-pvc
       {{- end }}
       imagePullSecrets:
-        - name: privatecred
         {{- if .Values.general.imagePullSecrets}}
         {{ toYaml .Values.general.imagePullSecrets | nindent 8 }}
+        {{- end }}
+        {{- if .Values.acs.imagePullSecrets}}
+        {{ toYaml .Values.acs.imagePullSecrets | nindent 8 }}
         {{- end }}
diff --git a/xenit-alfresco/templates/active-mq/mq-deployement.yaml b/xenit-alfresco/templates/active-mq/mq-deployement.yaml
@@ -101,6 +101,9 @@ spec:
         {{- if .Values.general.imagePullSecrets}}
         {{ toYaml .Values.general.imagePullSecrets | nindent 8 }}
         {{- end }}
+        {{- if .Values.mq.imagePullSecrets}}
+        {{ toYaml .Values.mq.imagePullSecrets | nindent 8 }}
+        {{- end }}
       {{- if .Values.persistentStorage.mq.enabled }}
       volumes:
         - name: data

diff --git a/xenit-alfresco/templates/digital-workspace/digital-workspace-deployment.yaml b/xenit-alfresco/templates/digital-workspace/digital-workspace-deployment.yaml
@@ -73,8 +73,10 @@ spec:
             {{- end }}
           {{- end }}
       imagePullSecrets:
-        - name: alfrescocred
         {{- if .Values.general.imagePullSecrets}}
         {{ toYaml .Values.general.imagePullSecrets | nindent 8 }}
         {{- end }}
+        {{- if .Values.digitalWorkspace.imagePullSecrets}}
+        {{ toYaml .Values.digitalWorkspace.imagePullSecrets | nindent 8 }}
+        {{- end }}
 {{- end }}
diff --git a/xenit-alfresco/templates/docker-registry-secrets.yaml b/xenit-alfresco/templates/docker-registry-secrets.yaml
diff --git a/xenit-alfresco/templates/helpers/_alfrescoImagePullSecret.tpl b/xenit-alfresco/templates/helpers/_alfrescoImagePullSecret.tpl
diff --git a/xenit-alfresco/templates/helpers/_privateImagePullSecret.tpl b/xenit-alfresco/templates/helpers/_privateImagePullSecret.tpl
diff --git a/...esco/templates/storage/_volume-helper.tpl → ...esco/templates/helpers/_volume-helper.tpl b/...esco/templates/storage/_volume-helper.tpl → ...esco/templates/helpers/_volume-helper.tpl
diff --git a/xenit-alfresco/templates/ooi/ooi-deployment.yaml b/xenit-alfresco/templates/ooi/ooi-deployment.yaml
@@ -68,8 +68,10 @@ spec:
             {{- end }}
           {{- end }}
       imagePullSecrets:
-        - name: alfrescocred
         {{- if .Values.general.imagePullSecrets}}
         {{ toYaml .Values.general.imagePullSecrets | nindent 8 }}
         {{- end }}
+        {{- if .Values.ooi.imagePullSecrets}}
+        {{ toYaml .Values.ooi.imagePullSecrets | nindent 8 }}
+        {{- end }}
 {{- end }}
diff --git a/xenit-alfresco/templates/postgres/postgresql-deployment.yaml b/xenit-alfresco/templates/postgres/postgresql-deployment.yaml
@@ -65,10 +65,12 @@ spec:
           {{- end }}
         {{- end }}
       imagePullSecrets:
-        - name: privatecred
         {{- if .Values.general.imagePullSecrets}}
         {{ toYaml .Values.general.imagePullSecrets | nindent 8 }}
         {{- end }}
+        {{- if .Values.postgresql.imagePullSecrets}}
+        {{ toYaml .Values.postgresql.imagePullSecrets | nindent 8 }}
+        {{- end }}
       {{- if .Values.persistentStorage.postgres.enabled }}
       volumes:
         - name: data

diff --git a/xenit-alfresco/templates/share/share-deployment.yaml b/xenit-alfresco/templates/share/share-deployment.yaml
@@ -63,4 +63,7 @@ spec:
         {{- if .Values.general.imagePullSecrets}}
         {{ toYaml .Values.general.imagePullSecrets | nindent 8 }}
         {{- end }}
+        {{- if .Values.share.imagePullSecrets}}
+        {{ toYaml .Values.share.imagePullSecrets | nindent 8 }}
+        {{- end }}
 {{- end }}
diff --git a/xenit-alfresco/templates/solr/solr-stateful-set.yaml b/xenit-alfresco/templates/solr/solr-stateful-set.yaml
@@ -64,10 +64,12 @@ spec:
             mountPath: /opt/alfresco-search-services/data
             subPath: solr/data
       imagePullSecrets:
-        - name: privatecred
         {{- if .Values.general.imagePullSecrets}}
         {{ toYaml .Values.general.imagePullSecrets | nindent 8 }}
         {{- end }}
+        {{- if .Values.solr.imagePullSecrets}}
+        {{ toYaml .Values.solr.imagePullSecrets | nindent 8 }}
+        {{- end }}
   {{- with .Values.persistentStorage.solr }}
   volumeClaimTemplates:
     - metadata:

diff --git a/xenit-alfresco/templates/sync-service/sync-service-deployment.yaml b/xenit-alfresco/templates/sync-service/sync-service-deployment.yaml
@@ -85,8 +85,10 @@ spec:
             {{- end }}
           {{- end }}
       imagePullSecrets:
-        - name: alfrescocred
         {{- if .Values.general.imagePullSecrets}}
         {{ toYaml .Values.general.imagePullSecrets | nindent 8 }}
         {{- end }}
+        {{- if .Values.syncService.imagePullSecrets}}
+        {{ toYaml .Values.syncService.imagePullSecrets | nindent 8 }}
+        {{- end }}
 {{- end }}
diff --git a/...alfresco/templates/transform-services/shared-file-store/shared-file-store-deployment.yaml b/...alfresco/templates/transform-services/shared-file-store/shared-file-store-deployment.yaml
@@ -58,10 +58,15 @@ spec:
               mountPath: /tmp/Alfresco
           {{- end }}
       imagePullSecrets:
-        - name: alfrescocred
         {{- if .Values.general.imagePullSecrets}}
         {{ toYaml .Values.general.imagePullSecrets | nindent 8 }}
         {{- end }}
+        {{- if .Values.transformServices.imagePullSecrets}}
+        {{ toYaml .Values.transformServices.imagePullSecrets | nindent 8 }}
+        {{- end }}
+        {{- if .Values.transformServices.sharedFileStore.imagePullSecrets}}
+        {{ toYaml .Values.transformServices.sharedFileStore.imagePullSecrets | nindent 8 }}
+        {{- end }}
       {{- if .Values.persistentStorage.sharedFileStore.enabled }}
       volumes:
         - name: data

diff --git a/...fresco/templates/transform-services/transform-core-aio/transform-core-aio-deployment.yaml b/...fresco/templates/transform-services/transform-core-aio/transform-core-aio-deployment.yaml
@@ -56,4 +56,10 @@ spec:
         {{- if .Values.general.imagePullSecrets}}
         {{ toYaml .Values.general.imagePullSecrets | nindent 8 }}
         {{- end }}
+        {{- if .Values.transformServices.imagePullSecrets}}
+        {{ toYaml .Values.transformServices.imagePullSecrets | nindent 8 }}
+        {{- end }}
+        {{- if .Values.transformServices.transformCoreAio.imagePullSecrets}}
+        {{ toYaml .Values.transformServices.transformCoreAio.imagePullSecrets | nindent 8 }}
+        {{- end }}
 {{- end }}
diff --git a/...t-alfresco/templates/transform-services/transform-router/transform-router-deployment.yaml b/...t-alfresco/templates/transform-services/transform-router/transform-router-deployment.yaml
@@ -73,8 +73,13 @@ spec:
             {{- end }}
           {{- end }}
       imagePullSecrets:
-        - name: alfrescocred
         {{- if .Values.general.imagePullSecrets}}
         {{ toYaml .Values.general.imagePullSecrets | nindent 8 }}
         {{- end }}
+        {{- if .Values.transformServices.imagePullSecrets}}
+        {{ toYaml .Values.transformServices.imagePullSecrets | nindent 8 }}
+        {{- end }}
+        {{- if .Values.transformServices.transformRouter.imagePullSecrets}}
+        {{ toYaml .Values.transformServices.transformRouter.imagePullSecrets | nindent 8 }}
+        {{- end }}
 {{- end }}
diff --git a/xenit-alfresco/values.yaml b/xenit-alfresco/values.yaml
@@ -187,10 +187,4 @@ persistentStorage:
     storageClassName: ""
     storage: 1
     efs:
-      volumeHandle: ""
-
-imageCredentials:
-  private:
-    registry: 'hub.xenit.eu'
-  alfresco:
-    registry: 'quay.io'
+      volumeHandle: ""