From 14d87da48fe14d4745500355c2e2f4a4812b6174 Mon Sep 17 00:00:00 2001 From: jatin-jangir <79351203+jatin-jangir@users.noreply.github.com> Date: Tue, 18 Jul 2023 12:46:31 +0530 Subject: [PATCH 01/12] added existingVolume in values.yaml --- charts/gitsensor/values.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/charts/gitsensor/values.yaml b/charts/gitsensor/values.yaml index 5618afbc..f405c1ec 100644 --- a/charts/gitsensor/values.yaml +++ b/charts/gitsensor/values.yaml @@ -66,6 +66,7 @@ gitsensor: # values: # - us-east-2 storage: + existingVolume: "" class: gp2 requests: 2Gi nodeAffinity: {} From 217d60fa73824b263621e68a761c9dd33534bed8 Mon Sep 17 00:00:00 2001 From: jatin-jangir <79351203+jatin-jangir@users.noreply.github.com> Date: Tue, 18 Jul 2023 12:47:09 +0530 Subject: [PATCH 02/12] added existingVolumn in sts yaml --- charts/gitsensor/templates/generic.yaml | 40 ++++++++++--------------- 1 file changed, 16 insertions(+), 24 deletions(-) diff --git a/charts/gitsensor/templates/generic.yaml b/charts/gitsensor/templates/generic.yaml index 6fe2d3f0..2d1681a7 100644 --- a/charts/gitsensor/templates/generic.yaml +++ b/charts/gitsensor/templates/generic.yaml @@ -8,11 +8,9 @@ metadata: {{- end }} spec: ports: - {{- range $env := .Values.gitsensor.service.spec.ports }} - - port: {{ $env.port }} - name: {{ $env.name }} - targetPort: {{ $env.targetPort }} - {{- end }} + - port: {{ .Values.gitsensor.service.spec.port }} + name: sensor + targetPort: {{ .Values.gitsensor.service.spec.targetPort }} selector: {{- if .Values.gitsensor.service.spec.selector }} {{ toYaml .Values.gitsensor.service.spec.selector | indent 4 }} @@ -44,10 +42,8 @@ spec: - name: git-sensor image: {{ .Values.gitsensor.image.repository }}:{{ .Values.gitsensor.image.tag }} ports: - {{- range $env := .Values.gitsensor.containerPort }} - - containerPort: {{ $env.port}} - name: {{ $env.name }} - {{- end }} + - containerPort: 8080 + name: sensor volumeMounts: - name: git-volume mountPath: /git-base/ @@ -56,19 +52,6 @@ spec: - name: {{ $key }} value: {{ $val | quote }} {{- end }} - {{- with .Values.gitsensor.envFrom }} - {{- if or (.configMap) (.secret) }} - envFrom: - {{- range .configMap }} - - configMapRef: - name: {{ . }} - {{- end }} - {{- range .secret }} - - secretRef: - name: {{ . }} - {{- end }} - {{- end }} - {{- end }} {{- if $.Values.gitsensor.spec.resources}} resources: {{ toYaml .Values.gitsensor.spec.resources | indent 12 -}} @@ -77,14 +60,22 @@ spec: securityContext: {{ toYaml .Values.containerSecurityContext | indent 12 }} {{- end }} + {{- if .Values.gitsensor.storage.existingVolume }} + volumes: + - name: "git-volume" + persistentVolumeClaim: + claimName: {{ .Values.gitsensor.storage.existingVolume }} + {{- end }} {{- with .Values.tolerations }} tolerations: {{- toYaml . | nindent 8 }} {{- end }} -{{- if .Values.gitsensor.spec.affinity }} +{{ if .Values.gitsensor.spec.affinity }} affinity: {{ toYaml .Values.gitsensor.spec.affinity | indent 8 }} {{- end }} +{{- if .Values.gitsensor.storage.existingVolume }} +{{- else }} volumeClaimTemplates: - metadata: name: git-volume @@ -97,4 +88,5 @@ spec: {{ if .Values.gitsensor.storage.nodeAffinity }} nodeAffinity: {{ toYaml .Values.gitsensor.storage.nodeAffinity | indent 10 }} -{{- end }} \ No newline at end of file +{{- end }} +{{- end }} From 866d8d53ca35cebea6d8580c3528b288d99e2236 Mon Sep 17 00:00:00 2001 From: jatin-jangir <79351203+jatin-jangir@users.noreply.github.com> Date: Tue, 18 Jul 2023 12:52:29 +0530 Subject: [PATCH 03/12] synced changes --- charts/gitsensor/templates/generic.yaml | 27 ++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/charts/gitsensor/templates/generic.yaml b/charts/gitsensor/templates/generic.yaml index 2d1681a7..719b944c 100644 --- a/charts/gitsensor/templates/generic.yaml +++ b/charts/gitsensor/templates/generic.yaml @@ -8,9 +8,11 @@ metadata: {{- end }} spec: ports: - - port: {{ .Values.gitsensor.service.spec.port }} - name: sensor - targetPort: {{ .Values.gitsensor.service.spec.targetPort }} + {{- range $env := .Values.gitsensor.service.spec.ports }} + - port: {{ $env.port }} + name: {{ $env.name }} + targetPort: {{ $env.targetPort }} + {{- end }} selector: {{- if .Values.gitsensor.service.spec.selector }} {{ toYaml .Values.gitsensor.service.spec.selector | indent 4 }} @@ -42,8 +44,10 @@ spec: - name: git-sensor image: {{ .Values.gitsensor.image.repository }}:{{ .Values.gitsensor.image.tag }} ports: - - containerPort: 8080 - name: sensor + {{- range $env := .Values.gitsensor.containerPort }} + - containerPort: {{ $env.port}} + name: {{ $env.name }} + {{- end }} volumeMounts: - name: git-volume mountPath: /git-base/ @@ -52,6 +56,19 @@ spec: - name: {{ $key }} value: {{ $val | quote }} {{- end }} + {{- with .Values.gitsensor.envFrom }} + {{- if or (.configMap) (.secret) }} + envFrom: + {{- range .configMap }} + - configMapRef: + name: {{ . }} + {{- end }} + {{- range .secret }} + - secretRef: + name: {{ . }} + {{- end }} + {{- end }} + {{- end }} {{- if $.Values.gitsensor.spec.resources}} resources: {{ toYaml .Values.gitsensor.spec.resources | indent 12 -}} From 5ee44917135c3f283a99b2d826176d0ca80b5816 Mon Sep 17 00:00:00 2001 From: jatin-jangir <79351203+jatin-jangir@users.noreply.github.com> Date: Tue, 18 Jul 2023 12:54:28 +0530 Subject: [PATCH 04/12] added - to if statement --- 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 719b944c..cfc2d9d9 100644 --- a/charts/gitsensor/templates/generic.yaml +++ b/charts/gitsensor/templates/generic.yaml @@ -87,7 +87,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 c7d13af2c30b7755def18117598e61c13c7ff866 Mon Sep 17 00:00:00 2001 From: jatin-jangir <79351203+jatin-jangir@users.noreply.github.com> Date: Tue, 18 Jul 2023 12:46:31 +0530 Subject: [PATCH 05/12] added existingVolume in values.yaml added existingVolumn in sts yaml --- charts/gitsensor/templates/generic.yaml | 40 ++++++++++--------------- charts/gitsensor/values.yaml | 1 + 2 files changed, 17 insertions(+), 24 deletions(-) diff --git a/charts/gitsensor/templates/generic.yaml b/charts/gitsensor/templates/generic.yaml index 6fe2d3f0..2d1681a7 100644 --- a/charts/gitsensor/templates/generic.yaml +++ b/charts/gitsensor/templates/generic.yaml @@ -8,11 +8,9 @@ metadata: {{- end }} spec: ports: - {{- range $env := .Values.gitsensor.service.spec.ports }} - - port: {{ $env.port }} - name: {{ $env.name }} - targetPort: {{ $env.targetPort }} - {{- end }} + - port: {{ .Values.gitsensor.service.spec.port }} + name: sensor + targetPort: {{ .Values.gitsensor.service.spec.targetPort }} selector: {{- if .Values.gitsensor.service.spec.selector }} {{ toYaml .Values.gitsensor.service.spec.selector | indent 4 }} @@ -44,10 +42,8 @@ spec: - name: git-sensor image: {{ .Values.gitsensor.image.repository }}:{{ .Values.gitsensor.image.tag }} ports: - {{- range $env := .Values.gitsensor.containerPort }} - - containerPort: {{ $env.port}} - name: {{ $env.name }} - {{- end }} + - containerPort: 8080 + name: sensor volumeMounts: - name: git-volume mountPath: /git-base/ @@ -56,19 +52,6 @@ spec: - name: {{ $key }} value: {{ $val | quote }} {{- end }} - {{- with .Values.gitsensor.envFrom }} - {{- if or (.configMap) (.secret) }} - envFrom: - {{- range .configMap }} - - configMapRef: - name: {{ . }} - {{- end }} - {{- range .secret }} - - secretRef: - name: {{ . }} - {{- end }} - {{- end }} - {{- end }} {{- if $.Values.gitsensor.spec.resources}} resources: {{ toYaml .Values.gitsensor.spec.resources | indent 12 -}} @@ -77,14 +60,22 @@ spec: securityContext: {{ toYaml .Values.containerSecurityContext | indent 12 }} {{- end }} + {{- if .Values.gitsensor.storage.existingVolume }} + volumes: + - name: "git-volume" + persistentVolumeClaim: + claimName: {{ .Values.gitsensor.storage.existingVolume }} + {{- end }} {{- with .Values.tolerations }} tolerations: {{- toYaml . | nindent 8 }} {{- end }} -{{- if .Values.gitsensor.spec.affinity }} +{{ if .Values.gitsensor.spec.affinity }} affinity: {{ toYaml .Values.gitsensor.spec.affinity | indent 8 }} {{- end }} +{{- if .Values.gitsensor.storage.existingVolume }} +{{- else }} volumeClaimTemplates: - metadata: name: git-volume @@ -97,4 +88,5 @@ spec: {{ if .Values.gitsensor.storage.nodeAffinity }} nodeAffinity: {{ toYaml .Values.gitsensor.storage.nodeAffinity | indent 10 }} -{{- end }} \ No newline at end of file +{{- end }} +{{- end }} diff --git a/charts/gitsensor/values.yaml b/charts/gitsensor/values.yaml index 5618afbc..f405c1ec 100644 --- a/charts/gitsensor/values.yaml +++ b/charts/gitsensor/values.yaml @@ -66,6 +66,7 @@ gitsensor: # values: # - us-east-2 storage: + existingVolume: "" class: gp2 requests: 2Gi nodeAffinity: {} From 80647e0e5bbf7f4242f48770b96e35b2f3915510 Mon Sep 17 00:00:00 2001 From: jatin-jangir <79351203+jatin-jangir@users.noreply.github.com> Date: Tue, 18 Jul 2023 12:52:29 +0530 Subject: [PATCH 06/12] synced changes added - to if statement --- charts/gitsensor/templates/generic.yaml | 29 ++++++++++++++++++++----- 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/charts/gitsensor/templates/generic.yaml b/charts/gitsensor/templates/generic.yaml index 2d1681a7..cfc2d9d9 100644 --- a/charts/gitsensor/templates/generic.yaml +++ b/charts/gitsensor/templates/generic.yaml @@ -8,9 +8,11 @@ metadata: {{- end }} spec: ports: - - port: {{ .Values.gitsensor.service.spec.port }} - name: sensor - targetPort: {{ .Values.gitsensor.service.spec.targetPort }} + {{- range $env := .Values.gitsensor.service.spec.ports }} + - port: {{ $env.port }} + name: {{ $env.name }} + targetPort: {{ $env.targetPort }} + {{- end }} selector: {{- if .Values.gitsensor.service.spec.selector }} {{ toYaml .Values.gitsensor.service.spec.selector | indent 4 }} @@ -42,8 +44,10 @@ spec: - name: git-sensor image: {{ .Values.gitsensor.image.repository }}:{{ .Values.gitsensor.image.tag }} ports: - - containerPort: 8080 - name: sensor + {{- range $env := .Values.gitsensor.containerPort }} + - containerPort: {{ $env.port}} + name: {{ $env.name }} + {{- end }} volumeMounts: - name: git-volume mountPath: /git-base/ @@ -52,6 +56,19 @@ spec: - name: {{ $key }} value: {{ $val | quote }} {{- end }} + {{- with .Values.gitsensor.envFrom }} + {{- if or (.configMap) (.secret) }} + envFrom: + {{- range .configMap }} + - configMapRef: + name: {{ . }} + {{- end }} + {{- range .secret }} + - secretRef: + name: {{ . }} + {{- end }} + {{- end }} + {{- end }} {{- if $.Values.gitsensor.spec.resources}} resources: {{ toYaml .Values.gitsensor.spec.resources | indent 12 -}} @@ -70,7 +87,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 4bed2548d86456f90da3506e1c769fd85bd78d9e Mon Sep 17 00:00:00 2001 From: tayalrishabh96 Date: Wed, 2 Aug 2023 19:35:45 +0530 Subject: [PATCH 07/12] feat: adds GCS support in devtron backup helm chart --- .../templates/backup-on-gcp.yaml | 122 ++++++++++++++++++ charts/devtron-backups/values.yaml | 6 + 2 files changed, 128 insertions(+) create mode 100644 charts/devtron-backups/templates/backup-on-gcp.yaml diff --git a/charts/devtron-backups/templates/backup-on-gcp.yaml b/charts/devtron-backups/templates/backup-on-gcp.yaml new file mode 100644 index 00000000..4c19806a --- /dev/null +++ b/charts/devtron-backups/templates/backup-on-gcp.yaml @@ -0,0 +1,122 @@ +{{- if .Values.global.GCP.enabled }} +{{ if semverCompare ">=1.21-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: batch/v1 +{{ else -}} +apiVersion: batch/v1beta1 +{{ end -}} +kind: CronJob +metadata: + name: postgres-app-backup-cronjob + namespace: devtroncd +spec: + schedule: {{ .Values.global.schedule }} + jobTemplate: + spec: + template: + spec: + initContainers: + - name: postgres-app-backup-cronjob + image: postgres:12 + volumeMounts: + - mountPath: /tmp + name: psql-volume + env: + - name: PGPASSWORD + valueFrom: + secretKeyRef: + key: PG_PASSWORD + name: {{ .Values.postgres_backup.secretName }} + imagePullPolicy: Always + args: + - /bin/bash + - -c + - pg_dumpall -h postgresql-postgresql.devtroncd --exclude-database=clairv4 -p 5432 -U postgres --no-privileges > /tmp/backup.tar; + containers: + - name: gcloud-cli-for-cloud-storage-upload + image: google/cloud-sdk:alpine + volumeMounts: + - mountPath: /tmp + name: psql-volume + env: + {{- with .Values.global.GCP }} + - name: GCS_BUCKET + value: "gs://{{ .GCS_BUCKET_NAME }}" + {{- end }} + imagePullPolicy: Always + args: + - /bin/bash + - -c + {{- if $.Values.global.GCP.encryption.enabled }} + - date1=$(date +%Y%m%d-%H%M); gpg -c --batch --passphrase {{ .Values.global.GCP.encryption.passphrase }} /tmp/backup.tar; rm -rvf /tmp/backup.tar; mv /tmp/backup.tar.gpg /tmp/backup-$date1.tar.gpg; gcloud storage cp /tmp/backup-$date1.tar.gpg $GCS_BUCKET/postgres/; + {{- else}} + - date1=$(date +%Y%m%d-%H%M); mv /tmp/backup.tar /tmp/backup-$date1.tar; gcloud storage cp /tmp/backup-$date1.tar $GCS_BUCKET/postgres/; + {{- end }} + volumes: + - name: psql-volume + emptyDir: {} + restartPolicy: OnFailure + serviceAccountName: {{ .Values.argocd_backup.serviceAccountName }} +--- +{{ if semverCompare ">=1.21-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: batch/v1 +{{ else -}} +apiVersion: batch/v1beta1 +{{ end -}} +kind: CronJob +metadata: + name: argocd-app-backup-cronjob + namespace: devtroncd +spec: + schedule: {{ .Values.global.schedule }} + jobTemplate: + spec: + template: + spec: + initContainers: + - name: argocd-app-backup-job + {{- if eq .Values.argocdversion "v2"}} + image: quay.io/argoproj/argocd:v2.4.0 + {{- end }} + {{- if eq .Values.argocdversion "v1"}} + image: argoproj/argocd:v1.8.1 + {{- end }} + volumeMounts: + - mountPath: /cache + name: argocd-volume + env: + imagePullPolicy: Always + args: + - /bin/bash + - -c + {{- if eq .Values.argocdversion "v2"}} + - argocd admin export -n devtroncd > /cache/backup.yaml + {{- end }} + {{- if eq .Values.argocdversion "v1"}} + - argocd-util export --namespace devtroncd > /cache/backup.yaml; + {{- end }} + containers: + - name: gcloud-cli-for-cloud-storage-upload + image: google/cloud-sdk:alpine + volumeMounts: + - mountPath: /cache + name: argocd-volume + env: + {{- with .Values.global.GCP }} + - name: GCS_BUCKET + value: "gs://{{ .GCS_BUCKET_NAME }}" + {{- end }} + imagePullPolicy: Always + args: + - /bin/bash + - -c + {{- if $.Values.global.GCP.encryption.enabled }} + - date1=$(date +%Y%m%d-%H%M); gpg -c --batch --passphrase {{ .Values.global.GCP.encryption.passphrase }} /cache/backup.yaml; rm -rvf /cache/backup.yaml; mv /cache/backup.yaml.gpg /cache/backup-$date1.yaml.gpg; gcloud storage cp /cache/backup-$date1.yaml.gpg $GCS_BUCKET/argocd/; + {{- else}} + - date1=$(date +%Y%m%d-%H%M); mv /cache/backup.yaml /cache/backup-$date1.yaml; gcloud storage cp /cache/backup-$date1.yaml $GCS_BUCKET/argocd/; + {{- end }} + volumes: + - name: argocd-volume + emptyDir: {} + restartPolicy: OnFailure + serviceAccountName: {{ .Values.argocd_backup.serviceAccountName }} +{{- end }} diff --git a/charts/devtron-backups/values.yaml b/charts/devtron-backups/values.yaml index ab2988b0..9f7cb771 100644 --- a/charts/devtron-backups/values.yaml +++ b/charts/devtron-backups/values.yaml @@ -18,6 +18,12 @@ global: AZURE_ACCOUNT_KEY: "" AZURE_BLOB_CONTAINER_FOR_POSTGRES: "" AZURE_BLOB_CONTAINER_FOR_ARGOCD: "" + GCP: + enabled: false + GCS_BUCKET_NAME: "" + encryption: + enabled: false + passphrase: "" argocdversion: v2 From ad6b18ab37298c26a125c32bf70257708e02685f Mon Sep 17 00:00:00 2001 From: tayalrishabh96 Date: Wed, 2 Aug 2023 19:40:56 +0530 Subject: [PATCH 08/12] feat: adds GCS support in devtron backup helm chart --- charts/devtron-backups/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/devtron-backups/Chart.yaml b/charts/devtron-backups/Chart.yaml index 0f6fc4c0..f8d4de58 100644 --- a/charts/devtron-backups/Chart.yaml +++ b/charts/devtron-backups/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v2 appVersion: "1.0" description: A Helm chart for Devtron Backups name: devtron-backups -version: 0.1.3 \ No newline at end of file +version: 0.1.4 \ No newline at end of file From 850d6e26f2d2e42b4c4cc5a13f512c1b69397db5 Mon Sep 17 00:00:00 2001 From: tayalrishabh96 Date: Wed, 9 Aug 2023 11:37:27 +0530 Subject: [PATCH 09/12] feat: Adds support for GCP_CREDENTIAL_JSON File ; releasing version 0.1.5 for devtron-backup helm chart --- charts/devtron-backups/Chart.yaml | 2 +- .../templates/backup-on-gcp.yaml | 25 +++++++++++++++++++ charts/devtron-backups/values.yaml | 10 ++++++-- 3 files changed, 34 insertions(+), 3 deletions(-) diff --git a/charts/devtron-backups/Chart.yaml b/charts/devtron-backups/Chart.yaml index f8d4de58..31c522af 100644 --- a/charts/devtron-backups/Chart.yaml +++ b/charts/devtron-backups/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v2 appVersion: "1.0" description: A Helm chart for Devtron Backups name: devtron-backups -version: 0.1.4 \ No newline at end of file +version: 0.1.5 \ No newline at end of file diff --git a/charts/devtron-backups/templates/backup-on-gcp.yaml b/charts/devtron-backups/templates/backup-on-gcp.yaml index 4c19806a..d7f8da8e 100644 --- a/charts/devtron-backups/templates/backup-on-gcp.yaml +++ b/charts/devtron-backups/templates/backup-on-gcp.yaml @@ -1,3 +1,14 @@ +{{- if .Values.global.GCP.CREDENTIALS.enabled }} +apiVersion: v1 +data: + GOOGLE_APPLICATION_CREDENTIALS: {{ $.Values.global.GCP.CREDENTIALS.GCP_CREDENTIALS_JSON }} +kind: Secret +metadata: + name: gcp-credentials + namespace: devtroncd +type: Opaque +{{ end -}} +--- {{- if .Values.global.GCP.enabled }} {{ if semverCompare ">=1.21-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: batch/v1 @@ -41,6 +52,13 @@ spec: {{- with .Values.global.GCP }} - name: GCS_BUCKET value: "gs://{{ .GCS_BUCKET_NAME }}" + {{- if .CREDENTIALS.enabled }} + - name: gcp-credentials + valueFrom: + secretKeyRef: + name: gcp-credentials + key: GOOGLE_APPLICATION_CREDENTIALS + {{- end }} {{- end }} imagePullPolicy: Always args: @@ -104,6 +122,13 @@ spec: {{- with .Values.global.GCP }} - name: GCS_BUCKET value: "gs://{{ .GCS_BUCKET_NAME }}" + {{- if .CREDENTIALS.enabled }} + - name: gcp-credentials + valueFrom: + secretKeyRef: + name: gcp-credentials + key: GOOGLE_APPLICATION_CREDENTIALS + {{- end }} {{- end }} imagePullPolicy: Always args: diff --git a/charts/devtron-backups/values.yaml b/charts/devtron-backups/values.yaml index 9f7cb771..d4bbd7e5 100644 --- a/charts/devtron-backups/values.yaml +++ b/charts/devtron-backups/values.yaml @@ -20,9 +20,15 @@ global: AZURE_BLOB_CONTAINER_FOR_ARGOCD: "" GCP: enabled: false - GCS_BUCKET_NAME: "" - encryption: + GCS_BUCKET_NAME: "" # Required if GCP is enabled + CREDENTIALS: # Optional. Use only if in case node doesn't have permission to push over GCS. enabled: false + # Only Encoded JSON CREDENTIALS allowed. Example shown below. + # GCP_CREDENTIALS_JSON: "eyJ0eXBlIjogInNlcnZpY2VfYWNjb3VudCIsInByb2plY3RfaWQiOiAiPHlvdXItcHJvamVjdC1pZD4iLCJwcml2YXRlX2tleV9pZCI6ICI8eW91ci1wcml2YXRlLWtleS1pZD4iLCJwcml2YXRlX2tleSI6ICI8eW91ci1wcml2YXRlLWtleT4iLCJjbGllbnRfZW1haWwiOiAiPHlvdXItY2xpZW50LWVtYWlsPiIsImNsaWVudF9pZCI6ICI8eW91ci1jbGllbnQtaWQ+IiwiYXV0aF91cmkiOiAiaHR0cHM6Ly9hY2NvdW50cy5nb29nbGUuY29tL28vb2F1dGgyL2F1dGgiLCJ0b2tlbl91cmkiOiAiaHR0cHM6Ly9vYXV0aDIuZ29vZ2xlYXBpcy5jb20vdG9rZW4iLCJhdXRoX3Byb3ZpZGVyX3g1MDlfY2VydF91cmwiOiAiaHR0cHM6Ly93d3cuZ29vZ2xlYXBpcy5jb20vb2F1dGgyL3YxL2NlcnRzIiwiY2xpZW50X3g1MDlfY2VydF91cmwiOiAiPHlvdXItY2xpZW50LWNlcnQtdXJsPiJ9Cg==" + GCP_CREDENTIALS_JSON: "" + + encryption: + enabled: false # Recommended passphrase: "" argocdversion: v2 From 636cf96fb3900d9f86948cff413ef4e782347d59 Mon Sep 17 00:00:00 2001 From: jatin-jangir-0220 Date: Wed, 9 Aug 2023 18:56:47 +0530 Subject: [PATCH 10/12] added not in if condition added not in if condition --- charts/gitsensor/templates/generic.yaml | 3 +-- charts/gitsensor/values.yaml | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/charts/gitsensor/templates/generic.yaml b/charts/gitsensor/templates/generic.yaml index cfc2d9d9..b92657e9 100644 --- a/charts/gitsensor/templates/generic.yaml +++ b/charts/gitsensor/templates/generic.yaml @@ -91,8 +91,7 @@ spec: affinity: {{ toYaml .Values.gitsensor.spec.affinity | indent 8 }} {{- end }} -{{- if .Values.gitsensor.storage.existingVolume }} -{{- else }} +{{- if not .Values.gitsensor.storage.existingVolume }} volumeClaimTemplates: - metadata: name: git-volume diff --git a/charts/gitsensor/values.yaml b/charts/gitsensor/values.yaml index f405c1ec..c79a5d28 100644 --- a/charts/gitsensor/values.yaml +++ b/charts/gitsensor/values.yaml @@ -66,7 +66,7 @@ gitsensor: # values: # - us-east-2 storage: - existingVolume: "" + #existingVolume: "git-sensor" class: gp2 requests: 2Gi nodeAffinity: {} From c4fcd3ba6b67b89918533047328e0ac0a4d8ae14 Mon Sep 17 00:00:00 2001 From: jatin-jangir-0220 Date: Wed, 9 Aug 2023 19:10:01 +0530 Subject: [PATCH 11/12] resolved merge confilicts --- charts/gitsensor/templates/generic.yaml | 5 ----- charts/gitsensor/values.yaml | 4 ---- 2 files changed, 9 deletions(-) diff --git a/charts/gitsensor/templates/generic.yaml b/charts/gitsensor/templates/generic.yaml index f83c328f..b92657e9 100644 --- a/charts/gitsensor/templates/generic.yaml +++ b/charts/gitsensor/templates/generic.yaml @@ -91,12 +91,7 @@ spec: affinity: {{ toYaml .Values.gitsensor.spec.affinity | indent 8 }} {{- end }} -<<<<<<< HEAD {{- if not .Values.gitsensor.storage.existingVolume }} -======= -{{- if .Values.gitsensor.storage.existingVolume }} -{{- else }} ->>>>>>> origin/git-sensor-pvc volumeClaimTemplates: - metadata: name: git-volume diff --git a/charts/gitsensor/values.yaml b/charts/gitsensor/values.yaml index ef0edc64..c79a5d28 100644 --- a/charts/gitsensor/values.yaml +++ b/charts/gitsensor/values.yaml @@ -66,11 +66,7 @@ gitsensor: # values: # - us-east-2 storage: -<<<<<<< HEAD #existingVolume: "git-sensor" -======= - existingVolume: "" ->>>>>>> origin/git-sensor-pvc class: gp2 requests: 2Gi nodeAffinity: {} From a14ac3773e8c4c1750f827d3787e2e683eee070e Mon Sep 17 00:00:00 2001 From: jatin-jangir-0220 Date: Wed, 9 Aug 2023 19:14:14 +0530 Subject: [PATCH 12/12] changed chart version --- 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 362fbfb3..ea6167b0 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.7 +version: 0.11.8