From cf9c0fc68575541811624ba373e34be13445a932 Mon Sep 17 00:00:00 2001 From: irti Date: Mon, 8 Jul 2019 12:32:19 +0500 Subject: [PATCH 1/2] [fix-deployment-template] fix deployment template. Custom annotations check causing the ignore-resources field addition to fail --- .../chart/reloader/templates/deployment.yaml | 33 ++++++++++--------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/deployments/kubernetes/chart/reloader/templates/deployment.yaml b/deployments/kubernetes/chart/reloader/templates/deployment.yaml index c52fe52..a72a2f7 100644 --- a/deployments/kubernetes/chart/reloader/templates/deployment.yaml +++ b/deployments/kubernetes/chart/reloader/templates/deployment.yaml @@ -87,27 +87,30 @@ spec: - mountPath: /tmp/ name: tmp-volume {{- end }} - {{- if .Values.reloader.custom_annotations }} args: - {{- if .Values.reloader.custom_annotations.configmap }} - - "--configmap-annotation" - - "{{ .Values.reloader.custom_annotations.configmap }}" - {{- end }} - {{- if .Values.reloader.custom_annotations.secret }} - - "--secret-annotation" - - "{{ .Values.reloader.custom_annotations.secret }}" - {{- end }} - {{- if .Values.reloader.custom_annotations.auto }} - - "--auto-annotation" - - "{{ .Values.reloader.custom_annotations.auto }}" - {{- end }} - {{- if eq .Values.reloader.ignoreSecrets true }} + + {{- if .Values.reloader.ignoreSecrets }} - "--resources-to-ignore=secrets" {{- end }} {{- if eq .Values.reloader.ignoreConfigMaps true }} - "--resources-to-ignore=configMaps" {{- end }} - {{- end }} + + {{- if .Values.reloader.custom_annotations }} + {{- if .Values.reloader.custom_annotations.configmap }} + - "--configmap-annotation" + - "{{ .Values.reloader.custom_annotations.configmap }}" + {{- end }} + {{- if .Values.reloader.custom_annotations.secret }} + - "--secret-annotation" + - "{{ .Values.reloader.custom_annotations.secret }}" + {{- end }} + {{- if .Values.reloader.custom_annotations.auto }} + - "--auto-annotation" + - "{{ .Values.reloader.custom_annotations.auto }}" + {{- end }} + {{- end }} + {{- if .Values.reloader.deployment.resources }} resources: {{ toYaml .Values.reloader.deployment.resources | indent 10 }} From 5fc34e885e44051a78df77af42bac35c98c270e5 Mon Sep 17 00:00:00 2001 From: stakater-user Date: Mon, 8 Jul 2019 08:28:55 +0000 Subject: [PATCH 2/2] Bump Version to v0.0.36 --- .version | 2 +- .../kubernetes/chart/reloader/Chart.yaml | 4 ++-- .../kubernetes/chart/reloader/values.yaml | 4 ++-- .../kubernetes/manifests/clusterrole.yaml | 2 +- .../manifests/clusterrolebinding.yaml | 2 +- .../kubernetes/manifests/deployment.yaml | 11 ++++++----- .../kubernetes/manifests/serviceaccount.yaml | 2 +- deployments/kubernetes/reloader.yaml | 17 +++++++++-------- 8 files changed, 23 insertions(+), 21 deletions(-) diff --git a/.version b/.version index e9dfc3d..bc6ec85 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -v0.0.35 +v0.0.36 diff --git a/deployments/kubernetes/chart/reloader/Chart.yaml b/deployments/kubernetes/chart/reloader/Chart.yaml index 4b06acc..07f4306 100644 --- a/deployments/kubernetes/chart/reloader/Chart.yaml +++ b/deployments/kubernetes/chart/reloader/Chart.yaml @@ -3,8 +3,8 @@ apiVersion: v1 name: reloader description: Reloader chart that runs on kubernetes -version: v0.0.35 -appVersion: v0.0.35 +version: v0.0.36 +appVersion: v0.0.36 keywords: - Reloader - kubernetes diff --git a/deployments/kubernetes/chart/reloader/values.yaml b/deployments/kubernetes/chart/reloader/values.yaml index 7ea5186..b306b19 100644 --- a/deployments/kubernetes/chart/reloader/values.yaml +++ b/deployments/kubernetes/chart/reloader/values.yaml @@ -37,10 +37,10 @@ reloader: labels: provider: stakater group: com.stakater.platform - version: v0.0.35 + version: v0.0.36 image: name: stakater/reloader - tag: "v0.0.35" + tag: "v0.0.36" pullPolicy: IfNotPresent # Support for extra environment variables. env: diff --git a/deployments/kubernetes/manifests/clusterrole.yaml b/deployments/kubernetes/manifests/clusterrole.yaml index ef10ca7..1cabcf2 100644 --- a/deployments/kubernetes/manifests/clusterrole.yaml +++ b/deployments/kubernetes/manifests/clusterrole.yaml @@ -6,7 +6,7 @@ kind: ClusterRole metadata: labels: app: reloader - chart: "reloader-v0.0.35" + chart: "reloader-v0.0.36" release: "RELEASE-NAME" heritage: "Tiller" name: reloader-role diff --git a/deployments/kubernetes/manifests/clusterrolebinding.yaml b/deployments/kubernetes/manifests/clusterrolebinding.yaml index 1c05607..6f73ff4 100644 --- a/deployments/kubernetes/manifests/clusterrolebinding.yaml +++ b/deployments/kubernetes/manifests/clusterrolebinding.yaml @@ -6,7 +6,7 @@ kind: ClusterRoleBinding metadata: labels: app: reloader - chart: "reloader-v0.0.35" + chart: "reloader-v0.0.36" release: "RELEASE-NAME" heritage: "Tiller" name: reloader-role-binding diff --git a/deployments/kubernetes/manifests/deployment.yaml b/deployments/kubernetes/manifests/deployment.yaml index 53ee240..6f49fbd 100644 --- a/deployments/kubernetes/manifests/deployment.yaml +++ b/deployments/kubernetes/manifests/deployment.yaml @@ -5,12 +5,12 @@ kind: Deployment metadata: labels: app: reloader - chart: "reloader-v0.0.35" + chart: "reloader-v0.0.36" release: "RELEASE-NAME" heritage: "Tiller" group: com.stakater.platform provider: stakater - version: v0.0.35 + version: v0.0.36 name: reloader spec: @@ -24,18 +24,19 @@ spec: metadata: labels: app: reloader - chart: "reloader-v0.0.35" + chart: "reloader-v0.0.36" release: "RELEASE-NAME" heritage: "Tiller" group: com.stakater.platform provider: stakater - version: v0.0.35 + version: v0.0.36 spec: containers: - env: - image: "stakater/reloader:v0.0.35" + image: "stakater/reloader:v0.0.36" imagePullPolicy: IfNotPresent name: reloader + args: serviceAccountName: reloader diff --git a/deployments/kubernetes/manifests/serviceaccount.yaml b/deployments/kubernetes/manifests/serviceaccount.yaml index a68a0fe..407ed83 100644 --- a/deployments/kubernetes/manifests/serviceaccount.yaml +++ b/deployments/kubernetes/manifests/serviceaccount.yaml @@ -6,7 +6,7 @@ kind: ServiceAccount metadata: labels: app: reloader - chart: "reloader-v0.0.35" + chart: "reloader-v0.0.36" release: "RELEASE-NAME" heritage: "Tiller" name: reloader diff --git a/deployments/kubernetes/reloader.yaml b/deployments/kubernetes/reloader.yaml index fbfa361..fd91dcb 100644 --- a/deployments/kubernetes/reloader.yaml +++ b/deployments/kubernetes/reloader.yaml @@ -9,12 +9,12 @@ kind: Deployment metadata: labels: app: reloader - chart: "reloader-v0.0.35" + chart: "reloader-v0.0.36" release: "RELEASE-NAME" heritage: "Tiller" group: com.stakater.platform provider: stakater - version: v0.0.35 + version: v0.0.36 name: reloader spec: @@ -28,19 +28,20 @@ spec: metadata: labels: app: reloader - chart: "reloader-v0.0.35" + chart: "reloader-v0.0.36" release: "RELEASE-NAME" heritage: "Tiller" group: com.stakater.platform provider: stakater - version: v0.0.35 + version: v0.0.36 spec: containers: - env: - image: "stakater/reloader:v0.0.35" + image: "stakater/reloader:v0.0.36" imagePullPolicy: IfNotPresent name: reloader + args: serviceAccountName: reloader --- @@ -51,7 +52,7 @@ kind: ClusterRole metadata: labels: app: reloader - chart: "reloader-v0.0.35" + chart: "reloader-v0.0.36" release: "RELEASE-NAME" heritage: "Tiller" name: reloader-role @@ -100,7 +101,7 @@ kind: ClusterRoleBinding metadata: labels: app: reloader - chart: "reloader-v0.0.35" + chart: "reloader-v0.0.36" release: "RELEASE-NAME" heritage: "Tiller" name: reloader-role-binding @@ -122,7 +123,7 @@ kind: ServiceAccount metadata: labels: app: reloader - chart: "reloader-v0.0.35" + chart: "reloader-v0.0.36" release: "RELEASE-NAME" heritage: "Tiller" name: reloader