X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=helm%2F3rdparty%2Finfluxdb%2Ftemplates%2Fsecret.yaml;fp=helm%2F3rdparty%2Finfluxdb%2Ftemplates%2Fsecret.yaml;h=a45fd0628b4c7ea7c5a8541f789905014bad96fc;hb=5b91760965953d3f08cede0d61f638b54c7397b8;hp=7503dabaf2c7d5fcf8a47671fffc0f2052dbed1e;hpb=b6a7c14c6064aec767785c347a1e5a348329ac67;p=ric-plt%2Fric-dep.git

diff --git a/helm/3rdparty/influxdb/templates/secret.yaml b/helm/3rdparty/influxdb/templates/secret.yaml
index 7503dab..a45fd06 100644
--- a/helm/3rdparty/influxdb/templates/secret.yaml
+++ b/helm/3rdparty/influxdb/templates/secret.yaml
@@ -1,32 +1,27 @@
-################################################################################
-#   Copyright (c) 2021 HCL Technolgies Limited.                                #
-#                                                                              #
-#   Licensed under the Apache License, Version 2.0 (the "License");            #
-#   you may not use this file except in compliance with the License.           #
-#   You may obtain a copy of the License at                                    #
-#                                                                              #
-#       http://www.apache.org/licenses/LICENSE-2.0                             #
-#                                                                              #
-#   Unless required by applicable law or agreed to in writing, software        #
-#   distributed under the License is distributed on an "AS IS" BASIS,          #
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
-#   See the License for the specific language governing permissions and        #
-#   limitations under the License.                                             #
-################################################################################
-{{ if .Values.setDefaultUser.enabled -}}
-{{ if not (.Values.setDefaultUser.user.existingSecret) -}}
+{{- if not (.Values.adminUser.existingSecret) -}}
 apiVersion: v1
 kind: Secret
 metadata:
-  name: {{ include "common.fullname.influxdb" . }}-auth
   labels:
-    {{- include "common.influxdb.labels" . | nindent 4 }}
+    {{- 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 -}}