From 0b3c14048c9642873a53b1e2ef80145feb17d16b Mon Sep 17 00:00:00 2001 From: Kamal Acharya Date: Fri, 14 Apr 2023 15:23:36 +0530 Subject: [PATCH 1/8] new changes --- charts/gitsensor/templates/generic.yaml | 29 ++++++++++++++ charts/gitsensor/values.yaml | 52 +++++++++++++++++++++++++ 2 files changed, 81 insertions(+) diff --git a/charts/gitsensor/templates/generic.yaml b/charts/gitsensor/templates/generic.yaml index 5dff6162..3de1e82a 100644 --- a/charts/gitsensor/templates/generic.yaml +++ b/charts/gitsensor/templates/generic.yaml @@ -52,7 +52,36 @@ spec: - name: {{ $key }} value: {{ $val | quote }} {{- end }} + + {{- range .Values.gitsensor }} + envFrom: + {{- if .ConfigMaps.enabled }} + {{- range .ConfigMaps.maps }} + {{- if eq .type "environment" }} + - configMapRef: + {{- if eq .external true }} + name: {{ .name }} + {{- else if eq .external false }} + name: {{ .name}}-{{ $.Values.app }} + {{- end }} + {{- end }} + {{- end }} + {{- end }} + {{- if .ConfigSecrets.enabled }} + {{- range .ConfigSecrets.secrets }} + {{- if eq .type "environment" }} + - secretRef: + {{if eq .external true}} + name: {{ .name }} + {{else if eq .external false}} + name: {{ .name}}-{{ $.Values.app }} + {{- end }} + {{- end }} + {{- end }} + {{- end }} + {{- if $.Values.gitsensor.spec.resources}} + resources: {{ toYaml .Values.gitsensor.spec.resources | indent 12 -}} {{- end}} diff --git a/charts/gitsensor/values.yaml b/charts/gitsensor/values.yaml index 5b08b832..603ea52e 100644 --- a/charts/gitsensor/values.yaml +++ b/charts/gitsensor/values.yaml @@ -48,6 +48,58 @@ gitsensor: # operator: In # values: # - us-east-2 + + ConfigMaps: + enabled: false + maps: [] + # - name: config-map-1 + # type: environment + # external: false + # data: + # key1: key1value-1 + # key2: key2value-1 + # key3: key3value-1 + # - name: config-map-2 + # type: volume + # external: false + # mountPath: /etc/config/2 + # data: + # key1: | + # club : manchester utd + # nation : england + # key2: abc-2 + # key3: abc-2 + # - name: config-map-3 + # type: environment + # external: true + # mountPath: /etc/config/3 + # data: [] + # - name: config-map-4 + # type: volume + # external: true + # mountPath: /etc/config/4 + # data: [] + + + ConfigSecrets: + enabled: false + secrets: [] + # - name: config-secret-1 + # type: environment + # external: false + # data: + # key1: key1value-1 + # key2: key2value-1 + # key3: key3value-1 + # - name: config-secret-2 + # type: volume + # external: false + # mountPath: /etc/config/2 + # data: + # key1: | + # club : manchester utd + # nation : england + # key2: abc-2 storage: class: gp2 requests: 2Gi From c770fc813b477eedd9d8d03be24271f028b3b24d Mon Sep 17 00:00:00 2001 From: Kamal Acharya Date: Fri, 14 Apr 2023 18:40:19 +0530 Subject: [PATCH 2/8] changes --- charts/gitsensor/templates/generic.yaml | 48 ++++++++------------ charts/gitsensor/values.yaml | 58 +++---------------------- 2 files changed, 25 insertions(+), 81 deletions(-) diff --git a/charts/gitsensor/templates/generic.yaml b/charts/gitsensor/templates/generic.yaml index 3de1e82a..98d8f976 100644 --- a/charts/gitsensor/templates/generic.yaml +++ b/charts/gitsensor/templates/generic.yaml @@ -29,8 +29,8 @@ spec: template: metadata: labels: - {{- if .Values.gitsensor.spec.template.metadata.labels }} -{{ toYaml .Values.gitsensor.spec.template.metadata.labels | indent 8 }} + {{- if $.Values.gitsensor.spec.template.metadata.labels }} +{{ toYaml $.Values.gitsensor.spec.template.metadata.labels | nindent 8 }} {{- end }} spec: terminationGracePeriodSeconds: 10 @@ -50,42 +50,30 @@ spec: env: {{- range $key, $val := .Values.gitsensor.envVariables.data }} - name: {{ $key }} - value: {{ $val | quote }} + value: {{ $val | quote }} {{- end }} - - {{- range .Values.gitsensor }} + {{- with .Values.gitsensor.envFrom }} + {{- if or (.configMapRef) (.configSecretRef) }} envFrom: - {{- if .ConfigMaps.enabled }} - {{- range .ConfigMaps.maps }} - {{- if eq .type "environment" }} + {{- with .configMapRef }} - configMapRef: - {{- if eq .external true }} - name: {{ .name }} - {{- else if eq .external false }} - name: {{ .name}}-{{ $.Values.app }} - {{- end }} + {{- range . }} + name: {{ . }} {{- end }} {{- end }} + {{- with .configSecretRef }} + - secretRef: + {{- range . }} + name: {{ . }} {{- end }} - {{- if .ConfigSecrets.enabled }} - {{- range .ConfigSecrets.secrets }} - {{- if eq .type "environment" }} - - secretRef: - {{if eq .external true}} - name: {{ .name }} - {{else if eq .external false}} - name: {{ .name}}-{{ $.Values.app }} - {{- end }} - {{- end }} - {{- end }} - {{- end }} - + {{- end }} + {{- end }} + {{- end }} {{- if $.Values.gitsensor.spec.resources}} - resources: -{{ toYaml .Values.gitsensor.spec.resources | indent 12 -}} -{{- end}} - {{- if .Values.containerSecurityContext }} +{{ toYaml .Values.gitsensor.spec.resources | indent 12 }} + {{- end}} + {{- if .Values.containerSecurityContext }} securityContext: {{ toYaml .Values.containerSecurityContext | indent 12 }} {{- end }} diff --git a/charts/gitsensor/values.yaml b/charts/gitsensor/values.yaml index 603ea52e..5631ab8c 100644 --- a/charts/gitsensor/values.yaml +++ b/charts/gitsensor/values.yaml @@ -49,57 +49,13 @@ gitsensor: # values: # - us-east-2 - ConfigMaps: - enabled: false - maps: [] - # - name: config-map-1 - # type: environment - # external: false - # data: - # key1: key1value-1 - # key2: key2value-1 - # key3: key3value-1 - # - name: config-map-2 - # type: volume - # external: false - # mountPath: /etc/config/2 - # data: - # key1: | - # club : manchester utd - # nation : england - # key2: abc-2 - # key3: abc-2 - # - name: config-map-3 - # type: environment - # external: true - # mountPath: /etc/config/3 - # data: [] - # - name: config-map-4 - # type: volume - # external: true - # mountPath: /etc/config/4 - # data: [] - - - ConfigSecrets: - enabled: false - secrets: [] - # - name: config-secret-1 - # type: environment - # external: false - # data: - # key1: key1value-1 - # key2: key2value-1 - # key3: key3value-1 - # - name: config-secret-2 - # type: volume - # external: false - # mountPath: /etc/config/2 - # data: - # key1: | - # club : manchester utd - # nation : england - # key2: abc-2 + envFrom: + configMapRef: [] + # - "test" + # - "test2" + configSecretRef: + # - "Test3" + storage: class: gp2 requests: 2Gi From 7c3e99412c3efbca37e4334b75681488c004e3fa Mon Sep 17 00:00:00 2001 From: Kamal Acharya Date: Fri, 14 Apr 2023 18:51:13 +0530 Subject: [PATCH 3/8] git sensor version upgraded --- charts/gitsensor/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/gitsensor/Chart.yaml b/charts/gitsensor/Chart.yaml index ee687946..362fbfb3 100644 --- a/charts/gitsensor/Chart.yaml +++ b/charts/gitsensor/Chart.yaml @@ -5,4 +5,4 @@ maintainers: - email: prakarsh@devtron.ai name: Prakarsh name: gitsensor -version: 0.11.6 +version: 0.11.7 From 14cd61192f67db7d26cbbfc0368bb6e0237e0359 Mon Sep 17 00:00:00 2001 From: Kamal Acharya Date: Tue, 18 Apr 2023 19:14:04 +0530 Subject: [PATCH 4/8] change in format of printing --- charts/gitsensor/templates/generic.yaml | 20 ++++++++------------ charts/gitsensor/values.yaml | 3 ++- 2 files changed, 10 insertions(+), 13 deletions(-) diff --git a/charts/gitsensor/templates/generic.yaml b/charts/gitsensor/templates/generic.yaml index 98d8f976..c367cf6b 100644 --- a/charts/gitsensor/templates/generic.yaml +++ b/charts/gitsensor/templates/generic.yaml @@ -55,19 +55,15 @@ spec: {{- with .Values.gitsensor.envFrom }} {{- if or (.configMapRef) (.configSecretRef) }} envFrom: - {{- with .configMapRef }} - - configMapRef: - {{- range . }} - name: {{ . }} - {{- end }} - {{- end }} - {{- with .configSecretRef }} - - secretRef: - {{- range . }} - name: {{ . }} - {{- end }} - {{- end }} + {{- range .configMapRef }} + configMapRef: + name: {{ . }} {{- end }} + {{- range .configSecretRef }} + configSecretRef: + name: {{ . }} + {{- end }} + {{- end }} {{- end }} {{- if $.Values.gitsensor.spec.resources}} resources: diff --git a/charts/gitsensor/values.yaml b/charts/gitsensor/values.yaml index 5631ab8c..fd294374 100644 --- a/charts/gitsensor/values.yaml +++ b/charts/gitsensor/values.yaml @@ -50,11 +50,12 @@ gitsensor: # - us-east-2 envFrom: - configMapRef: [] + configMapRef: # - "test" # - "test2" configSecretRef: # - "Test3" + # - "Test4" storage: class: gp2 From c5833f4a926238cc8dc6ccf4cecf82bbab5cdb70 Mon Sep 17 00:00:00 2001 From: Kamal Acharya Date: Tue, 18 Apr 2023 19:25:29 +0530 Subject: [PATCH 5/8] change nindent to indent --- charts/gitsensor/templates/generic.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/gitsensor/templates/generic.yaml b/charts/gitsensor/templates/generic.yaml index c367cf6b..02dfe788 100644 --- a/charts/gitsensor/templates/generic.yaml +++ b/charts/gitsensor/templates/generic.yaml @@ -30,7 +30,7 @@ spec: metadata: labels: {{- if $.Values.gitsensor.spec.template.metadata.labels }} -{{ toYaml $.Values.gitsensor.spec.template.metadata.labels | nindent 8 }} +{{ toYaml $.Values.gitsensor.spec.template.metadata.labels | indent 8 }} {{- end }} spec: terminationGracePeriodSeconds: 10 From 6107719dc1e12e960d7795f4ed0bc501f01a98eb Mon Sep 17 00:00:00 2001 From: Kamal Acharya Date: Wed, 19 Apr 2023 12:55:31 +0530 Subject: [PATCH 6/8] changes the format to list --- charts/gitsensor/templates/generic.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/gitsensor/templates/generic.yaml b/charts/gitsensor/templates/generic.yaml index 02dfe788..ceb20f73 100644 --- a/charts/gitsensor/templates/generic.yaml +++ b/charts/gitsensor/templates/generic.yaml @@ -56,11 +56,11 @@ spec: {{- if or (.configMapRef) (.configSecretRef) }} envFrom: {{- range .configMapRef }} - configMapRef: + - configMapRef: name: {{ . }} {{- end }} {{- range .configSecretRef }} - configSecretRef: + - configSecretRef: name: {{ . }} {{- end }} {{- end }} From 50b5db2ce3e1356249a654eee64b1f91e7111b9c Mon Sep 17 00:00:00 2001 From: Kamal Acharya Date: Wed, 19 Apr 2023 12:58:50 +0530 Subject: [PATCH 7/8] removal of extra spaces --- charts/gitsensor/templates/generic.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/gitsensor/templates/generic.yaml b/charts/gitsensor/templates/generic.yaml index ceb20f73..fc022916 100644 --- a/charts/gitsensor/templates/generic.yaml +++ b/charts/gitsensor/templates/generic.yaml @@ -77,7 +77,7 @@ spec: tolerations: {{- toYaml . | nindent 8 }} {{- end }} -{{ if .Values.gitsensor.spec.affinity }} +{{- if .Values.gitsensor.spec.affinity }} affinity: {{ toYaml .Values.gitsensor.spec.affinity | indent 8 }} {{- end }} From 82febae1fc53161d0e144ad1d78fef062a566265 Mon Sep 17 00:00:00 2001 From: Kamal Acharya Date: Wed, 19 Apr 2023 13:45:06 +0530 Subject: [PATCH 8/8] fix in format --- charts/gitsensor/templates/generic.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/gitsensor/templates/generic.yaml b/charts/gitsensor/templates/generic.yaml index fc022916..2c13d54f 100644 --- a/charts/gitsensor/templates/generic.yaml +++ b/charts/gitsensor/templates/generic.yaml @@ -57,11 +57,11 @@ spec: envFrom: {{- range .configMapRef }} - configMapRef: - name: {{ . }} + name: {{ . }} {{- end }} {{- range .configSecretRef }} - - configSecretRef: - name: {{ . }} + - secretRef: + name: {{ . }} {{- end }} {{- end }} {{- end }}