X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=helm%2F3rdparty%2Finfluxdb%2Ftemplates%2Fsecret.yaml;h=a45fd0628b4c7ea7c5a8541f789905014bad96fc;hb=refs%2Fchanges%2F20%2F9020%2F24;hp=c6390f1eb9117bbb1fd39ae0afd96e6cf4e8ad29;hpb=22ebf743884858441150813c18ba0751771e0eed;p=ric-plt%2Fric-dep.git

diff --git a/helm/3rdparty/influxdb/templates/secret.yaml b/helm/3rdparty/influxdb/templates/secret.yaml
index c6390f1..a45fd06 100644
--- a/helm/3rdparty/influxdb/templates/secret.yaml
+++ b/helm/3rdparty/influxdb/templates/secret.yaml
@@ -1,17 +1,27 @@
-{{- if .Values.setDefaultUser.enabled -}}
-{{- if not (.Values.setDefaultUser.user.existingSecret) -}}
+{{- if not (.Values.adminUser.existingSecret) -}}
 apiVersion: v1
 kind: Secret
 metadata:
-  name: {{ include "influxdb.fullname" . }}-auth
   labels:
     {{- include "influxdb.labels" . | nindent 4 }}
+  {{- $name := printf "%s-auth" (include "influxdb.fullname" .) }}
+  name: {{ $name }}
 data:
-  {{- if .Values.setDefaultUser.user.password }}
-  influxdb-password:  {{ .Values.setDefaultUser.user.password | b64enc | quote }}
+  {{- $previous := lookup "v1" "Secret" .Release.Namespace $name }}
+
+  {{- if $previous }}
+  admin-token: {{ index $previous.data "admin-token" }}
+  {{- else if .Values.adminUser.token }}
+  admin-token: {{ .Values.adminUser.token  | b64enc | quote }}
   {{- else }}
-  influxdb-password: {{ randAlphaNum 10 | b64enc | quote }}
+  admin-token: {{ randAlphaNum 32 | b64enc | quote }}
+  {{- end }}
+
+  {{- if $previous }}
+  admin-password: {{ index $previous.data "admin-password" }}
+  {{- else if .Values.adminUser.password }}
+  admin-password: {{ .Values.adminUser.password | b64enc | quote }}
+  {{- else }}
+  admin-password: {{ randAlphaNum 32 | b64enc | quote }}
   {{- end }}
-  influxdb-user: {{ .Values.setDefaultUser.user.username | b64enc | quote }}
-{{- end -}}
 {{- end -}}