Merge pull request #25 from risingwavelabs/shunjie/fix-empty-strings

fix: quote all raw strings to avoid '<nil>' object or number strings
risingwavelabs · Feb 29, 2024 · 9dfdbbb · 9dfdbbb
2 parents 80a8e1d + fcb4ff6
commit 9dfdbbb
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 22 deletions.
diff --git a/charts/risingwave/Chart.yaml b/charts/risingwave/Chart.yaml
@@ -19,7 +19,7 @@ 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: 0.1.39
+version: 0.1.40
 
 # 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

diff --git a/charts/risingwave/templates/azblob-secret.yaml b/charts/risingwave/templates/azblob-secret.yaml
@@ -17,7 +17,7 @@ metadata:
     {{ nindent 4 $annotations }}
   {{- end }}
 stringData:
-  AZBLOB_ACCOUNT_NAME: {{ .Values.stateStore.azblob.authentication.accountName }}
-  AZBLOB_ACCOUNT_KEY: {{ .Values.stateStore.azblob.authentication.accountKey }}
+  AZBLOB_ACCOUNT_NAME: {{ .Values.stateStore.azblob.authentication.accountName | quote }}
+  AZBLOB_ACCOUNT_KEY: {{ .Values.stateStore.azblob.authentication.accountKey | quote }}
+{{- end }}
 {{- end }}
-{{- end }}
diff --git a/charts/risingwave/templates/etcd-secret.yaml b/charts/risingwave/templates/etcd-secret.yaml
@@ -16,6 +16,6 @@ metadata:
     {{ nindent 4 $annotations }}
   {{- end }}
 stringData:
-  RW_ETCD_USERNAME: {{ .Values.metaStore.etcd.authentication.username }}
-  RW_ETCD_PASSWORD: {{ .Values.metaStore.etcd.authentication.password }}
-{{- end }}
+  RW_ETCD_USERNAME: {{ .Values.metaStore.etcd.authentication.username | quote }}
+  RW_ETCD_PASSWORD: {{ .Values.metaStore.etcd.authentication.password | quote }}
+{{- end }}
diff --git a/charts/risingwave/templates/gcs-secret.yaml b/charts/risingwave/templates/gcs-secret.yaml
@@ -17,6 +17,6 @@ metadata:
     {{ nindent 4 $annotations }}
   {{- end }}
 stringData:
-  GOOGLE_APPLICATION_CREDENTIALS: {{ .Values.stateStore.gcs.authentication.credentials }}
+  GOOGLE_APPLICATION_CREDENTIALS: {{ .Values.stateStore.gcs.authentication.credentials | quote }}
+{{- end }}
 {{- end }}
-{{- end }}
diff --git a/charts/risingwave/templates/minio-secret.yaml b/charts/risingwave/templates/minio-secret.yaml
@@ -17,7 +17,7 @@ metadata:
     {{ nindent 4 $annotations }}
   {{- end }}
 stringData:
-  MINIO_USERNAME: {{ .Values.stateStore.minio.authentication.username }}
-  MINIO_PASSWORD: {{ .Values.stateStore.minio.authentication.password }}
+  MINIO_USERNAME: {{ .Values.stateStore.minio.authentication.username | quote }}
+  MINIO_PASSWORD: {{ .Values.stateStore.minio.authentication.password | quote }}
+{{- end }}
 {{- end }}
-{{- end }}
diff --git a/charts/risingwave/templates/obs-secret.yaml b/charts/risingwave/templates/obs-secret.yaml
@@ -17,7 +17,7 @@ metadata:
     {{ nindent 4 $annotations }}
   {{- end }}
 stringData:
-  OBS_ACCESS_KEY_ID: {{ .Values.stateStore.obs.authentication.accessKey }}
-  OBS_SECRET_ACCESS_KEY: {{ .Values.stateStore.obs.authentication.secretAccessKey }}
+  OBS_ACCESS_KEY_ID: {{ .Values.stateStore.obs.authentication.accessKey | quote }}
+  OBS_SECRET_ACCESS_KEY: {{ .Values.stateStore.obs.authentication.secretAccessKey | quote }}
+{{- end }}
 {{- end }}
-{{- end }}
diff --git a/charts/risingwave/templates/s3-secret.yaml b/charts/risingwave/templates/s3-secret.yaml
@@ -17,7 +17,7 @@ metadata:
     {{ nindent 4 $annotations }}
   {{- end }}
 stringData:
-  AWS_ACCESS_KEY_ID: {{ .Values.stateStore.s3.authentication.accessKey }}
-  AWS_SECRET_ACCESS_KEY: {{ .Values.stateStore.s3.authentication.secretAccessKey }}
+  AWS_ACCESS_KEY_ID: {{ .Values.stateStore.s3.authentication.accessKey | quote }}
+  AWS_SECRET_ACCESS_KEY: {{ .Values.stateStore.s3.authentication.secretAccessKey | quote }}
+{{- end }}
 {{- end }}
-{{- end }}
diff --git a/charts/risingwave/templates/secret.yaml b/charts/risingwave/templates/secret.yaml
@@ -10,8 +10,8 @@ metadata:
     {{ nindent 4 $annotations }}
   {{- end }}
 stringData:
-  root-user: {{ .Values.auth.rootUser }}
-  root-password: {{ .Values.auth.rootPassword }}
+  root-user: {{ .Values.auth.rootUser | quote }}
+  root-password: {{ .Values.auth.rootPassword | quote }}
   {{- if ne .Values.auth.rootUser "root" }}
-  real-root-password: {{ randAlphaNum 8 }}
-  {{- end }}
+  real-root-password: {{ randAlphaNum 8 | quote }}
+  {{- end }}