From 326be36e07e280cf06ae1e8125264d1e712fcb1a Mon Sep 17 00:00:00 2001 From: Homopatrol <58219367+Homopatrol@users.noreply.github.com> Date: Wed, 14 Jul 2021 11:59:54 +0100 Subject: [PATCH 01/15] Update values.yaml --- charts/dependency-track/values.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/charts/dependency-track/values.yaml b/charts/dependency-track/values.yaml index 4d89acc..5d1ed6b 100644 --- a/charts/dependency-track/values.yaml +++ b/charts/dependency-track/values.yaml @@ -158,10 +158,14 @@ ingress: ## allow large bom.xml uploads: # nginx.ingress.kubernetes.io/proxy-body-size: 10m host: chart-example.local + +createPostgresqlSecret: true # Postgres variables postgresql: enabled: true postgresqlUsername: deptrack - postgresqlPassword: deptrack + postgresqlPassword: "" postgresqlDatabase: deptrack + existingSecret: deptrack-postgresql # This is the full name of the secret that will be created + secretKey: postgresql-password From 963f8483716ebc686c0c96c893a869bae84cba22 Mon Sep 17 00:00:00 2001 From: Homopatrol <58219367+Homopatrol@users.noreply.github.com> Date: Wed, 14 Jul 2021 12:01:49 +0100 Subject: [PATCH 02/15] Add files via upload --- .../templates/secret-postgres.yaml | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 charts/dependency-track/templates/secret-postgres.yaml diff --git a/charts/dependency-track/templates/secret-postgres.yaml b/charts/dependency-track/templates/secret-postgres.yaml new file mode 100644 index 0000000..69f3b3b --- /dev/null +++ b/charts/dependency-track/templates/secret-postgres.yaml @@ -0,0 +1,35 @@ +{{- if .Values.createPostgresqlSecret -}} +apiVersion: v1 +kind: Secret +metadata: + name: {{ .Release.Name }}-postgresql + labels: {{- include "backend.labels.standard" . | nindent 4 }} + annotations: + helm.sh/resource-policy: keep + helm.sh/hook: "pre-install" + helm.sh/hook-delete-policy: "before-hook-creation" +type: Opaque +data: + {{- if .Release.IsUpgrade }} + {{- if (index (lookup "v1" "Secret" .Release.Namespace .Values.postgresql.existingSecret -}} + # check to see if secret already exists in namespace. + postgresql-postgres-password: {{ index (lookup "v1" "Secret" .Release.Namespace .Values.postgresql.existingSecret ).data "postgresql-password" }} + {{ else }} + # if a secret isn't found when perfroming an upgrade create a new secret. + {{- if .Values.postgresql.postgresqlPassword }} + postgresql-postgres-password: {{ .Values.postgresql.postgresqlPassword | b64enc | quote }} + {{- else }} + {{- $postgresRandomPassword := randAlphaNum 16 | b64enc | quote }} + postgresql-postgres-password: {{ $postgresRandomPassword }} + {{- end }} + {{- end }} + {{ else }} +# Perform normal install operation + {{- if .Values.postgresql.postgresqlPassword }} + postgresql-postgres-password: {{ .Values.postgresql.postgresqlPassword | b64enc | quote }} + {{- else }} + {{- $postgresRandomPassword := randAlphaNum 16 | b64enc | quote }} + postgresql-postgres-password: {{ $postgresRandomPassword }} + {{- end }} + {{- end }} +{{- end }} From d71d7d94c05c65d4ac901e5e926cf858b1fb25f6 Mon Sep 17 00:00:00 2001 From: Homopatrol <58219367+Homopatrol@users.noreply.github.com> Date: Wed, 14 Jul 2021 12:24:06 +0100 Subject: [PATCH 03/15] Update deployment.yaml --- charts/dependency-track/templates/backend/deployment.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/dependency-track/templates/backend/deployment.yaml b/charts/dependency-track/templates/backend/deployment.yaml index 1ff074d..fcb9e61 100644 --- a/charts/dependency-track/templates/backend/deployment.yaml +++ b/charts/dependency-track/templates/backend/deployment.yaml @@ -44,8 +44,8 @@ spec: - name: ALPINE_DATABASE_PASSWORD valueFrom: secretKeyRef: - name: {{ .Release.Name }}-postgresql - key: postgresql-password + name: {{ .Values.postgresql.existingSecret }} + key: {{ .Values.postgresql.secretKey }} - name: ALPINE_DATABASE_USERNAME value: {{ .Values.postgresql.postgresqlUsername }} {{- end }} From 70c131aaa993e9298f2a843f1995c256acc74f66 Mon Sep 17 00:00:00 2001 From: Homopatrol <58219367+Homopatrol@users.noreply.github.com> Date: Mon, 19 Jul 2021 10:01:27 +0100 Subject: [PATCH 04/15] Update secret-postgres.yaml --- .../dependency-track/templates/secret-postgres.yaml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/charts/dependency-track/templates/secret-postgres.yaml b/charts/dependency-track/templates/secret-postgres.yaml index 69f3b3b..bebbf9d 100644 --- a/charts/dependency-track/templates/secret-postgres.yaml +++ b/charts/dependency-track/templates/secret-postgres.yaml @@ -1,8 +1,9 @@ {{- if .Values.createPostgresqlSecret -}} +{{- $relname := printf "%s-%s" .Release.Name "postgresql" -}} apiVersion: v1 kind: Secret metadata: - name: {{ .Release.Name }}-postgresql + name: {{- if .Values.postgresql.existingSecret }} {{ .Values.postgresql.existingSecret }} {{ else }} {{ $relname }} {{- end }} labels: {{- include "backend.labels.standard" . | nindent 4 }} annotations: helm.sh/resource-policy: keep @@ -11,9 +12,11 @@ metadata: type: Opaque data: {{- if .Release.IsUpgrade }} - {{- if (index (lookup "v1" "Secret" .Release.Namespace .Values.postgresql.existingSecret -}} - # check to see if secret already exists in namespace. - postgresql-postgres-password: {{ index (lookup "v1" "Secret" .Release.Namespace .Values.postgresql.existingSecret ).data "postgresql-password" }} + # check to see if secret already exists in namespace. + {{- if (index (lookup "v1" "Secret" .Release.Namespace $relname ) ) }} + postgresql-password: {{ index (lookup "v1" "Secret" .Release.Namespace $relname ).data "postgresql-password" }} + {{- else if (index (lookup "v1" "Secret" .Release.Namespace .Values.postgresql.existingSecret ) ) }} + postgresql-password: {{ index (lookup "v1" "Secret" .Release.Namespace .Values.postgresql.existingSecret ).data "postgresql-password" }} {{ else }} # if a secret isn't found when perfroming an upgrade create a new secret. {{- if .Values.postgresql.postgresqlPassword }} From c1c185ec1b321a9e22b740ce5fc75b16425bbd5b Mon Sep 17 00:00:00 2001 From: Homopatrol <58219367+Homopatrol@users.noreply.github.com> Date: Mon, 19 Jul 2021 10:03:37 +0100 Subject: [PATCH 05/15] Update deployment.yaml --- charts/dependency-track/templates/backend/deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/dependency-track/templates/backend/deployment.yaml b/charts/dependency-track/templates/backend/deployment.yaml index fcb9e61..d90330a 100644 --- a/charts/dependency-track/templates/backend/deployment.yaml +++ b/charts/dependency-track/templates/backend/deployment.yaml @@ -44,7 +44,7 @@ spec: - name: ALPINE_DATABASE_PASSWORD valueFrom: secretKeyRef: - name: {{ .Values.postgresql.existingSecret }} + name: {{- if .Values.postgresql.existingSecret }} {{ .Values.postgresql.existingSecret }} {{ else }} {{ .Release.Name }}-postgresql {{- end }} key: {{ .Values.postgresql.secretKey }} - name: ALPINE_DATABASE_USERNAME value: {{ .Values.postgresql.postgresqlUsername }} From 8ffbfcc006028fd39bcf453c144db03d68d0db7a Mon Sep 17 00:00:00 2001 From: Homopatrol <58219367+Homopatrol@users.noreply.github.com> Date: Tue, 20 Jul 2021 17:00:11 +0100 Subject: [PATCH 06/15] Update values.yaml --- charts/dependency-track/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/dependency-track/values.yaml b/charts/dependency-track/values.yaml index 5d1ed6b..070c4b9 100644 --- a/charts/dependency-track/values.yaml +++ b/charts/dependency-track/values.yaml @@ -159,7 +159,7 @@ ingress: # nginx.ingress.kubernetes.io/proxy-body-size: 10m host: chart-example.local -createPostgresqlSecret: true +createPostgresqlSecret: true # create the postgresql secret in Dependency Track chart, outside of the postgresql chart. # Postgres variables postgresql: From 9729e0a16ae55ff9b7e71a11634957bf2bb8ee10 Mon Sep 17 00:00:00 2001 From: Homopatrol <58219367+Homopatrol@users.noreply.github.com> Date: Wed, 21 Jul 2021 10:14:10 +0100 Subject: [PATCH 07/15] Update secret-postgres.yaml --- charts/dependency-track/templates/secret-postgres.yaml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/charts/dependency-track/templates/secret-postgres.yaml b/charts/dependency-track/templates/secret-postgres.yaml index bebbf9d..1dc3c74 100644 --- a/charts/dependency-track/templates/secret-postgres.yaml +++ b/charts/dependency-track/templates/secret-postgres.yaml @@ -14,25 +14,31 @@ data: {{- if .Release.IsUpgrade }} # check to see if secret already exists in namespace. {{- if (index (lookup "v1" "Secret" .Release.Namespace $relname ) ) }} - postgresql-password: {{ index (lookup "v1" "Secret" .Release.Namespace $relname ).data "postgresql-password" }} + postgresql-postgres-password: {{ index (lookup "v1" "Secret" .Release.Namespace $relname ).data "postgresql-password" }} + {{ .Values.postgresql.secretKey }}: {{ index (lookup "v1" "Secret" .Release.Namespace $relname ).data "postgresql-password" }} {{- else if (index (lookup "v1" "Secret" .Release.Namespace .Values.postgresql.existingSecret ) ) }} - postgresql-password: {{ index (lookup "v1" "Secret" .Release.Namespace .Values.postgresql.existingSecret ).data "postgresql-password" }} + postgresql-postgres-password: {{ index (lookup "v1" "Secret" .Release.Namespace .Values.postgresql.existingSecret ).data "postgresql-password" }} + {{ .Values.postgresql.secretKey }}: {{ index (lookup "v1" "Secret" .Release.Namespace .Values.postgresql.existingSecret ).data "postgresql-password" }} {{ else }} # if a secret isn't found when perfroming an upgrade create a new secret. {{- if .Values.postgresql.postgresqlPassword }} postgresql-postgres-password: {{ .Values.postgresql.postgresqlPassword | b64enc | quote }} + {{ .Values.postgresql.secretKey }}: {{ .Values.postgresql.postgresqlPassword | b64enc | quote }} {{- else }} {{- $postgresRandomPassword := randAlphaNum 16 | b64enc | quote }} postgresql-postgres-password: {{ $postgresRandomPassword }} + {{ .Values.postgresql.secretKey }}: {{ $postgresRandomPassword }} {{- end }} {{- end }} {{ else }} # Perform normal install operation {{- if .Values.postgresql.postgresqlPassword }} postgresql-postgres-password: {{ .Values.postgresql.postgresqlPassword | b64enc | quote }} + {{ .Values.postgresql.secretKey }}: {{ .Values.postgresql.postgresqlPassword | b64enc | quote }} {{- else }} {{- $postgresRandomPassword := randAlphaNum 16 | b64enc | quote }} postgresql-postgres-password: {{ $postgresRandomPassword }} + {{ .Values.postgresql.secretKey }}: {{ $postgresRandomPassword }} {{- end }} {{- end }} {{- end }} From a118865af0b015461bfbf7d8edc0f4ab82ebedfb Mon Sep 17 00:00:00 2001 From: Homopatrol <58219367+Homopatrol@users.noreply.github.com> Date: Wed, 21 Jul 2021 10:16:13 +0100 Subject: [PATCH 08/15] Update secret-postgres.yaml --- charts/dependency-track/templates/secret-postgres.yaml | 3 --- 1 file changed, 3 deletions(-) diff --git a/charts/dependency-track/templates/secret-postgres.yaml b/charts/dependency-track/templates/secret-postgres.yaml index 1dc3c74..0635346 100644 --- a/charts/dependency-track/templates/secret-postgres.yaml +++ b/charts/dependency-track/templates/secret-postgres.yaml @@ -6,9 +6,6 @@ metadata: name: {{- if .Values.postgresql.existingSecret }} {{ .Values.postgresql.existingSecret }} {{ else }} {{ $relname }} {{- end }} labels: {{- include "backend.labels.standard" . | nindent 4 }} annotations: - helm.sh/resource-policy: keep - helm.sh/hook: "pre-install" - helm.sh/hook-delete-policy: "before-hook-creation" type: Opaque data: {{- if .Release.IsUpgrade }} From a899d6ae4058e2107fc638a2eb37b8721356692b Mon Sep 17 00:00:00 2001 From: Homopatrol <58219367+Homopatrol@users.noreply.github.com> Date: Wed, 21 Jul 2021 10:16:28 +0100 Subject: [PATCH 09/15] Update values.yaml From eadc9d6270f8eea49abf26225b2ff9237ca11e3e Mon Sep 17 00:00:00 2001 From: Pandora <58219367+Homopatrol@users.noreply.github.com> Date: Wed, 11 Aug 2021 09:56:47 +0100 Subject: [PATCH 10/15] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index ccaaf83..476f995 100644 --- a/README.md +++ b/README.md @@ -8,3 +8,5 @@ CI based on Github Actions, Kind and Chart-testing tool. See [Youtube video](htt Add the repo: `helm repo add evryfs-oss https://evryfs.github.io/helm-charts/` + +contains charts for Depedency track From 743c80b93a60b3ec482cf3625636b451042f5da9 Mon Sep 17 00:00:00 2001 From: Pandora <58219367+Homopatrol@users.noreply.github.com> Date: Wed, 11 Aug 2021 09:58:36 +0100 Subject: [PATCH 11/15] Update README.md --- README.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/README.md b/README.md index 476f995..ccaaf83 100644 --- a/README.md +++ b/README.md @@ -8,5 +8,3 @@ CI based on Github Actions, Kind and Chart-testing tool. See [Youtube video](htt Add the repo: `helm repo add evryfs-oss https://evryfs.github.io/helm-charts/` - -contains charts for Depedency track From d9d03ebf6ee215f72f33e767cc50f4d465404f75 Mon Sep 17 00:00:00 2001 From: Pandora <58219367+Homopatrol@users.noreply.github.com> Date: Wed, 11 Aug 2021 13:13:25 +0100 Subject: [PATCH 12/15] Update README.md --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index ccaaf83..8602888 100644 --- a/README.md +++ b/README.md @@ -8,3 +8,9 @@ CI based on Github Actions, Kind and Chart-testing tool. See [Youtube video](htt Add the repo: `helm repo add evryfs-oss https://evryfs.github.io/helm-charts/` + +this repo contains charts for the following deployments + - + - + - + - From 77d1f52dbda65fe647b6b904adcc4bc90f9dd0e0 Mon Sep 17 00:00:00 2001 From: Pandora <58219367+Homopatrol@users.noreply.github.com> Date: Wed, 11 Aug 2021 13:22:27 +0100 Subject: [PATCH 13/15] Update README.md --- README.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/README.md b/README.md index 8602888..7f310f2 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,3 @@ Add the repo: `helm repo add evryfs-oss https://evryfs.github.io/helm-charts/` this repo contains charts for the following deployments - - - - - - - - From b1e13e3f44e266f0bd4382e6752190c25dba1118 Mon Sep 17 00:00:00 2001 From: Pandora <58219367+Homopatrol@users.noreply.github.com> Date: Wed, 11 Aug 2021 13:24:52 +0100 Subject: [PATCH 14/15] Update README.md --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index 7f310f2..bda2de6 100644 --- a/README.md +++ b/README.md @@ -10,3 +10,8 @@ Add the repo: `helm repo add evryfs-oss https://evryfs.github.io/helm-charts/` this repo contains charts for the following deployments +- +- +- +- + From 89ef36777f0739bddf38259e71fd02c4b4f3ba48 Mon Sep 17 00:00:00 2001 From: Pandora <58219367+Homopatrol@users.noreply.github.com> Date: Thu, 19 Aug 2021 10:03:43 +0100 Subject: [PATCH 15/15] Update README.md --- README.md | 5 ----- 1 file changed, 5 deletions(-) diff --git a/README.md b/README.md index bda2de6..7f310f2 100644 --- a/README.md +++ b/README.md @@ -10,8 +10,3 @@ Add the repo: `helm repo add evryfs-oss https://evryfs.github.io/helm-charts/` this repo contains charts for the following deployments -- -- -- -- -