From adb6f92c55491900e20c3e1a9573263033d77194 Mon Sep 17 00:00:00 2001 From: mikhail-klimko Date: Wed, 16 Oct 2024 16:47:48 +0300 Subject: [PATCH 1/8] onprem: 2.5.5 --- codefresh/Chart.yaml | 4 ++-- codefresh/README.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/codefresh/Chart.yaml b/codefresh/Chart.yaml index 09cc6971f..bb3c74155 100644 --- a/codefresh/Chart.yaml +++ b/codefresh/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 description: Helm Chart for Codefresh On-Prem name: codefresh -version: 2.5.4 +version: 2.5.5 keywords: - codefresh home: https://codefresh.io/ @@ -19,7 +19,7 @@ annotations: # supported kinds are added, changed, deprecated, removed, fixed and security. artifacthub.io/changes: | - kind: changed - description: "Enable allow-snippet-annotations by default for ingress-nginx" + description: "Test CI" dependencies: - name: cf-common repository: oci://quay.io/codefresh/charts diff --git a/codefresh/README.md b/codefresh/README.md index b54a96c12..c81148de5 100644 --- a/codefresh/README.md +++ b/codefresh/README.md @@ -1,6 +1,6 @@ ## Codefresh On-Premises -![Version: 2.5.4](https://img.shields.io/badge/Version-2.5.4-informational?style=flat-square) ![AppVersion: 2.5.0](https://img.shields.io/badge/AppVersion-2.5.0-informational?style=flat-square) +![Version: 2.5.5](https://img.shields.io/badge/Version-2.5.5-informational?style=flat-square) ![AppVersion: 2.5.0](https://img.shields.io/badge/AppVersion-2.5.0-informational?style=flat-square) Helm chart for deploying [Codefresh On-Premises](https://codefresh.io/docs/docs/getting-started/intro-to-codefresh/) to Kubernetes. From a5cf61eff9f559659de3f51ef13d030ae9af8eda Mon Sep 17 00:00:00 2001 From: mikhail-klimko Date: Thu, 17 Oct 2024 14:07:11 +0300 Subject: [PATCH 2/8] wip: Thu Oct 17 14:07:11 +03 2024 --- codefresh/.ci/values/defaults-hpa.yaml | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/codefresh/.ci/values/defaults-hpa.yaml b/codefresh/.ci/values/defaults-hpa.yaml index 015297ed8..c2362c309 100644 --- a/codefresh/.ci/values/defaults-hpa.yaml +++ b/codefresh/.ci/values/defaults-hpa.yaml @@ -114,6 +114,21 @@ cfapi: env: DEFAULT_SYSTEM_TYPE: CLASSIC +cfsign: + volumes: + certs-data: + type: emptyDir + +builder: + volumeClaimTemplates: + varlibdocker: + size: 32Gi + +runner: + volumeClaimTemplates: + varlibdocker: + size: 32Gi + ingress: enabled: true ingressClassName: nginx-internal From 24f082ff72f260a79044f1137fdcae81b3d4f3b8 Mon Sep 17 00:00:00 2001 From: mikhail-klimko Date: Thu, 17 Oct 2024 14:20:00 +0300 Subject: [PATCH 3/8] wip: Thu Oct 17 14:20:00 +03 2024 --- codefresh/.ci/values/defaults-hpa.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/codefresh/.ci/values/defaults-hpa.yaml b/codefresh/.ci/values/defaults-hpa.yaml index c2362c309..49b8a5622 100644 --- a/codefresh/.ci/values/defaults-hpa.yaml +++ b/codefresh/.ci/values/defaults-hpa.yaml @@ -115,6 +115,9 @@ cfapi: DEFAULT_SYSTEM_TYPE: CLASSIC cfsign: + persistence: + certs-data: + enabled: false volumes: certs-data: type: emptyDir From 0d0872f1fc8da2b933a604fb26f6bacf1cb763d8 Mon Sep 17 00:00:00 2001 From: mikhail-klimko Date: Fri, 18 Oct 2024 17:16:36 +0300 Subject: [PATCH 4/8] onprem: 2.5.5 --- codefresh/.ci/values/defaults-hpa.yaml | 2 +- codefresh/Chart.lock | 10 +++++----- codefresh/Chart.yaml | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/codefresh/.ci/values/defaults-hpa.yaml b/codefresh/.ci/values/defaults-hpa.yaml index 49b8a5622..a2a36a47a 100644 --- a/codefresh/.ci/values/defaults-hpa.yaml +++ b/codefresh/.ci/values/defaults-hpa.yaml @@ -15,7 +15,7 @@ secrets: enabled: true stringData: postgres-hostname: cf-postgresql - postgres-password: eC9arYka4ZbH + postgres-password: eC9ar%Yka4Zb!$H postgres-user: postgres ext-redis: enabled: true diff --git a/codefresh/Chart.lock b/codefresh/Chart.lock index f61904348..bd4752dfa 100644 --- a/codefresh/Chart.lock +++ b/codefresh/Chart.lock @@ -142,18 +142,18 @@ dependencies: version: 0.8.7 - name: cf-platform-analytics repository: oci://quay.io/codefresh/charts - version: 0.49.63 + version: 0.49.64 - name: cf-platform-analytics repository: oci://quay.io/codefresh/charts - version: 0.49.63 + version: 0.49.64 - name: argo-platform repository: oci://quay.io/codefresh/charts - version: 1.3037.0-onprem-680e6c9 + version: 1.3037.0-onprem-fb06d0a - name: argo-hub-platform repository: oci://quay.io/codefresh/charts version: 0.1.16 - name: cf-oidc-provider repository: oci://quay.io/codefresh/charts version: 0.0.15 -digest: sha256:5caa90b76bb269d520322473dd9014d852412bdcfd912af7d99255e2ae8fd9e1 -generated: "2024-10-11T09:24:24.192115705+03:00" +digest: sha256:edbaf05dda76198a835be22173b885995a0952bd4daab0e6737c1594323576b0 +generated: "2024-10-18T17:12:01.120092128+03:00" diff --git a/codefresh/Chart.yaml b/codefresh/Chart.yaml index bb3c74155..af0063cdf 100644 --- a/codefresh/Chart.yaml +++ b/codefresh/Chart.yaml @@ -18,8 +18,8 @@ annotations: # artifacthub.io/containsSecurityUpdates: "true" # supported kinds are added, changed, deprecated, removed, fixed and security. artifacthub.io/changes: | - - kind: changed - description: "Test CI" + - kind: fixed + description: "encode special characters in postgresql password (argo-platform)" dependencies: - name: cf-common repository: oci://quay.io/codefresh/charts @@ -237,7 +237,7 @@ dependencies: repository: oci://quay.io/codefresh/charts condition: argo-platform.enabled - name: argo-platform - version: "1.3037.0-onprem-680e6c9" + version: "1.3037.0-onprem-fb06d0a" repository: oci://quay.io/codefresh/charts condition: argo-platform.enabled - name: argo-hub-platform From 37af097880c96f975dc10acd3d7a28f1e79b9c86 Mon Sep 17 00:00:00 2001 From: mikhail-klimko Date: Fri, 18 Oct 2024 17:38:32 +0300 Subject: [PATCH 5/8] onprem: 2.5.5 --- codefresh/.ci/values/defaults-hpa.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/codefresh/.ci/values/defaults-hpa.yaml b/codefresh/.ci/values/defaults-hpa.yaml index a2a36a47a..3dd082398 100644 --- a/codefresh/.ci/values/defaults-hpa.yaml +++ b/codefresh/.ci/values/defaults-hpa.yaml @@ -187,3 +187,7 @@ argo-platform: promotion-orchestrator: hpa: enabled: true + +postgresql: + auth: + postgresPassword: "eC9ar%Yka4Zb!$H" From 24ee4960aa0dc8c4d12da32ad3789b3b79ff9501 Mon Sep 17 00:00:00 2001 From: mikhail-klimko Date: Fri, 18 Oct 2024 18:23:02 +0300 Subject: [PATCH 6/8] onprem: 2.5.5 --- codefresh/templates/secrets/secret.yaml | 4 ++-- codefresh/templates/seed/postgres-seed-job.yaml | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/codefresh/templates/secrets/secret.yaml b/codefresh/templates/secrets/secret.yaml index 8d832196f..06d794d84 100644 --- a/codefresh/templates/secrets/secret.yaml +++ b/codefresh/templates/secrets/secret.yaml @@ -26,7 +26,7 @@ stringData: POSTGRES_USER: {{ coalesce .Values.global.postgresUser }} POSTGRES_PASSWORD: {{ coalesce .Values.global.postgresPassword }} POSTGRES_SEED_USER: {{ (coalesce .Values.seed.postgresSeedJob.postgresUser .Values.global.postgresSeedJob.postgresUser) | default .Values.global.postgresUser }} - POSTGRES_SEED_PASSWORD: {{ (coalesce .Values.seed.postgresSeedJob.postgresPassword .Values.global.postgresSeedJob.postgresPassword) | default .Values.global.postgresPassword }} + POSTGRES_SEED_PASSWORD: {{ urlquery ((coalesce .Values.seed.postgresSeedJob.postgresPassword .Values.global.postgresSeedJob.postgresPassword) | default .Values.global.postgresPassword) }} POSTGRES_HOSTNAME: {{ default (printf "%s-%s" .Release.Name .Values.global.postgresService) .Values.global.postgresHostname }} POSTGRES_PORT: {{ coalesce .Values.global.postgresPort | default 5432 | quote }} - POSTGRES_DATABASE: {{ .Values.global.postgresDatabase | default "codefresh" }} \ No newline at end of file + POSTGRES_DATABASE: {{ .Values.global.postgresDatabase | default "codefresh" }} diff --git a/codefresh/templates/seed/postgres-seed-job.yaml b/codefresh/templates/seed/postgres-seed-job.yaml index 479192002..5a18b31e9 100644 --- a/codefresh/templates/seed/postgres-seed-job.yaml +++ b/codefresh/templates/seed/postgres-seed-job.yaml @@ -39,6 +39,10 @@ spec: {{- include "codefresh.postgres-password-env-var-value" . | indent 12 }} - name: POSTGRES_HOSTNAME {{- include "codefresh.postgres-host-env-var-value" . | indent 12 }} + - name: POSTGRES_SEED_USER + {{- include "codefresh.postgres-seed-user-env-var-value" . | indent 12 }} + - name: POSTGRES_SEED_PASSWORD + {{- include "codefresh.postgres-seed-password-env-var-value" . | indent 12 }} resources: {{- toYaml .Values.seed.resources | nindent 10 }} command: From 88f4f97697468478ac33e721b47b8a2abc4f97a5 Mon Sep 17 00:00:00 2001 From: mikhail-klimko Date: Fri, 18 Oct 2024 22:49:24 +0300 Subject: [PATCH 7/8] onprem: 2.5.5 --- codefresh/.ci/values/defaults-hpa.yaml | 24 +------------------ codefresh/.ci/values/values-install-only.yaml | 12 ++++++++++ ...-upgrade.yaml => values-upgrade-only.yaml} | 0 3 files changed, 13 insertions(+), 23 deletions(-) create mode 100644 codefresh/.ci/values/values-install-only.yaml rename codefresh/.ci/values/{values-upgrade.yaml => values-upgrade-only.yaml} (100%) diff --git a/codefresh/.ci/values/defaults-hpa.yaml b/codefresh/.ci/values/defaults-hpa.yaml index 3dd082398..015297ed8 100644 --- a/codefresh/.ci/values/defaults-hpa.yaml +++ b/codefresh/.ci/values/defaults-hpa.yaml @@ -15,7 +15,7 @@ secrets: enabled: true stringData: postgres-hostname: cf-postgresql - postgres-password: eC9ar%Yka4Zb!$H + postgres-password: eC9arYka4ZbH postgres-user: postgres ext-redis: enabled: true @@ -114,24 +114,6 @@ cfapi: env: DEFAULT_SYSTEM_TYPE: CLASSIC -cfsign: - persistence: - certs-data: - enabled: false - volumes: - certs-data: - type: emptyDir - -builder: - volumeClaimTemplates: - varlibdocker: - size: 32Gi - -runner: - volumeClaimTemplates: - varlibdocker: - size: 32Gi - ingress: enabled: true ingressClassName: nginx-internal @@ -187,7 +169,3 @@ argo-platform: promotion-orchestrator: hpa: enabled: true - -postgresql: - auth: - postgresPassword: "eC9ar%Yka4Zb!$H" diff --git a/codefresh/.ci/values/values-install-only.yaml b/codefresh/.ci/values/values-install-only.yaml new file mode 100644 index 000000000..7cb1966a8 --- /dev/null +++ b/codefresh/.ci/values/values-install-only.yaml @@ -0,0 +1,12 @@ +# -- checking postgresql password with special characters +postgresql: + auth: + postgresPassword: "e%C9ar$Yka4Zb!H" + +secrets: + ext-postgres: + enabled: true + stringData: + postgres-hostname: cf-postgresql + postgres-password: e%C9ar$Yka4Zb!H + postgres-user: postgres diff --git a/codefresh/.ci/values/values-upgrade.yaml b/codefresh/.ci/values/values-upgrade-only.yaml similarity index 100% rename from codefresh/.ci/values/values-upgrade.yaml rename to codefresh/.ci/values/values-upgrade-only.yaml From 609f457d10a42e831c4887a2e940ab987c02752a Mon Sep 17 00:00:00 2001 From: mikhail-klimko Date: Fri, 18 Oct 2024 23:06:53 +0300 Subject: [PATCH 8/8] onprem: 2.5.5 --- codefresh/Chart.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/codefresh/Chart.lock b/codefresh/Chart.lock index bd4752dfa..09ca4f4bf 100644 --- a/codefresh/Chart.lock +++ b/codefresh/Chart.lock @@ -142,10 +142,10 @@ dependencies: version: 0.8.7 - name: cf-platform-analytics repository: oci://quay.io/codefresh/charts - version: 0.49.64 + version: 0.49.65 - name: cf-platform-analytics repository: oci://quay.io/codefresh/charts - version: 0.49.64 + version: 0.49.65 - name: argo-platform repository: oci://quay.io/codefresh/charts version: 1.3037.0-onprem-fb06d0a @@ -155,5 +155,5 @@ dependencies: - name: cf-oidc-provider repository: oci://quay.io/codefresh/charts version: 0.0.15 -digest: sha256:edbaf05dda76198a835be22173b885995a0952bd4daab0e6737c1594323576b0 -generated: "2024-10-18T17:12:01.120092128+03:00" +digest: sha256:5f3103c713ddac080b88d73dbb094b2bc02406d87fda6f130bb89abdc2690e3d +generated: "2024-10-18T22:52:29.468059483+03:00"