Commit triggered by a change on the main branch of helm-charts-dev

EOEPCA · Jul 10, 2023 · 786491d · 786491d
1 parent 938d5b5
commit 786491d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/charts/rm-workspace-api/Chart.yaml b/charts/rm-workspace-api/Chart.yaml
@@ -15,9 +15,9 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.3.2
+version: 1.3.5
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
-appVersion: 1.3-dev5
+appVersion: 1.3.0
diff --git a/charts/rm-workspace-api/templates/deployment.yaml b/charts/rm-workspace-api/templates/deployment.yaml
@@ -75,8 +75,10 @@ spec:
               value: "{{ .Values.harborUrl }}"
             - name: HARBOR_ADMIN_USERNAME
               value: "{{ .Values.harborUsername }}"
+            {{- if .Values.harborPassword }}
             - name: HARBOR_ADMIN_PASSWORD
               value: "{{ .Values.harborPassword }}"
+            {{- end }}
             - name: WORKSPACE_CHARTS_CONFIG_MAP
               value: "{{ .Values.workspaceChartsConfigMap }}"
             - name: REDIS_SERVICE_NAME
@@ -87,6 +89,11 @@ spec:
               value: "{{ .Values.pepBaseUrl }}"
             - name: AUTO_PROTECTION_ENABLED
               value: "{{ .Values.autoProtectionEnabled }}"
+          {{- if .Values.harborPasswordSecretName }}
+          envFrom:
+            - secretRef:
+                name: {{ .Values.harborPasswordSecretName }}
+          {{- end }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
       {{- with .Values.nodeSelector }}

diff --git a/charts/rm-workspace-api/values.yaml b/charts/rm-workspace-api/values.yaml
@@ -101,6 +101,7 @@ redisServiceName: "vs-redis-master"
 harborUrl: ""
 harborUsername: ""
 harborPassword: ""
+harborPasswordSecretName: ""
 bucketEndpointUrl: ""
 pepBaseUrl: ""
-autoProtectionEnabled: "True"
+autoProtectionEnabled: "True"