From 04f648a3a38008aeaf2aadd356a485c2af362826 Mon Sep 17 00:00:00 2001 From: Pete Birley Date: Thu, 21 Jun 2018 04:08:28 +0000 Subject: [PATCH] Revert "Helm-toolkit: Updates manifests to support openstack logging.conf" This reverts commit ad5d4259c45940bf4ddd150aad37c5b8d1aabba6. We need to revert this - as until the charts are updated OSH is broken. Change-Id: I58db4c0bf7bdccd8ba7cd1e63af00ff1f01c343a --- .zuul.yaml | 14 +++++--------- .../manifests/_job-db-drop-mysql.yaml.tpl | 6 +----- .../manifests/_job-db-init-mysql.yaml.tpl | 6 +----- .../templates/manifests/_job-db-sync.yaml.tpl | 6 +----- 4 files changed, 8 insertions(+), 24 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index d6c45e2d5..5397f639f 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -32,7 +32,6 @@ - ^doc/.*$ - ^releasenotes/.*$ - openstack-helm-infra-kubernetes-keystone-auth: - voting: false irrelevant-files: - ^.*\.rst$ - ^doc/.*$ @@ -55,14 +54,11 @@ - ^.*\.rst$ - ^doc/.*$ - ^releasenotes/.*$ - #NOTE(srwilkers): Changing this job to nonvoting until the htk changes - # in this patchset are merged, as these changes will cause some osh - # charts to fail to lint - # - openstack-helm-infra-kubernetes-keystone-auth: - # irrelevant-files: - # - ^.*\.rst$ - # - ^doc/.*$ - # - ^releasenotes/.*$ + - openstack-helm-infra-kubernetes-keystone-auth: + irrelevant-files: + - ^.*\.rst$ + - ^doc/.*$ + - ^releasenotes/.*$ experimental: jobs: #NOTE(srwilkers): Make fedora job experimental until issues resolved diff --git a/helm-toolkit/templates/manifests/_job-db-drop-mysql.yaml.tpl b/helm-toolkit/templates/manifests/_job-db-drop-mysql.yaml.tpl index 27b347a60..43cae950b 100644 --- a/helm-toolkit/templates/manifests/_job-db-drop-mysql.yaml.tpl +++ b/helm-toolkit/templates/manifests/_job-db-drop-mysql.yaml.tpl @@ -30,7 +30,7 @@ limitations under the License. {{- $nodeSelector := index . "nodeSelector" | default ( dict $envAll.Values.labels.job.node_selector_key $envAll.Values.labels.job.node_selector_value ) -}} {{- $configMapBin := index . "configMapBin" | default (printf "%s-%s" $serviceName "bin" ) -}} {{- $configMapEtc := index . "configMapEtc" | default (printf "%s-%s" $serviceName "etc" ) -}} -{{- $dbToDrop := index . "dbToDrop" | default ( dict "adminSecret" $envAll.Values.secrets.oslo_db.admin "configFile" (printf "/etc/%s/%s.conf" $serviceName $serviceName ) "logConfigFile" (printf "/etc/%s/logging.conf" $serviceName ) "configDbSection" "database" "configDbKey" "connection" ) -}} +{{- $dbToDrop := index . "dbToDrop" | default ( dict "adminSecret" $envAll.Values.secrets.oslo_db.admin "configFile" (printf "/etc/%s/%s.conf" $serviceName $serviceName ) "configDbSection" "database" "configDbKey" "connection" ) -}} {{- $dbsToDrop := default (list $dbToDrop) (index . "dbsToDrop") }} {{- $serviceNamePretty := $serviceName | replace "_" "-" -}} @@ -99,10 +99,6 @@ spec: mountPath: {{ $dbToDrop.configFile | quote }} subPath: {{ base $dbToDrop.configFile | quote }} readOnly: true - - name: db-drop-conf - mountPath: {{ $dbToDrop.logConfigFile | quote }} - subPath: {{ base $dbToDrop.logConfigFile | quote }} - readOnly: true {{- end }} {{- end }} volumes: diff --git a/helm-toolkit/templates/manifests/_job-db-init-mysql.yaml.tpl b/helm-toolkit/templates/manifests/_job-db-init-mysql.yaml.tpl index 8e7e436f8..1656729cf 100644 --- a/helm-toolkit/templates/manifests/_job-db-init-mysql.yaml.tpl +++ b/helm-toolkit/templates/manifests/_job-db-init-mysql.yaml.tpl @@ -30,7 +30,7 @@ limitations under the License. {{- $nodeSelector := index . "nodeSelector" | default ( dict $envAll.Values.labels.job.node_selector_key $envAll.Values.labels.job.node_selector_value ) -}} {{- $configMapBin := index . "configMapBin" | default (printf "%s-%s" $serviceName "bin" ) -}} {{- $configMapEtc := index . "configMapEtc" | default (printf "%s-%s" $serviceName "etc" ) -}} -{{- $dbToInit := index . "dbToInit" | default ( dict "adminSecret" $envAll.Values.secrets.oslo_db.admin "configFile" (printf "/etc/%s/%s.conf" $serviceName $serviceName ) "logConfigFile" (printf "/etc/%s/logging.conf" $serviceName ) "configDbSection" "database" "configDbKey" "connection" ) -}} +{{- $dbToInit := index . "dbToInit" | default ( dict "adminSecret" $envAll.Values.secrets.oslo_db.admin "configFile" (printf "/etc/%s/%s.conf" $serviceName $serviceName ) "configDbSection" "database" "configDbKey" "connection" ) -}} {{- $dbsToInit := default (list $dbToInit) (index . "dbsToInit") }} {{- $serviceNamePretty := $serviceName | replace "_" "-" -}} @@ -96,10 +96,6 @@ spec: mountPath: {{ $dbToInit.configFile | quote }} subPath: {{ base $dbToInit.configFile | quote }} readOnly: true - - name: db-init-conf - mountPath: {{ $dbToInit.logConfigFile | quote }} - subPath: {{ base $dbToInit.logConfigFile | quote }} - readOnly: true {{- end }} {{- end }} volumes: diff --git a/helm-toolkit/templates/manifests/_job-db-sync.yaml.tpl b/helm-toolkit/templates/manifests/_job-db-sync.yaml.tpl index df64ecf21..9ce6aafd3 100644 --- a/helm-toolkit/templates/manifests/_job-db-sync.yaml.tpl +++ b/helm-toolkit/templates/manifests/_job-db-sync.yaml.tpl @@ -28,7 +28,7 @@ limitations under the License. {{- $podVolMounts := index . "podVolMounts" | default false -}} {{- $podVols := index . "podVols" | default false -}} {{- $podEnvVars := index . "podEnvVars" | default false -}} -{{- $dbToSync := index . "dbToSync" | default ( dict "configFile" (printf "/etc/%s/%s.conf" $serviceName $serviceName ) "logConfigFile" (printf "/etc/%s/logging.conf" $serviceName ) "image" ( index $envAll.Values.images.tags ( printf "%s_db_sync" $serviceName )) ) -}} +{{- $dbToSync := index . "dbToSync" | default ( dict "configFile" (printf "/etc/%s/%s.conf" $serviceName $serviceName ) "image" ( index $envAll.Values.images.tags ( printf "%s_db_sync" $serviceName )) ) -}} {{- $serviceNamePretty := $serviceName | replace "_" "-" -}} @@ -73,10 +73,6 @@ spec: mountPath: {{ $dbToSync.configFile | quote }} subPath: {{ base $dbToSync.configFile | quote }} readOnly: true - - name: db-sync-conf - mountPath: {{ $dbToSync.logConfigFile | quote }} - subPath: {{ base $dbToSync.logConfigFile | quote }} - readOnly: true {{- if $podVolMounts }} {{ $podVolMounts | toYaml | indent 12 }} {{- end }}