unset values in secret-env if they are unset in helm

This solves an issue where even if helm values are set to false, secret values will be preserved.
bentoml · Aug 9, 2023 · da75399 · da75399
1 parent 90f60be
commit da75399
Showing 1 changed file with 5 additions and 13 deletions.
diff --git a/helm/yatai-image-builder/templates/secret-env.yaml b/helm/yatai-image-builder/templates/secret-env.yaml
@@ -15,28 +15,20 @@ stringData:
   DOCKER_REGISTRY_SERVER: {{ .Values.dockerRegistry.server | quote }}
   DOCKER_REGISTRY_IN_CLUSTER_SERVER: {{ .Values.dockerRegistry.inClusterServer | quote }}
   DOCKER_REGISTRY_USERNAME: {{ .Values.dockerRegistry.username | quote }}
-  {{- if not .Values.dockerRegistry.passwordExistingSecretName }}
-  DOCKER_REGISTRY_PASSWORD: {{ .Values.dockerRegistry.password | quote }}
-  {{- end }}
+  DOCKER_REGISTRY_PASSWORD: {{ default null (.Values.dockerRegistry.password | quote) }}
   DOCKER_REGISTRY_SECURE: {{ .Values.dockerRegistry.secure | quote }}
   DOCKER_REGISTRY_BENTO_REPOSITORY_NAME: {{ .Values.dockerRegistry.bentoRepositoryName | quote }}
 
-  {{- if .Values.aws.accessKeyID }}
-  AWS_ACCESS_KEY_ID: {{ .Values.aws.accessKeyID | quote }}
-  {{- end }}
-  {{- if .Values.aws.secretAccessKey }}
-  AWS_SECRET_ACCESS_KEY: {{ .Values.aws.secretAccessKey | quote }}
-  {{- end }}
+  AWS_ACCESS_KEY_ID: {{ default null (.Values.aws.accessKeyID | quote) }}
+  AWS_SECRET_ACCESS_KEY: {{ default null (.Values.aws.secretAccessKey | quote) }}
 
   INTERNAL_IMAGES_BENTO_DOWNLOADER: {{ .Values.internalImages.bentoDownloader | quote }}
   INTERNAL_IMAGES_KANIKO: {{ .Values.internalImages.kaniko | quote }}
   INTERNAL_IMAGES_BUILDKIT: {{ .Values.internalImages.buildkit | quote }}
   INTERNAL_IMAGES_BUILDKIT_ROOTLESS: {{ .Values.internalImages.buildkitRootless | quote }}
 
-  {{- if .Values.dockerRegistry.useAWSECRWithIAMRole }}
-  AWS_ECR_WITH_IAM_ROLE: "true"
-  AWS_ECR_REGION: {{ .Values.dockerRegistry.awsECRRegion | quote }}
-  {{- end }}
+  AWS_ECR_WITH_IAM_ROLE: {{default null .Values.dockerRegistry.useAWSECRWithIAMRole }}
+  AWS_ECR_REGION: {{ default null (.Values.dockerRegistry.awsECRRegion | quote) }}
 
   BENTO_IMAGE_BUILD_ENGINE: {{ .Values.bentoImageBuildEngine | quote }}