Merge pull request #68 from xenit-eu/67-add-env-from

Add support for envFrom values or all deployments
xenit-eu · Jun 27, 2023 · 69cc5f3 · 69cc5f3
2 parents a036889 + d23c303
commit 69cc5f3
Show file tree

Hide file tree

Showing 10 changed files with 135 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -414,7 +414,6 @@ For more information take a look at
 * Description: This allows you to add to the acs-container envFrom section. This was added to allow to integrate secrets
   that are not added by this helm chart.
 * Example:
-
 ```yaml
 - secretRef:
     name: s3-secret
@@ -540,6 +539,18 @@ For more information take a look at
 * Description: With this list of parameters you can add 1 or multiple environment variables that will be passed to the
   docker container. These will be stored in a config and are hence not safe for sensitive information
 
+#### `digitalWorkspace.envFrom`
+
+* Required: false
+* Default: None
+* Description: This allows you to add to the digitalWorkspace-container envFrom section. This was added to allow to integrate secrets
+  that are not added by this helm chart.
+* Example:
+```yaml
+  - secretRef:
+    name: s3-secret
+```
+
 #### `digitalWorkspace.podAnnotations`
 
 * Required: false
@@ -654,6 +665,18 @@ For more information take a look at
 * Description: With this list of parameters you can add 1 or multiple environment variables that will be passed to the
   docker container. These will be stored in a config and are hence not safe for sensitive information
 
+#### `share.envFrom`
+
+* Required: false
+* Default: None
+* Description: This allows you to add to the share-container envFrom section. This was added to allow to integrate secrets
+  that are not added by this helm chart.
+* Example:
+```yaml
+  - secretRef:
+    name: s3-secret
+```
+
 #### `share.podAnnotations`
 
 * Required: false
@@ -785,6 +808,18 @@ For more information take a look at
 * Description: With this list of parameters you can add 1 or multiple environment variables that will be passed to the
   docker container. These will be stored in a config and are hence not safe for sensitive information
 
+#### `mq.envFrom`
+
+* Required: false
+* Default: None
+* Description: This allows you to add to the mq-container envFrom section. This was added to allow to integrate secrets
+  that are not added by this helm chart.
+* Example:
+```yaml
+  - secretRef:
+    name: s3-secret
+```
+
 #### `mq.podAnnotations`
 
 * Required: false
@@ -900,6 +935,18 @@ For more information take a look at
 * Description: With this list of parameters you can add 1 or multiple environment variables that will be passed to the
   docker container. These will be stored in a config and are hence not safe for sensitive information
 
+#### `postgresql.envFrom`
+
+* Required: false
+* Default: None
+* Description: This allows you to add to the postgresql-container envFrom section. This was added to allow to integrate secrets
+  that are not added by this helm chart.
+* Example:
+```yaml
+  - secretRef:
+    name: s3-secret
+```
+
 #### `postgresql.podAnnotations`
 
 * Required: false
@@ -1211,6 +1258,18 @@ Default: http://solr-service:30300/solr/alfresco/replication?command=backup&repo
 * Description: With this list of parameters you can add 1 or multiple environment variables that will be passed to the
   docker container. These will be stored in a config and are hence not safe for sensitive information
 
+#### `transformServices.sharedFileStore.envFrom`
+
+* Required: false
+* Default: None
+* Description: This allows you to add to the sharedFileStore-container envFrom section. This was added to allow to integrate secrets
+  that are not added by this helm chart.
+* Example:
+```yaml
+  - secretRef:
+    name: s3-secret
+```
+
 #### `transformServices.sharedFileStore.podAnnotations`
 
 * Required: false
@@ -1319,6 +1378,18 @@ Default: http://solr-service:30300/solr/alfresco/replication?command=backup&repo
 * Description: With this list of parameters you can add 1 or multiple environment variables that will be passed to the
   docker container. These will be stored in a config and are hence not safe for sensitive information
 
+#### `transformServices.transformCoreAio.envFrom`
+
+* Required: false
+* Default: None
+* Description: This allows you to add to the transformCoreAio-container envFrom section. This was added to allow to integrate secrets
+  that are not added by this helm chart.
+* Example:
+```yaml
+  - secretRef:
+    name: s3-secret
+```
+
 #### `transformServices.transformCoreAio.podAnnotations`
 
 * Required: false
@@ -1429,6 +1500,18 @@ Default: http://solr-service:30300/solr/alfresco/replication?command=backup&repo
 * Description: With this list of parameters you can add 1 or multiple environment variables that will be passed to the
   docker container. These will be stored in a config and are hence not safe for sensitive information
 
+#### `transformServices.transformRouter.envFrom`
+
+* Required: false
+* Default: None
+* Description: This allows you to add to the transformRouter-container envFrom section. This was added to allow to integrate secrets
+  that are not added by this helm chart.
+* Example:
+```yaml
+  - secretRef:
+    name: s3-secret
+```
+
 #### `transformServices.transformRouter.podAnnotations`
 
 * Required: false
@@ -1544,6 +1627,18 @@ Default: http://solr-service:30300/solr/alfresco/replication?command=backup&repo
 * Description: With this list of parameters you can add 1 or multiple environment variables that will be passed to the
   docker container. These will be stored in a config and are hence not safe for sensitive information
 
+#### `syncService.envFrom`
+
+* Required: false
+* Default: None
+* Description: This allows you to add to the syncService-container envFrom section. This was added to allow to integrate secrets
+  that are not added by this helm chart.
+* Example:
+```yaml
+  - secretRef:
+    name: s3-secret
+```
+
 #### `syncService.podAnnotations`
 
 * Required: false
@@ -1659,6 +1754,18 @@ Default: http://solr-service:30300/solr/alfresco/replication?command=backup&repo
 * Description: With this list of parameters you can add 1 or multiple environment variables that will be passed to the
   docker container. These will be stored in a config and are hence not safe for sensitive information
 
+#### `ooi.envFrom`
+
+* Required: false
+* Default: None
+* Description: This allows you to add to the ooi-container envFrom section. This was added to allow to integrate secrets
+  that are not added by this helm chart.
+* Example:
+```yaml
+  - secretRef:
+    name: s3-secret
+```
+
 #### `ooi.podAnnotations`
 
 * Required: false

diff --git a/xenit-alfresco/templates/active-mq/mq-deployment.yaml b/xenit-alfresco/templates/active-mq/mq-deployment.yaml
@@ -41,6 +41,9 @@ spec:
                 name: mq-configmap
             - secretRef:
                 name: mq-secret
+            {{- if .Values.mq.envFrom }}
+            {{ toYaml .Values.mq.envFrom | nindent 12 }}
+            {{- end }}
           ports:
             - name: stomp
               containerPort: 61613

diff --git a/xenit-alfresco/templates/digital-workspace/digital-workspace-deployment.yaml b/xenit-alfresco/templates/digital-workspace/digital-workspace-deployment.yaml
@@ -58,6 +58,9 @@ spec:
           envFrom:
             - configMapRef:
                 name: digital-workspace-configmap
+            {{- if .Values.digitalWorkspace.envFrom }}
+            {{ toYaml .Values.digitalWorkspace.envFrom | nindent 12 }}
+            {{- end }}
           ports:
             - containerPort: 8080
               protocol: TCP

diff --git a/xenit-alfresco/templates/ooi/ooi-deployment.yaml b/xenit-alfresco/templates/ooi/ooi-deployment.yaml
@@ -53,6 +53,9 @@ spec:
           envFrom:
             - configMapRef:
                 name: ooi-configmap
+          {{- if .Values.ooi.envFrom }}
+          {{ toYaml .Values.ooi.envFrom | nindent 10 }}
+          {{- end }}
           ports:
             - containerPort: 9095
               protocol: TCP

diff --git a/xenit-alfresco/templates/postgres/postgresql-deployment.yaml b/xenit-alfresco/templates/postgres/postgresql-deployment.yaml
@@ -44,6 +44,9 @@ spec:
               name: mq-secret
           - secretRef:
               name: db-secret
+          {{- if .Values.postgresql.envFrom }}
+          {{ toYaml .Values.postgresql.envFrom | nindent 10 }}
+          {{- end }}
         ports:
           - containerPort: 5432
             protocol: TCP

diff --git a/xenit-alfresco/templates/share/share-deployment.yaml b/xenit-alfresco/templates/share/share-deployment.yaml
@@ -45,6 +45,9 @@ spec:
         envFrom:
           - configMapRef:
               name: share-configmap
+          {{- if .Values.share.envFrom }}
+          {{ toYaml .Values.share.envFrom | nindent 10 }}
+          {{- end }}
         ports:
           - containerPort: 8080
             protocol: TCP

diff --git a/xenit-alfresco/templates/sync-service/sync-service-deployment.yaml b/xenit-alfresco/templates/sync-service/sync-service-deployment.yaml
@@ -70,6 +70,9 @@ spec:
                 name: mq-secret
             - secretRef:
                 name: db-secret
+            {{- if .Values.syncService.envFrom }}
+            {{ toYaml .Values.syncService.envFrom | nindent 10 }}
+            {{- end }}
           ports:
             - containerPort: 9090
               protocol: TCP

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
@@ -38,6 +38,9 @@ spec:
           envFrom:
             - configMapRef:
                 name: shared-file-store-configmap
+          {{- if .Values.transformServices.sharedFileStore.envFrom }}
+          {{ toYaml .Values.transformServices.sharedFileStore.envFrom | nindent 10 }}
+          {{- end }}
           ports:
             - containerPort: 8099
               protocol: TCP

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
@@ -38,6 +38,9 @@ spec:
           envFrom:
             - configMapRef:
                 name: transform-core-aio-configmap
+          {{- if .Values.transformServices.transformCoreAio.envFrom }}
+          {{ toYaml .Values.transformServices.transformCoreAio.envFrom | nindent 10 }}
+          {{- end }}
           ports:
             - containerPort: 8090
               protocol: TCP

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
@@ -58,6 +58,9 @@ spec:
           envFrom:
             - configMapRef:
                 name: transform-router-configmap
+          {{- if .Values.transformServices.transformRouter.envFrom }}
+          {{ toYaml .Values.transformServices.transformRouter.envFrom | nindent 10 }}
+          {{- end }}
           ports:
             - containerPort: 8095
               protocol: TCP