Merge pull request #201 from ksrinimba/master

Change bootstrap from CM to secret
OpsMx · Sep 27, 2021 · f831db9 · f831db9
2 parents fa2e311 + 89333e8
commit f831db9
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/charts/oes/Chart.yaml b/charts/oes/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: oes
-version: 3.9.5
+version: 3.9.6
 appVersion: 3.9.1.2
 description: OES is a non-forked version of OSS spinnaker
 icon: https://raw.githubusercontent.com/OpsMx/enterprise-spinnaker/master/img/opsmx.png

diff --git a/charts/oes/charts/spinnaker/templates/configmap/halyard-init-script.yaml b/charts/oes/charts/spinnaker/templates/configmap/halyard-init-script.yaml
@@ -126,7 +126,8 @@ data:
     ls -lart /home/spinnaker/java-lib/
     if [ -d "/tmp/spinnaker/pipeline-promotion/" ]
     then
-      decrypt_key=$(kubectl get cm bootstrap -o yaml  -n ${SPINNAKER_NAMESPACE}| grep 'password:' | awk '{ print $2}')
+      #decrypt_key=$(kubectl get cm bootstrap -o yaml  -n ${SPINNAKER_NAMESPACE}| grep 'password:' | awk '{ print $2}')
+      decrypt_key=$(kubectl get secret bootstrap -o jsonpath='{.data.bootstrap\.yml}' -n ${SPINNAKER_NAMESPACE} | base64 -d | grep 'password:' | awk '{ print $2}')
       if [[ $decrypt_key != "" ]];
       then
         for filename in /tmp/spinnaker/pipeline-promotion/*; do

diff --git a/charts/oes/charts/spinnaker/templates/rbac/spinnaker-role.yaml b/charts/oes/charts/spinnaker/templates/rbac/spinnaker-role.yaml
@@ -7,15 +7,14 @@ rules:
     resources:
       [
         'namespaces',
-        'configmaps',
         'events',
         'replicationcontrollers',
         'serviceaccounts',
         'pods/log',
       ]
     verbs: ['get', 'list']
   - apiGroups: ['']
-    resources: ['pods', 'services', 'secrets']
+    resources: ['pods', 'services', 'secrets', 'configmaps']
     verbs:
       [
         'create',

diff --git a/...s/oes/templates/secrets/bootstrap-cm.yaml → ...s/templates/secrets/bootstrap-secret.yaml b/...s/oes/templates/secrets/bootstrap-cm.yaml → ...s/templates/secrets/bootstrap-secret.yaml