openstack/openstack-helm
Code Issues Proposed changes

dependencies: move static dependencies under a 'static' key

Browse Source 
This PS moves static dependencies unser a 'static' key to allow
expansion to cover dynamic dependencies.

Change-Id: Ia0e853564955e0fbbe5a9e91a8b8924c703b1b02
This commit is contained in:
Pete Birley
2018-02-23 10:35:23 -08:00
committed by portdirect
parent b84fd4da05
commit e0c688d7ee
66 changed files with 308 additions and 290 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
prometheus-openstack-exporter/templates/deployment.yaml
View File

@@ -19,9 +19,9 @@ limitations under the License.
{{- $ksUserSecret := .Values.secrets.identity.user }}
{{- if .Values.images.local_registry.active -}}
{{- $_ := set .Values "pod_dependency" dict -}}
{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.prometheus_openstack_exporter .Values.conditional_dependencies.local_image_registry) -}}
{{- $_ := include "helm-toolkit.utils.merge" (tuple .Values.pod_dependency .Values.dependencies.static.prometheus_openstack_exporter .Values.conditional_dependencies.local_image_registry) -}}
{{- else -}}
{{- $_ := set .Values "pod_dependency" .Values.dependencies.prometheus_openstack_exporter -}}
{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.prometheus_openstack_exporter -}}
{{- end -}}
{{- $serviceAccountName := "prometheus-openstack-exporter" }}

2
prometheus-openstack-exporter/templates/job-image-repo-sync.yaml
View File

@@ -17,7 +17,7 @@ limitations under the License.
{{- if .Values.manifests.job_image_repo_sync }}
{{- $envAll := . }}
{{- if .Values.images.local_registry.active -}}
{{- $_ := set .Values "pod_dependency" .Values.dependencies.image_repo_sync -}}
{{- $_ := set .Values "pod_dependency" .Values.dependencies.static.image_repo_sync -}}
{{- $serviceAccountName := "prometheus-openstack-exporter-image-repo-sync"}}
{{ tuple $envAll $envAll.Values.pod_dependency $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}

2
prometheus-openstack-exporter/templates/job-ks-user.yaml
View File

@@ -16,7 +16,7 @@ limitations under the License.
{{- if .Values.manifests.job_ks_user }}
{{- $envAll := . }}
{{- $dependencies := .Values.dependencies.ks_user }}
{{- $dependencies := .Values.dependencies.static.ks_user }}
{{- $serviceAccountName := "prometheus-openstack-exporter-ks-user" }}
{{ tuple $envAll $dependencies $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}

29
prometheus-openstack-exporter/values.yaml
View File

@@ -82,20 +82,21 @@ pod:
cpu: "2000m"
dependencies:
ks_user:
services:
- service: identity
endpoint: internal
prometheus_openstack_exporter:
jobs:
- prometheus-openstack-exporter-ks-user
services:
- service: identity
endpoint: internal
image_repo_sync:
services:
- service: local_image_registry
endpoint: internal
static:
image_repo_sync:
services:
- endpoint: internal
service: local_image_registry
ks_user:
services:
- endpoint: internal
service: identity
prometheus_openstack_exporter:
jobs:
- prometheus-openstack-exporter-ks-user
services:
- endpoint: internal
service: identity
conditional_dependencies:
local_image_registry: