airship
/
drydock
Code Issues Proposed changes

Compat with HTK images structure change 

Helm-toolk changed the images structure to include a
tags stanza. Make this chart compatible.

Change-Id: I2111af7e40e6f5490c8ad9d68fbfb97e3e8fea3e
This commit is contained in:
Scott Hussey 2017-10-26 11:15:32 -05:00
parent 3eac4d4d53
commit 111cd7a129
7 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
charts/drydock/templates/deployment.yaml
View File

@ -43,7 +43,7 @@ spec:
secretKeyRef: secretKeyRef:
name: 'maas-api-key' name: 'maas-api-key'
key: 'token' key: 'token'
image: {{ .Values.images.drydock }} image: {{ .Values.images.tags.drydock }}
imagePullPolicy: {{ .Values.images.pull_policy }} imagePullPolicy: {{ .Values.images.pull_policy }}
{{ tuple $envAll $envAll.Values.pod.resources.api | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.api | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
ports: ports:

2
charts/drydock/templates/job-drydock-db-init.yaml
View File

@ -35,7 +35,7 @@ spec:
{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
containers: containers:
- name: drydock-db-sync - name: drydock-db-sync
image: {{ .Values.images.drydock_db_sync | quote }} image: {{ .Values.images.tags.drydock_db_sync | quote }}
imagePullPolicy: {{ .Values.images.pull_policy | quote }} imagePullPolicy: {{ .Values.images.pull_policy | quote }}
{{ tuple $envAll $envAll.Values.pod.resources.jobs.drydock_db_sync | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.drydock_db_sync | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
env: env:

2
charts/drydock/templates/job-drydock-db-sync.yaml
View File

@ -35,7 +35,7 @@ spec:
{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
containers: containers:
- name: drydock-db-init - name: drydock-db-init
image: {{ .Values.images.drydock_db_init | quote }} image: {{ .Values.images.tags.drydock_db_init | quote }}
imagePullPolicy: {{ .Values.images.pull_policy | quote }} imagePullPolicy: {{ .Values.images.pull_policy | quote }}
{{ tuple $envAll $envAll.Values.pod.resources.jobs.drydock_db_init | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.drydock_db_init | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
env: env:

2
charts/drydock/templates/job-ks-endpoints.yaml
View File

@ -37,7 +37,7 @@ spec:
{{- range $key1, $osServiceType := tuple "physicalprovisioner" }} {{- range $key1, $osServiceType := tuple "physicalprovisioner" }}
{{- range $key2, $osServiceEndPoint := tuple "admin" "internal" "public" }} {{- range $key2, $osServiceEndPoint := tuple "admin" "internal" "public" }}
- name: {{ $osServiceType }}-ks-endpoints-{{ $osServiceEndPoint }} - name: {{ $osServiceType }}-ks-endpoints-{{ $osServiceEndPoint }}
image: {{ $envAll.Values.images.ks_endpoints }} image: {{ $envAll.Values.images.tags.ks_endpoints }}
imagePullPolicy: {{ $envAll.Values.images.pull_policy }} imagePullPolicy: {{ $envAll.Values.images.pull_policy }}
{{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_endpoints | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_endpoints | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
command: command:

2
charts/drydock/templates/job-ks-service.yaml
View File

@ -37,7 +37,7 @@ spec:
containers: containers:
{{- range $key1, $osServiceType := tuple "physicalprovisioner" }} {{- range $key1, $osServiceType := tuple "physicalprovisioner" }}
- name: {{ $osServiceType }}-ks-service-registration - name: {{ $osServiceType }}-ks-service-registration
image: {{ $envAll.Values.images.ks_service }} image: {{ $envAll.Values.images.tags.ks_service }}
imagePullPolicy: {{ $envAll.Values.images.pull_policy }} imagePullPolicy: {{ $envAll.Values.images.pull_policy }}
command: command:
- /tmp/ks-service.sh - /tmp/ks-service.sh

2
charts/drydock/templates/job-ks-user.yaml
View File

@ -35,7 +35,7 @@ spec:
{{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }} {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
containers: containers:
- name: drydock-ks-user - name: drydock-ks-user
image: {{ .Values.images.ks_user }} image: {{ .Values.images.tags.ks_user }}
imagePullPolicy: {{ .Values.images.pull_policy }} imagePullPolicy: {{ .Values.images.pull_policy }}
{{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_user | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }} {{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_user | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
command: command:

15
charts/drydock/values.yaml
View File

@ -22,13 +22,14 @@ labels:
node_selector_value: enabled node_selector_value: enabled
images: images:
drydock: quay.io/attcomdev/drydock:1.0.1 tags:
dep_check: docker.io/kolla/ubuntu-source-kubernetes-entrypoint:4.0.0 drydock: quay.io/attcomdev/drydock:1.0.1
ks_user: docker.io/kolla/ubuntu-source-kolla-toolbox:3.0.3 dep_check: docker.io/kolla/ubuntu-source-kubernetes-entrypoint:4.0.0
ks_service: docker.io/kolla/ubuntu-source-kolla-toolbox:3.0.3 ks_user: docker.io/kolla/ubuntu-source-kolla-toolbox:3.0.3
ks_endpoints: docker.io/kolla/ubuntu-source-kolla-toolbox:3.0.3 ks_service: docker.io/kolla/ubuntu-source-kolla-toolbox:3.0.3
drydock_db_init: docker.io/postgres:9.5 ks_endpoints: docker.io/kolla/ubuntu-source-kolla-toolbox:3.0.3
drydock_db_sync: quay.io/attcomdev/drydock:1.0.1 drydock_db_init: docker.io/postgres:9.5
drydock_db_sync: quay.io/attcomdev/drydock:1.0.1
pull_policy: "IfNotPresent" pull_policy: "IfNotPresent"
network: network: