diff --git a/charts/oes/config/oes-autopilot/autopilot.properties b/charts/oes/config/oes-autopilot/autopilot.properties index 47d05f8c..3216f931 100644 --- a/charts/oes/config/oes-autopilot/autopilot.properties +++ b/charts/oes/config/oes-autopilot/autopilot.properties @@ -25,16 +25,16 @@ gate.url={{ .Values.global.oesGate.protocol }}://{{ .Values.global.oesGate.host #datascience configuration oes.datascience.baseUrl=http://oes-datascience:5005 -build.analysis=false -ds.async.flow=true +#build.analysis=false +ds.async.flow=false #storage configuration #storage.type =file_storage -storage.type =object_storage -storage.endpoint=http://{{ .Release.Name }}-minio:9000 -storage.accesskey = {{ .Values.global.minio.accessKey }} -storage.secretkey = {{ .Values.global.minio.secretKey }} -storage.region= {{ .Values.global.minio.region }} -ds.seperate.service=true +#storage.type =object_storage +#storage.endpoint=http://{{ .Release.Name }}-minio:9000 +#storage.accesskey = {{ .Values.global.minio.accessKey }} +#storage.secretkey = {{ .Values.global.minio.secretKey }} +#storage.region= {{ .Values.global.minio.region }} +ds.seperate.service=false diff --git a/charts/oes/config/oes-gate/gate.yml b/charts/oes/config/oes-gate/gate.yml index b6095684..590c345e 100644 --- a/charts/oes/config/oes-gate/gate.yml +++ b/charts/oes/config/oes-gate/gate.yml @@ -169,8 +169,8 @@ security: basic: enabled: true user: {} -oauth2: -{{ toYaml .Values.gate.config.oauth2 | indent 2 }} + oauth2: +{{ toYaml .Values.gate.config.oauth2 | indent 4 }} {{- end }} file: enabled: {{ .Values.gate.config.fileBasedAuthentication.enabled }} diff --git a/charts/oes/templates/clouddriver-sidecar/k8sconfig-sync.yaml b/charts/oes/templates/clouddriver-sidecar/k8sconfig-sync.yaml index 85d712a7..7b97232d 100644 --- a/charts/oes/templates/clouddriver-sidecar/k8sconfig-sync.yaml +++ b/charts/oes/templates/clouddriver-sidecar/k8sconfig-sync.yaml @@ -9,8 +9,8 @@ data: mkdir -p /opsmx echo " ####### Cloning the Dynamic Account Repo #################" git clone -c http.sslVerify=false $GIT_CLONE_PARAM - cd $DYNAMIC_ACCOUNTS_REPO/ - cat clouddriver-local.yml |grep -i opsmx |awk '{print $2}' |tr -d '"' | awk 'BEGIN{FS="/opsmx/"}{print $2}' > /opsmx/config_files.txt + #cd $DYNAMIC_ACCOUNTS_REPO/ + cat $DYNAMIC_ACCOUNTS_REPO/{{ .Values.spinnaker.gitopsHalyard.repo.dynAccntConfigPath }}/clouddriver-local.yml |grep -i opsmx |awk '{print $2}' |tr -d '"' | awk 'BEGIN{FS="/opsmx/"}{print $2}' > /opsmx/config_files.txt for config in $(cat /opsmx/config_files.txt) do kubectl get secrets $config -o=jsonpath='{.data.*}'|base64 -d > /opsmx/$config