airship/maas
Code Issues Proposed changes

Merge "Helm 3: Fix Job labels"

Browse Source
This commit is contained in:
Zuul 2021-10-05 03:24:05 +00:00 committed by Gerrit Code Review
commit c5f6fc0f34
6 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
charts/maas/templates/job-bootstrap-admin-user.yaml
View File

@ -23,6 +23,8 @@ apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
name: maas-bootstrap-admin-user name: maas-bootstrap-admin-user
labels:
{{ tuple $envAll "maas" "bootstrap-admin-user" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
annotations: annotations:
{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
spec: spec:

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

@ -23,6 +23,8 @@ apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
name: maas-db-init name: maas-db-init
labels:
{{ tuple $envAll "maas" "db-init" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
annotations: annotations:
{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
spec: spec:

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

@ -23,6 +23,8 @@ apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
name: maas-db-sync name: maas-db-sync
labels:
{{ tuple $envAll "maas" "db-sync" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
annotations: annotations:
{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
spec: spec:

2
charts/maas/templates/job-export-api-key.yaml
View File

@ -69,6 +69,8 @@ apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
name: maas-export-api-key name: maas-export-api-key
labels:
{{ tuple $envAll "maas" "export-api-key" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
spec: spec:
template: template:
metadata: metadata:

2
charts/maas/templates/job-import.yaml
View File

@ -23,6 +23,8 @@ apiVersion: batch/v1
kind: Job kind: Job
metadata: metadata:
name: maas-import-resources name: maas-import-resources
labels:
{{ tuple $envAll "maas" "import-resources" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
annotations: annotations:
{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
spec: spec:

2
tools/helm_tk.sh
View File

@ -18,7 +18,7 @@
HELM=$1 HELM=$1
HTK_REPO=${HTK_REPO:-"https://github.com/openstack/openstack-helm-infra"} HTK_REPO=${HTK_REPO:-"https://github.com/openstack/openstack-helm-infra"}
HTK_PATH=${HTK_PATH:-""} HTK_PATH=${HTK_PATH:-""}
HTK_STABLE_COMMIT=${HTK_COMMIT:-"9797d1b034529c9739c19a30193c3605321fcf91"} HTK_STABLE_COMMIT=${HTK_COMMIT:-"b1a247e7f54ab12d830ab74f7634457b4e43f3ef"}
DEP_UP_LIST=${DEP_UP_LIST:-"maas"} DEP_UP_LIST=${DEP_UP_LIST:-"maas"}
if [[ ! -z $(echo $http_proxy) ]] if [[ ! -z $(echo $http_proxy) ]]