Merge pull request #2229 from wenchajun/autoesupdate

Support automatic update of external elasticsearch or opensearch username and password
kubesphere · Aug 25, 2023 · 6bc800c · 6bc800c
2 parents 0b2a497 + fd8283c
commit 6bc800c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/roles/common/tasks/escurator-install.yaml b/roles/common/tasks/escurator-install.yaml
@@ -15,7 +15,7 @@
 # Creating elasticsearch-credentials secret used to connect external es with basic auth enabled.
 - name: KubeSphere | Creating elasticsearch credentials secret
   shell: >
-    {{ bin_dir }}/kubectl create secret generic elasticsearch-credentials --from-literal="username={{ common.es.basicAuth.username }}" --from-literal="password={{ common.es.basicAuth.password }}" --type=kubernetes.io/basic-auth -n kubesphere-logging-system
+    {{ bin_dir }}/kubectl create secret generic elasticsearch-credentials --save-config --dry-run=client --from-literal="username={{ common.es.basicAuth.username }}" --from-literal="password={{ common.es.basicAuth.password }}" --type=kubernetes.io/basic-auth -n kubesphere-logging-system -o yaml | kubectl apply -f -
   register: secret
   failed_when: "secret.stderr and 'already exists' not in secret.stderr"
   until: secret is succeeded

diff --git a/roles/common/tasks/opensearch-install.yaml b/roles/common/tasks/opensearch-install.yaml
@@ -39,7 +39,7 @@
 # Creating opensearch-credentials secret used to connect external es with basic auth enabled.
 - name: KubeSphere | Creating opensearch credentials secret
   shell: >
-    {{ bin_dir }}/kubectl create secret generic opensearch-credentials --from-literal="username={{ common.opensearch.basicAuth.username }}" --from-literal="password={{ common.opensearch.basicAuth.password }}" --type=kubernetes.io/basic-auth -n kubesphere-logging-system
+    {{ bin_dir }}/kubectl create secret generic opensearch-credentials --save-config --dry-run=client --from-literal="username={{ common.opensearch.basicAuth.username }}" --from-literal="password={{ common.opensearch.basicAuth.password }}" --type=kubernetes.io/basic-auth -n kubesphere-logging-system -o yaml | kubectl apply -f -
   register: secret
   failed_when: "secret.stderr and 'already exists' not in secret.stderr"
   until: secret is succeeded