openstack/openstack-helm-infra
Code Issues Proposed changes

Helm-toolkit: Updates manifests to support openstack logging.conf

Browse Source 
This modifies the manifest files to include volume mounts for
the logging configuration file, which is required for the jobs
in the charts to function

This also makes the keystone-webhook job nonvting, as the htk
changes will break the osh-charts required for the keystone
webhook job.  The change to add the required fixes can be found
here: https://review.openstack.org/#/c/576001/.

Once that change is merged, we can move the keystone-webhook job
back to a voting job

Change-Id: I6ae59e2736624fff5b072e89b6043b23bc8b7f5d
This commit is contained in:
Steve Wilkerson 2018-06-19 14:01:01 -05:00
parent 71edb4acb3
commit ad5d4259c4
4 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
.zuul.yaml
View File

@ -32,6 +32,7 @@
- ^doc/.*$
- ^releasenotes/.*$
- openstack-helm-infra-kubernetes-keystone-auth:
voting: false
irrelevant-files:
- ^.*\.rst$
- ^doc/.*$
@ -54,11 +55,14 @@
- ^.*\.rst$
- ^doc/.*$
- ^releasenotes/.*$
- openstack-helm-infra-kubernetes-keystone-auth:
irrelevant-files:
- ^.*\.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/.*$
experimental:
jobs:
#NOTE(srwilkers): Make fedora job experimental until issues resolved

6
helm-toolkit/templates/manifests/_job-db-drop-mysql.yaml.tpl
View File

@ -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 ) "configDbSection" "database" "configDbKey" "connection" ) -}}
{{- $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" ) -}}
{{- $dbsToDrop := default (list $dbToDrop) (index . "dbsToDrop") }}
{{- $serviceNamePretty := $serviceName | replace "_" "-" -}}
@ -99,6 +99,10 @@ 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:

6
helm-toolkit/templates/manifests/_job-db-init-mysql.yaml.tpl
View File

@ -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 ) "configDbSection" "database" "configDbKey" "connection" ) -}}
{{- $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" ) -}}
{{- $dbsToInit := default (list $dbToInit) (index . "dbsToInit") }}
{{- $serviceNamePretty := $serviceName | replace "_" "-" -}}
@ -96,6 +96,10 @@ 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:

6
helm-toolkit/templates/manifests/_job-db-sync.yaml.tpl
View File

@ -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 ) "image" ( index $envAll.Values.images.tags ( printf "%s_db_sync" $serviceName )) ) -}}
{{- $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 )) ) -}}
{{- $serviceNamePretty := $serviceName | replace "_" "-" -}}
@ -73,6 +73,10 @@ 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 }}