From e259862e9871e8f2203aa8c3cd1e7495e3d536a9 Mon Sep 17 00:00:00 2001 From: Mikhail Klimko Date: Tue, 25 Mar 2025 19:17:16 +0300 Subject: [PATCH 1/9] onprem: 2.7.4 --- codefresh/.ci/values/external-secrets.yaml | 15 ++++- codefresh/Chart.yaml | 72 +++++++++++----------- codefresh/values.yaml | 4 +- 3 files changed, 50 insertions(+), 41 deletions(-) diff --git a/codefresh/.ci/values/external-secrets.yaml b/codefresh/.ci/values/external-secrets.yaml index e146a6d1d..a55f3b7f6 100644 --- a/codefresh/.ci/values/external-secrets.yaml +++ b/codefresh/.ci/values/external-secrets.yaml @@ -3,7 +3,7 @@ secrets: ext-mongo: enabled: true stringData: - mongodb-host: cf-mongodb:27017 + mongodb-host: my-mongodb:27017 mongodb-password: mTiXcU2wafr9 mongodb-user: cfuser mongodb-root-user: root @@ -11,13 +11,13 @@ secrets: ext-postgres: enabled: true stringData: - postgres-hostname: cf-postgresql + postgres-hostname: my-postgresql postgres-password: eC9arYka4ZbH postgres-user: postgres ext-redis: enabled: true stringData: - redis-url: cf-redis-master + redis-url: my-redis-master redis-password: hoC9szf7NtrU ext-rabbitmq: enabled: true @@ -101,3 +101,12 @@ rabbitmq: fullnameOverride: my-rabbitmq auth: username: myuser + +redis: + fullnameOverride: my-redis-master + +postgresql: + fullnameOverride: my-postgresql + +mongodb: + fullnameOverride: my-mongodb diff --git a/codefresh/Chart.yaml b/codefresh/Chart.yaml index c00155686..4dcd35586 100644 --- a/codefresh/Chart.yaml +++ b/codefresh/Chart.yaml @@ -109,93 +109,93 @@ dependencies: condition: gitops-dashboard-manager.enabled - name: cfapi alias: cfapi - version: "~21.274.0" - repository: oci://quay.io/codefresh/charts + version: "21.276.4-fix-redis-feature-env-vars" + repository: oci://quay.io/codefresh/charts/dev condition: cfapi.enabled - name: cfapi alias: cfapi-auth - version: "~21.274.0" - repository: oci://quay.io/codefresh/charts + version: "21.276.4-fix-redis-feature-env-vars" + repository: oci://quay.io/codefresh/charts/dev condition: cfapi-auth.enabled - name: cfapi alias: cfapi-internal - version: "~21.274.0" - repository: oci://quay.io/codefresh/charts + version: "21.276.4-fix-redis-feature-env-vars" + repository: oci://quay.io/codefresh/charts/dev condition: cfapi-internal.enabled - name: cfapi alias: cfapi-ws - version: "~21.274.0" - repository: oci://quay.io/codefresh/charts + version: "21.276.4-fix-redis-feature-env-vars" + repository: oci://quay.io/codefresh/charts/dev condition: cfapi-ws.enabled - name: cfapi alias: cfapi-admin - version: "~21.274.0" - repository: oci://quay.io/codefresh/charts + version: "21.276.4-fix-redis-feature-env-vars" + repository: oci://quay.io/codefresh/charts/dev condition: cfapi-admin.enabled - name: cfapi alias: cfapi-endpoints - version: "~21.274.0" - repository: oci://quay.io/codefresh/charts + version: "21.276.4-fix-redis-feature-env-vars" + repository: oci://quay.io/codefresh/charts/dev condition: cfapi-endpoints.enabled - name: cfapi alias: cfapi-terminators - version: "~21.274.0" - repository: oci://quay.io/codefresh/charts + version: "21.276.4-fix-redis-feature-env-vars" + repository: oci://quay.io/codefresh/charts/dev condition: cfapi-terminators.enabled - name: cfapi alias: cfapi-sso-group-synchronizer - version: "~21.274.0" - repository: oci://quay.io/codefresh/charts + version: "21.276.4-fix-redis-feature-env-vars" + repository: oci://quay.io/codefresh/charts/dev condition: cfapi-sso-group-synchronizer.enabled - name: cfapi alias: cfapi-buildmanager - version: "~21.274.0" - repository: oci://quay.io/codefresh/charts + version: "21.276.4-fix-redis-feature-env-vars" + repository: oci://quay.io/codefresh/charts/dev condition: cfapi-buildmanager.enabled - name: cfapi alias: cfapi-cacheevictmanager - version: "~21.274.0" - repository: oci://quay.io/codefresh/charts + version: "21.276.4-fix-redis-feature-env-vars" + repository: oci://quay.io/codefresh/charts/dev condition: cfapi-cacheevictmanager.enabled - name: cfapi alias: cfapi-eventsmanagersubscriptions - version: "~21.274.0" - repository: oci://quay.io/codefresh/charts + version: "21.276.4-fix-redis-feature-env-vars" + repository: oci://quay.io/codefresh/charts/dev condition: cfapi-eventsmanagersubscriptions.enabled - name: cfapi alias: cfapi-kubernetesresourcemonitor - version: "~21.274.0" - repository: oci://quay.io/codefresh/charts + version: "21.276.4-fix-redis-feature-env-vars" + repository: oci://quay.io/codefresh/charts/dev condition: cfapi-kubernetesresourcemonitor.enabled - name: cfapi alias: cfapi-environments - version: "~21.274.0" - repository: oci://quay.io/codefresh/charts + version: "21.276.4-fix-redis-feature-env-vars" + repository: oci://quay.io/codefresh/charts/dev condition: cfapi-environments.enabled - name: cfapi alias: cfapi-gitops-resource-receiver - version: "~21.274.0" - repository: oci://quay.io/codefresh/charts + version: "21.276.4-fix-redis-feature-env-vars" + repository: oci://quay.io/codefresh/charts/dev condition: cfapi-gitops-resource-receiver.enabled - name: cfapi alias: cfapi-downloadlogmanager - version: "~21.274.0" - repository: oci://quay.io/codefresh/charts + version: "21.276.4-fix-redis-feature-env-vars" + repository: oci://quay.io/codefresh/charts/dev condition: cfapi-downloadlogmanager.enabled - name: cfapi alias: cfapi-teams - version: "~21.274.0" - repository: oci://quay.io/codefresh/charts + version: "21.276.4-fix-redis-feature-env-vars" + repository: oci://quay.io/codefresh/charts/dev condition: cfapi-teams.enabled - name: cfapi alias: cfapi-kubernetes-endpoints - version: "~21.274.0" - repository: oci://quay.io/codefresh/charts + version: "21.276.4-fix-redis-feature-env-vars" + repository: oci://quay.io/codefresh/charts/dev condition: cfapi-kubernetes-endpoints.enabled - name: cfapi alias: cfapi-test-reporting - version: "~21.274.0" - repository: oci://quay.io/codefresh/charts + version: "21.276.4-fix-redis-feature-env-vars" + repository: oci://quay.io/codefresh/charts/dev condition: cfapi-test-reporting.enabled - name: cfui version: "~14.97.0" diff --git a/codefresh/values.yaml b/codefresh/values.yaml index 6835b4177..545f01a69 100644 --- a/codefresh/values.yaml +++ b/codefresh/values.yaml @@ -504,9 +504,9 @@ cfapi: &cf-api # -- Image image: # -- Registry prefix - registry: us-docker.pkg.dev/codefresh-enterprise/gcr.io + registry: us-docker.pkg.dev/codefresh-inc/gcr.io # -- Repository - repository: codefresh/cf-api + repository: codefresh/dev/cf-api # -- Env vars # @default -- See below env: From f47588a59e63d3eb82afd3fbbd8c59a2769c6c9f Mon Sep 17 00:00:00 2001 From: Mikhail Klimko Date: Tue, 25 Mar 2025 19:25:59 +0300 Subject: [PATCH 2/9] onprem: 2.7.4 --- codefresh/Chart.yaml | 2 +- codefresh/README.md | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/codefresh/Chart.yaml b/codefresh/Chart.yaml index 4dcd35586..17b45fe37 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.7.3 +version: 2.7.4 keywords: - codefresh home: https://codefresh.io/ diff --git a/codefresh/README.md b/codefresh/README.md index 4aa54ac9d..562279f47 100644 --- a/codefresh/README.md +++ b/codefresh/README.md @@ -1,6 +1,6 @@ ## Codefresh On-Premises -![Version: 2.7.3](https://img.shields.io/badge/Version-2.7.3-informational?style=flat-square) ![AppVersion: 2.7.0](https://img.shields.io/badge/AppVersion-2.7.0-informational?style=flat-square) +![Version: 2.7.4](https://img.shields.io/badge/Version-2.7.4-informational?style=flat-square) ![AppVersion: 2.7.0](https://img.shields.io/badge/AppVersion-2.7.0-informational?style=flat-square) Helm chart for deploying [Codefresh On-Premises](https://codefresh.io/docs/docs/getting-started/intro-to-codefresh/) to Kubernetes. @@ -2139,13 +2139,13 @@ After platform upgrade, Consul fails with the error `refusing to rejoin cluster | cf-platform-analytics-etlstarter.redis.enabled | bool | `false` | Disable redis subchart | | cf-platform-analytics-etlstarter.system-etl-postgres | object | `{"container":{"env":{"BLUE_GREEN_ENABLED":true}},"controller":{"cronjob":{"ttlSecondsAfterFinished":300}},"enabled":true}` | Only postgres ETL should be running in onprem | | cf-platform-analytics-platform | object | See below | platform-analytics | -| cfapi | object | `{"affinity":{},"container":{"env":{"AUDIT_AUTO_CREATE_DB":true,"DEFAULT_SYSTEM_TYPE":"PROJECT_ONE","GITHUB_API_PATH_PREFIX":"/api/v3","LOGGER_LEVEL":"debug","OIDC_PROVIDER_PORT":"{{ .Values.global.oidcProviderPort }}","OIDC_PROVIDER_PROTOCOL":"{{ .Values.global.oidcProviderProtocol }}","OIDC_PROVIDER_TOKEN_ENDPOINT":"{{ .Values.global.oidcProviderTokenEndpoint }}","OIDC_PROVIDER_URI":"{{ .Values.global.oidcProviderService }}","ON_PREMISE":true,"RUNTIME_MONGO_DB":"codefresh","RUNTIME_REDIS_DB":0},"image":{"registry":"us-docker.pkg.dev/codefresh-enterprise/gcr.io","repository":"codefresh/cf-api"}},"controller":{"replicas":2},"enabled":true,"hpa":{"enabled":false,"maxReplicas":10,"minReplicas":2,"targetCPUUtilizationPercentage":70},"nodeSelector":{},"pdb":{"enabled":false,"minAvailable":"50%"},"podSecurityContext":{},"resources":{"limits":{},"requests":{"cpu":"200m","memory":"256Mi"}},"secrets":{"secret":{"enabled":true,"stringData":{"OIDC_PROVIDER_CLIENT_ID":"{{ .Values.global.oidcProviderClientId }}","OIDC_PROVIDER_CLIENT_SECRET":"{{ .Values.global.oidcProviderClientSecret }}"},"type":"Opaque"}},"tolerations":[]}` | cf-api | +| cfapi | object | `{"affinity":{},"container":{"env":{"AUDIT_AUTO_CREATE_DB":true,"DEFAULT_SYSTEM_TYPE":"PROJECT_ONE","GITHUB_API_PATH_PREFIX":"/api/v3","LOGGER_LEVEL":"debug","OIDC_PROVIDER_PORT":"{{ .Values.global.oidcProviderPort }}","OIDC_PROVIDER_PROTOCOL":"{{ .Values.global.oidcProviderProtocol }}","OIDC_PROVIDER_TOKEN_ENDPOINT":"{{ .Values.global.oidcProviderTokenEndpoint }}","OIDC_PROVIDER_URI":"{{ .Values.global.oidcProviderService }}","ON_PREMISE":true,"RUNTIME_MONGO_DB":"codefresh","RUNTIME_REDIS_DB":0},"image":{"registry":"us-docker.pkg.dev/codefresh-inc/gcr.io","repository":"codefresh/dev/cf-api"}},"controller":{"replicas":2},"enabled":true,"hpa":{"enabled":false,"maxReplicas":10,"minReplicas":2,"targetCPUUtilizationPercentage":70},"nodeSelector":{},"pdb":{"enabled":false,"minAvailable":"50%"},"podSecurityContext":{},"resources":{"limits":{},"requests":{"cpu":"200m","memory":"256Mi"}},"secrets":{"secret":{"enabled":true,"stringData":{"OIDC_PROVIDER_CLIENT_ID":"{{ .Values.global.oidcProviderClientId }}","OIDC_PROVIDER_CLIENT_SECRET":"{{ .Values.global.oidcProviderClientSecret }}"},"type":"Opaque"}},"tolerations":[]}` | cf-api | | cfapi-internal.<<.affinity | object | `{}` | | -| cfapi-internal.<<.container | object | `{"env":{"AUDIT_AUTO_CREATE_DB":true,"DEFAULT_SYSTEM_TYPE":"PROJECT_ONE","GITHUB_API_PATH_PREFIX":"/api/v3","LOGGER_LEVEL":"debug","OIDC_PROVIDER_PORT":"{{ .Values.global.oidcProviderPort }}","OIDC_PROVIDER_PROTOCOL":"{{ .Values.global.oidcProviderProtocol }}","OIDC_PROVIDER_TOKEN_ENDPOINT":"{{ .Values.global.oidcProviderTokenEndpoint }}","OIDC_PROVIDER_URI":"{{ .Values.global.oidcProviderService }}","ON_PREMISE":true,"RUNTIME_MONGO_DB":"codefresh","RUNTIME_REDIS_DB":0},"image":{"registry":"us-docker.pkg.dev/codefresh-enterprise/gcr.io","repository":"codefresh/cf-api"}}` | Container configuration | +| cfapi-internal.<<.container | object | `{"env":{"AUDIT_AUTO_CREATE_DB":true,"DEFAULT_SYSTEM_TYPE":"PROJECT_ONE","GITHUB_API_PATH_PREFIX":"/api/v3","LOGGER_LEVEL":"debug","OIDC_PROVIDER_PORT":"{{ .Values.global.oidcProviderPort }}","OIDC_PROVIDER_PROTOCOL":"{{ .Values.global.oidcProviderProtocol }}","OIDC_PROVIDER_TOKEN_ENDPOINT":"{{ .Values.global.oidcProviderTokenEndpoint }}","OIDC_PROVIDER_URI":"{{ .Values.global.oidcProviderService }}","ON_PREMISE":true,"RUNTIME_MONGO_DB":"codefresh","RUNTIME_REDIS_DB":0},"image":{"registry":"us-docker.pkg.dev/codefresh-inc/gcr.io","repository":"codefresh/dev/cf-api"}}` | Container configuration | | cfapi-internal.<<.container.env | object | See below | Env vars | -| cfapi-internal.<<.container.image | object | `{"registry":"us-docker.pkg.dev/codefresh-enterprise/gcr.io","repository":"codefresh/cf-api"}` | Image | -| cfapi-internal.<<.container.image.registry | string | `"us-docker.pkg.dev/codefresh-enterprise/gcr.io"` | Registry prefix | -| cfapi-internal.<<.container.image.repository | string | `"codefresh/cf-api"` | Repository | +| cfapi-internal.<<.container.image | object | `{"registry":"us-docker.pkg.dev/codefresh-inc/gcr.io","repository":"codefresh/dev/cf-api"}` | Image | +| cfapi-internal.<<.container.image.registry | string | `"us-docker.pkg.dev/codefresh-inc/gcr.io"` | Registry prefix | +| cfapi-internal.<<.container.image.repository | string | `"codefresh/dev/cf-api"` | Repository | | cfapi-internal.<<.controller | object | `{"replicas":2}` | Controller configuration | | cfapi-internal.<<.controller.replicas | int | `2` | Replicas number | | cfapi-internal.<<.enabled | bool | `true` | Enable cf-api | @@ -2166,11 +2166,11 @@ After platform upgrade, Consul fails with the error `refusing to rejoin cluster | cfapi-internal.<<.secrets.secret.type | string | `"Opaque"` | | | cfapi-internal.<<.tolerations | list | `[]` | | | cfapi-internal.enabled | bool | `false` | | -| cfapi.container | object | `{"env":{"AUDIT_AUTO_CREATE_DB":true,"DEFAULT_SYSTEM_TYPE":"PROJECT_ONE","GITHUB_API_PATH_PREFIX":"/api/v3","LOGGER_LEVEL":"debug","OIDC_PROVIDER_PORT":"{{ .Values.global.oidcProviderPort }}","OIDC_PROVIDER_PROTOCOL":"{{ .Values.global.oidcProviderProtocol }}","OIDC_PROVIDER_TOKEN_ENDPOINT":"{{ .Values.global.oidcProviderTokenEndpoint }}","OIDC_PROVIDER_URI":"{{ .Values.global.oidcProviderService }}","ON_PREMISE":true,"RUNTIME_MONGO_DB":"codefresh","RUNTIME_REDIS_DB":0},"image":{"registry":"us-docker.pkg.dev/codefresh-enterprise/gcr.io","repository":"codefresh/cf-api"}}` | Container configuration | +| cfapi.container | object | `{"env":{"AUDIT_AUTO_CREATE_DB":true,"DEFAULT_SYSTEM_TYPE":"PROJECT_ONE","GITHUB_API_PATH_PREFIX":"/api/v3","LOGGER_LEVEL":"debug","OIDC_PROVIDER_PORT":"{{ .Values.global.oidcProviderPort }}","OIDC_PROVIDER_PROTOCOL":"{{ .Values.global.oidcProviderProtocol }}","OIDC_PROVIDER_TOKEN_ENDPOINT":"{{ .Values.global.oidcProviderTokenEndpoint }}","OIDC_PROVIDER_URI":"{{ .Values.global.oidcProviderService }}","ON_PREMISE":true,"RUNTIME_MONGO_DB":"codefresh","RUNTIME_REDIS_DB":0},"image":{"registry":"us-docker.pkg.dev/codefresh-inc/gcr.io","repository":"codefresh/dev/cf-api"}}` | Container configuration | | cfapi.container.env | object | See below | Env vars | -| cfapi.container.image | object | `{"registry":"us-docker.pkg.dev/codefresh-enterprise/gcr.io","repository":"codefresh/cf-api"}` | Image | -| cfapi.container.image.registry | string | `"us-docker.pkg.dev/codefresh-enterprise/gcr.io"` | Registry prefix | -| cfapi.container.image.repository | string | `"codefresh/cf-api"` | Repository | +| cfapi.container.image | object | `{"registry":"us-docker.pkg.dev/codefresh-inc/gcr.io","repository":"codefresh/dev/cf-api"}` | Image | +| cfapi.container.image.registry | string | `"us-docker.pkg.dev/codefresh-inc/gcr.io"` | Registry prefix | +| cfapi.container.image.repository | string | `"codefresh/dev/cf-api"` | Repository | | cfapi.controller | object | `{"replicas":2}` | Controller configuration | | cfapi.controller.replicas | int | `2` | Replicas number | | cfapi.enabled | bool | `true` | Enable cf-api | From ad41754cdfa0e618a9ccc06aedadb1ca8c479dfd Mon Sep 17 00:00:00 2001 From: Mikhail Klimko Date: Tue, 25 Mar 2025 19:33:30 +0300 Subject: [PATCH 3/9] onprem: 2.7.4 --- codefresh/Chart.yaml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/codefresh/Chart.yaml b/codefresh/Chart.yaml index 17b45fe37..7d2e99345 100644 --- a/codefresh/Chart.yaml +++ b/codefresh/Chart.yaml @@ -18,11 +18,8 @@ annotations: # artifacthub.io/containsSecurityUpdates: "true" # supported kinds are added, changed, deprecated, removed, fixed and security. artifacthub.io/changes: | - - kind: changed - description: "Add procps to cf-system-etl-postgres" - links: - - name: JIRA Issue - url: https://codefresh-io.atlassian.net/browse/CR-27956 + - kind: fixed + description: "REDIS_FEATURE_* env vars in cf-api" dependencies: - name: cf-common repository: oci://quay.io/codefresh/charts From 9da83973212d54bad17b14f50cd3cedd3ff1faa7 Mon Sep 17 00:00:00 2001 From: Mikhail Klimko Date: Tue, 25 Mar 2025 19:56:43 +0300 Subject: [PATCH 4/9] onprem: 2.7.4 --- codefresh/.ci/values/external-secrets.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/codefresh/.ci/values/external-secrets.yaml b/codefresh/.ci/values/external-secrets.yaml index a55f3b7f6..356912d99 100644 --- a/codefresh/.ci/values/external-secrets.yaml +++ b/codefresh/.ci/values/external-secrets.yaml @@ -103,7 +103,7 @@ rabbitmq: username: myuser redis: - fullnameOverride: my-redis-master + fullnameOverride: my-redis postgresql: fullnameOverride: my-postgresql From c65f49f387f15cb2022d3a51044c6ee39d51cd83 Mon Sep 17 00:00:00 2001 From: Mikhail Klimko Date: Tue, 25 Mar 2025 22:00:15 +0300 Subject: [PATCH 5/9] onprem: 2.7.4 --- codefresh/templates/seed-e2e/seed-e2e.yaml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/codefresh/templates/seed-e2e/seed-e2e.yaml b/codefresh/templates/seed-e2e/seed-e2e.yaml index 5e8932c6e..2e4b23fad 100644 --- a/codefresh/templates/seed-e2e/seed-e2e.yaml +++ b/codefresh/templates/seed-e2e/seed-e2e.yaml @@ -38,6 +38,18 @@ spec: - secretRef: name: {{ include "codefresh.fullname" . }} env: + - name: MONGODB_HOST + {{- include "codefresh.mongodb-host-env-var-value" . | indent 10 }} + - name: MONGODB_USER + {{- include "codefresh.mongodb-user-env-var-value" . | indent 10 }} + - name: MONGODB_PASSWORD + {{- include "codefresh.mongodb-password-env-var-value" . | indent 10 }} + - name: MONGO_URI + {{- include "codefresh.mongo-seed-uri-env-var-value" . | indent 10 }} + - name: MONGODB_ROOT_USER + {{- include "codefresh.mongodb-root-user-env-var-value" . | indent 10 }} + - name: MONGODB_ROOT_PASSWORD + {{- include "codefresh.mongodb-root-password-env-var-value" . | indent 10 }} - name: MONGO_URI value: $(MONGODB_PROTOCOL)://$(MONGODB_USER):$(MONGODB_PASSWORD)@$(MONGODB_HOST)/$(MONGODB_DATABASE)?$(MONGODB_OPTIONS) command: From fc838270152c8dc4a4af8aca226a0cb52765272d Mon Sep 17 00:00:00 2001 From: Mikhail Klimko Date: Tue, 25 Mar 2025 23:02:07 +0300 Subject: [PATCH 6/9] onprem: 2.7.4 --- 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 8b80bdcb4..2b5a4bc0f 100644 --- a/codefresh/.ci/values/defaults-hpa.yaml +++ b/codefresh/.ci/values/defaults-hpa.yaml @@ -3,6 +3,9 @@ seed-e2e: global: appUrl: "" # placeholder + imagePullSecrets: + - codefresh-registry + - dockerhub-creds cfapi: rbac: From 031ead7b81c52f390d470929ccb87a0820041403 Mon Sep 17 00:00:00 2001 From: Mikhail Klimko Date: Tue, 25 Mar 2025 23:24:16 +0300 Subject: [PATCH 7/9] onprem: 2.7.4 --- codefresh/templates/seed-e2e/seed-e2e.yaml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/codefresh/templates/seed-e2e/seed-e2e.yaml b/codefresh/templates/seed-e2e/seed-e2e.yaml index 2e4b23fad..18a5e0c22 100644 --- a/codefresh/templates/seed-e2e/seed-e2e.yaml +++ b/codefresh/templates/seed-e2e/seed-e2e.yaml @@ -25,10 +25,7 @@ spec: labels: {{ include "codefresh.labels" . | nindent 8 }} spec: - {{- if .Values.global.imageRegistry }} - imagePullSecrets: - - name: "{{ .Release.Name }}-{{ .Values.global.codefresh }}-registry" - {{- end }} + {{- include (printf "%s.image.pullSecrets" $libTemplateName ) . | nindent 6 }} securityContext: {{- toYaml $context.podSecurityContext | nindent 8 }} containers: From fda52650ca014cfd720fd657e132507976626935 Mon Sep 17 00:00:00 2001 From: Mikhail Klimko Date: Wed, 26 Mar 2025 11:45:26 +0300 Subject: [PATCH 8/9] onprem: 2.7.4 --- codefresh/Chart.lock | 42 ++++++++++++------------- codefresh/Chart.yaml | 72 +++++++++++++++++++++---------------------- codefresh/values.yaml | 4 +-- 3 files changed, 59 insertions(+), 59 deletions(-) diff --git a/codefresh/Chart.lock b/codefresh/Chart.lock index 78a0959c8..9d32339f0 100644 --- a/codefresh/Chart.lock +++ b/codefresh/Chart.lock @@ -52,7 +52,7 @@ dependencies: version: 1.8.8 - name: tasker-kubernetes repository: oci://quay.io/codefresh/charts - version: 1.26.17 + version: 1.26.18 - name: context-manager repository: oci://quay.io/codefresh/charts version: 2.33.6 @@ -64,58 +64,58 @@ dependencies: version: 1.14.20 - name: cfapi repository: oci://quay.io/codefresh/charts - version: 21.274.10 + version: 21.274.11 - name: cfapi repository: oci://quay.io/codefresh/charts - version: 21.274.10 + version: 21.274.11 - name: cfapi repository: oci://quay.io/codefresh/charts - version: 21.274.10 + version: 21.274.11 - name: cfapi repository: oci://quay.io/codefresh/charts - version: 21.274.10 + version: 21.274.11 - name: cfapi repository: oci://quay.io/codefresh/charts - version: 21.274.10 + version: 21.274.11 - name: cfapi repository: oci://quay.io/codefresh/charts - version: 21.274.10 + version: 21.274.11 - name: cfapi repository: oci://quay.io/codefresh/charts - version: 21.274.10 + version: 21.274.11 - name: cfapi repository: oci://quay.io/codefresh/charts - version: 21.274.10 + version: 21.274.11 - name: cfapi repository: oci://quay.io/codefresh/charts - version: 21.274.10 + version: 21.274.11 - name: cfapi repository: oci://quay.io/codefresh/charts - version: 21.274.10 + version: 21.274.11 - name: cfapi repository: oci://quay.io/codefresh/charts - version: 21.274.10 + version: 21.274.11 - name: cfapi repository: oci://quay.io/codefresh/charts - version: 21.274.10 + version: 21.274.11 - name: cfapi repository: oci://quay.io/codefresh/charts - version: 21.274.10 + version: 21.274.11 - name: cfapi repository: oci://quay.io/codefresh/charts - version: 21.274.10 + version: 21.274.11 - name: cfapi repository: oci://quay.io/codefresh/charts - version: 21.274.10 + version: 21.274.11 - name: cfapi repository: oci://quay.io/codefresh/charts - version: 21.274.10 + version: 21.274.11 - name: cfapi repository: oci://quay.io/codefresh/charts - version: 21.274.10 + version: 21.274.11 - name: cfapi repository: oci://quay.io/codefresh/charts - version: 21.274.10 + version: 21.274.11 - name: cfui repository: oci://quay.io/codefresh/charts version: 14.97.50 @@ -170,5 +170,5 @@ dependencies: - name: onboarding-status repository: oci://quay.io/codefresh/charts version: 1.8.8 -digest: sha256:c3bcab5928da688346f58ad2e73f9e7fb22e9c48e83f8a585d05376953376943 -generated: "2025-03-25T16:14:59.451476+03:00" +digest: sha256:1a674a100aee5e84b21984cd9586ffe3ca48dc6951fed91023cf93bf58c67111 +generated: "2025-03-26T11:42:09.123651+03:00" diff --git a/codefresh/Chart.yaml b/codefresh/Chart.yaml index 7d2e99345..4b1515006 100644 --- a/codefresh/Chart.yaml +++ b/codefresh/Chart.yaml @@ -106,93 +106,93 @@ dependencies: condition: gitops-dashboard-manager.enabled - name: cfapi alias: cfapi - version: "21.276.4-fix-redis-feature-env-vars" - repository: oci://quay.io/codefresh/charts/dev + version: "~21.274.0" + repository: oci://quay.io/codefresh/charts condition: cfapi.enabled - name: cfapi alias: cfapi-auth - version: "21.276.4-fix-redis-feature-env-vars" - repository: oci://quay.io/codefresh/charts/dev + version: "~21.274.0" + repository: oci://quay.io/codefresh/charts condition: cfapi-auth.enabled - name: cfapi alias: cfapi-internal - version: "21.276.4-fix-redis-feature-env-vars" - repository: oci://quay.io/codefresh/charts/dev + version: "~21.274.0" + repository: oci://quay.io/codefresh/charts condition: cfapi-internal.enabled - name: cfapi alias: cfapi-ws - version: "21.276.4-fix-redis-feature-env-vars" - repository: oci://quay.io/codefresh/charts/dev + version: "~21.274.0" + repository: oci://quay.io/codefresh/charts condition: cfapi-ws.enabled - name: cfapi alias: cfapi-admin - version: "21.276.4-fix-redis-feature-env-vars" - repository: oci://quay.io/codefresh/charts/dev + version: "~21.274.0" + repository: oci://quay.io/codefresh/charts condition: cfapi-admin.enabled - name: cfapi alias: cfapi-endpoints - version: "21.276.4-fix-redis-feature-env-vars" - repository: oci://quay.io/codefresh/charts/dev + version: "~21.274.0" + repository: oci://quay.io/codefresh/charts condition: cfapi-endpoints.enabled - name: cfapi alias: cfapi-terminators - version: "21.276.4-fix-redis-feature-env-vars" - repository: oci://quay.io/codefresh/charts/dev + version: "~21.274.0" + repository: oci://quay.io/codefresh/charts condition: cfapi-terminators.enabled - name: cfapi alias: cfapi-sso-group-synchronizer - version: "21.276.4-fix-redis-feature-env-vars" - repository: oci://quay.io/codefresh/charts/dev + version: "~21.274.0" + repository: oci://quay.io/codefresh/charts condition: cfapi-sso-group-synchronizer.enabled - name: cfapi alias: cfapi-buildmanager - version: "21.276.4-fix-redis-feature-env-vars" - repository: oci://quay.io/codefresh/charts/dev + version: "~21.274.0" + repository: oci://quay.io/codefresh/charts condition: cfapi-buildmanager.enabled - name: cfapi alias: cfapi-cacheevictmanager - version: "21.276.4-fix-redis-feature-env-vars" - repository: oci://quay.io/codefresh/charts/dev + version: "~21.274.0" + repository: oci://quay.io/codefresh/charts condition: cfapi-cacheevictmanager.enabled - name: cfapi alias: cfapi-eventsmanagersubscriptions - version: "21.276.4-fix-redis-feature-env-vars" - repository: oci://quay.io/codefresh/charts/dev + version: "~21.274.0" + repository: oci://quay.io/codefresh/charts condition: cfapi-eventsmanagersubscriptions.enabled - name: cfapi alias: cfapi-kubernetesresourcemonitor - version: "21.276.4-fix-redis-feature-env-vars" - repository: oci://quay.io/codefresh/charts/dev + version: "~21.274.0" + repository: oci://quay.io/codefresh/charts condition: cfapi-kubernetesresourcemonitor.enabled - name: cfapi alias: cfapi-environments - version: "21.276.4-fix-redis-feature-env-vars" - repository: oci://quay.io/codefresh/charts/dev + version: "~21.274.0" + repository: oci://quay.io/codefresh/charts condition: cfapi-environments.enabled - name: cfapi alias: cfapi-gitops-resource-receiver - version: "21.276.4-fix-redis-feature-env-vars" - repository: oci://quay.io/codefresh/charts/dev + version: "~21.274.0" + repository: oci://quay.io/codefresh/charts condition: cfapi-gitops-resource-receiver.enabled - name: cfapi alias: cfapi-downloadlogmanager - version: "21.276.4-fix-redis-feature-env-vars" - repository: oci://quay.io/codefresh/charts/dev + version: "~21.274.0" + repository: oci://quay.io/codefresh/charts condition: cfapi-downloadlogmanager.enabled - name: cfapi alias: cfapi-teams - version: "21.276.4-fix-redis-feature-env-vars" - repository: oci://quay.io/codefresh/charts/dev + version: "~21.274.0" + repository: oci://quay.io/codefresh/charts condition: cfapi-teams.enabled - name: cfapi alias: cfapi-kubernetes-endpoints - version: "21.276.4-fix-redis-feature-env-vars" - repository: oci://quay.io/codefresh/charts/dev + version: "~21.274.0" + repository: oci://quay.io/codefresh/charts condition: cfapi-kubernetes-endpoints.enabled - name: cfapi alias: cfapi-test-reporting - version: "21.276.4-fix-redis-feature-env-vars" - repository: oci://quay.io/codefresh/charts/dev + version: "~21.274.0" + repository: oci://quay.io/codefresh/charts condition: cfapi-test-reporting.enabled - name: cfui version: "~14.97.0" diff --git a/codefresh/values.yaml b/codefresh/values.yaml index 545f01a69..6835b4177 100644 --- a/codefresh/values.yaml +++ b/codefresh/values.yaml @@ -504,9 +504,9 @@ cfapi: &cf-api # -- Image image: # -- Registry prefix - registry: us-docker.pkg.dev/codefresh-inc/gcr.io + registry: us-docker.pkg.dev/codefresh-enterprise/gcr.io # -- Repository - repository: codefresh/dev/cf-api + repository: codefresh/cf-api # -- Env vars # @default -- See below env: From 07be6787fb65e521abe0fb0aef07e5ed17a71ef9 Mon Sep 17 00:00:00 2001 From: Mikhail Klimko Date: Wed, 26 Mar 2025 11:52:17 +0300 Subject: [PATCH 9/9] onprem: 2.7.4 --- codefresh/README.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/codefresh/README.md b/codefresh/README.md index 562279f47..c942f2ae6 100644 --- a/codefresh/README.md +++ b/codefresh/README.md @@ -2139,13 +2139,13 @@ After platform upgrade, Consul fails with the error `refusing to rejoin cluster | cf-platform-analytics-etlstarter.redis.enabled | bool | `false` | Disable redis subchart | | cf-platform-analytics-etlstarter.system-etl-postgres | object | `{"container":{"env":{"BLUE_GREEN_ENABLED":true}},"controller":{"cronjob":{"ttlSecondsAfterFinished":300}},"enabled":true}` | Only postgres ETL should be running in onprem | | cf-platform-analytics-platform | object | See below | platform-analytics | -| cfapi | object | `{"affinity":{},"container":{"env":{"AUDIT_AUTO_CREATE_DB":true,"DEFAULT_SYSTEM_TYPE":"PROJECT_ONE","GITHUB_API_PATH_PREFIX":"/api/v3","LOGGER_LEVEL":"debug","OIDC_PROVIDER_PORT":"{{ .Values.global.oidcProviderPort }}","OIDC_PROVIDER_PROTOCOL":"{{ .Values.global.oidcProviderProtocol }}","OIDC_PROVIDER_TOKEN_ENDPOINT":"{{ .Values.global.oidcProviderTokenEndpoint }}","OIDC_PROVIDER_URI":"{{ .Values.global.oidcProviderService }}","ON_PREMISE":true,"RUNTIME_MONGO_DB":"codefresh","RUNTIME_REDIS_DB":0},"image":{"registry":"us-docker.pkg.dev/codefresh-inc/gcr.io","repository":"codefresh/dev/cf-api"}},"controller":{"replicas":2},"enabled":true,"hpa":{"enabled":false,"maxReplicas":10,"minReplicas":2,"targetCPUUtilizationPercentage":70},"nodeSelector":{},"pdb":{"enabled":false,"minAvailable":"50%"},"podSecurityContext":{},"resources":{"limits":{},"requests":{"cpu":"200m","memory":"256Mi"}},"secrets":{"secret":{"enabled":true,"stringData":{"OIDC_PROVIDER_CLIENT_ID":"{{ .Values.global.oidcProviderClientId }}","OIDC_PROVIDER_CLIENT_SECRET":"{{ .Values.global.oidcProviderClientSecret }}"},"type":"Opaque"}},"tolerations":[]}` | cf-api | +| cfapi | object | `{"affinity":{},"container":{"env":{"AUDIT_AUTO_CREATE_DB":true,"DEFAULT_SYSTEM_TYPE":"PROJECT_ONE","GITHUB_API_PATH_PREFIX":"/api/v3","LOGGER_LEVEL":"debug","OIDC_PROVIDER_PORT":"{{ .Values.global.oidcProviderPort }}","OIDC_PROVIDER_PROTOCOL":"{{ .Values.global.oidcProviderProtocol }}","OIDC_PROVIDER_TOKEN_ENDPOINT":"{{ .Values.global.oidcProviderTokenEndpoint }}","OIDC_PROVIDER_URI":"{{ .Values.global.oidcProviderService }}","ON_PREMISE":true,"RUNTIME_MONGO_DB":"codefresh","RUNTIME_REDIS_DB":0},"image":{"registry":"us-docker.pkg.dev/codefresh-enterprise/gcr.io","repository":"codefresh/cf-api"}},"controller":{"replicas":2},"enabled":true,"hpa":{"enabled":false,"maxReplicas":10,"minReplicas":2,"targetCPUUtilizationPercentage":70},"nodeSelector":{},"pdb":{"enabled":false,"minAvailable":"50%"},"podSecurityContext":{},"resources":{"limits":{},"requests":{"cpu":"200m","memory":"256Mi"}},"secrets":{"secret":{"enabled":true,"stringData":{"OIDC_PROVIDER_CLIENT_ID":"{{ .Values.global.oidcProviderClientId }}","OIDC_PROVIDER_CLIENT_SECRET":"{{ .Values.global.oidcProviderClientSecret }}"},"type":"Opaque"}},"tolerations":[]}` | cf-api | | cfapi-internal.<<.affinity | object | `{}` | | -| cfapi-internal.<<.container | object | `{"env":{"AUDIT_AUTO_CREATE_DB":true,"DEFAULT_SYSTEM_TYPE":"PROJECT_ONE","GITHUB_API_PATH_PREFIX":"/api/v3","LOGGER_LEVEL":"debug","OIDC_PROVIDER_PORT":"{{ .Values.global.oidcProviderPort }}","OIDC_PROVIDER_PROTOCOL":"{{ .Values.global.oidcProviderProtocol }}","OIDC_PROVIDER_TOKEN_ENDPOINT":"{{ .Values.global.oidcProviderTokenEndpoint }}","OIDC_PROVIDER_URI":"{{ .Values.global.oidcProviderService }}","ON_PREMISE":true,"RUNTIME_MONGO_DB":"codefresh","RUNTIME_REDIS_DB":0},"image":{"registry":"us-docker.pkg.dev/codefresh-inc/gcr.io","repository":"codefresh/dev/cf-api"}}` | Container configuration | +| cfapi-internal.<<.container | object | `{"env":{"AUDIT_AUTO_CREATE_DB":true,"DEFAULT_SYSTEM_TYPE":"PROJECT_ONE","GITHUB_API_PATH_PREFIX":"/api/v3","LOGGER_LEVEL":"debug","OIDC_PROVIDER_PORT":"{{ .Values.global.oidcProviderPort }}","OIDC_PROVIDER_PROTOCOL":"{{ .Values.global.oidcProviderProtocol }}","OIDC_PROVIDER_TOKEN_ENDPOINT":"{{ .Values.global.oidcProviderTokenEndpoint }}","OIDC_PROVIDER_URI":"{{ .Values.global.oidcProviderService }}","ON_PREMISE":true,"RUNTIME_MONGO_DB":"codefresh","RUNTIME_REDIS_DB":0},"image":{"registry":"us-docker.pkg.dev/codefresh-enterprise/gcr.io","repository":"codefresh/cf-api"}}` | Container configuration | | cfapi-internal.<<.container.env | object | See below | Env vars | -| cfapi-internal.<<.container.image | object | `{"registry":"us-docker.pkg.dev/codefresh-inc/gcr.io","repository":"codefresh/dev/cf-api"}` | Image | -| cfapi-internal.<<.container.image.registry | string | `"us-docker.pkg.dev/codefresh-inc/gcr.io"` | Registry prefix | -| cfapi-internal.<<.container.image.repository | string | `"codefresh/dev/cf-api"` | Repository | +| cfapi-internal.<<.container.image | object | `{"registry":"us-docker.pkg.dev/codefresh-enterprise/gcr.io","repository":"codefresh/cf-api"}` | Image | +| cfapi-internal.<<.container.image.registry | string | `"us-docker.pkg.dev/codefresh-enterprise/gcr.io"` | Registry prefix | +| cfapi-internal.<<.container.image.repository | string | `"codefresh/cf-api"` | Repository | | cfapi-internal.<<.controller | object | `{"replicas":2}` | Controller configuration | | cfapi-internal.<<.controller.replicas | int | `2` | Replicas number | | cfapi-internal.<<.enabled | bool | `true` | Enable cf-api | @@ -2166,11 +2166,11 @@ After platform upgrade, Consul fails with the error `refusing to rejoin cluster | cfapi-internal.<<.secrets.secret.type | string | `"Opaque"` | | | cfapi-internal.<<.tolerations | list | `[]` | | | cfapi-internal.enabled | bool | `false` | | -| cfapi.container | object | `{"env":{"AUDIT_AUTO_CREATE_DB":true,"DEFAULT_SYSTEM_TYPE":"PROJECT_ONE","GITHUB_API_PATH_PREFIX":"/api/v3","LOGGER_LEVEL":"debug","OIDC_PROVIDER_PORT":"{{ .Values.global.oidcProviderPort }}","OIDC_PROVIDER_PROTOCOL":"{{ .Values.global.oidcProviderProtocol }}","OIDC_PROVIDER_TOKEN_ENDPOINT":"{{ .Values.global.oidcProviderTokenEndpoint }}","OIDC_PROVIDER_URI":"{{ .Values.global.oidcProviderService }}","ON_PREMISE":true,"RUNTIME_MONGO_DB":"codefresh","RUNTIME_REDIS_DB":0},"image":{"registry":"us-docker.pkg.dev/codefresh-inc/gcr.io","repository":"codefresh/dev/cf-api"}}` | Container configuration | +| cfapi.container | object | `{"env":{"AUDIT_AUTO_CREATE_DB":true,"DEFAULT_SYSTEM_TYPE":"PROJECT_ONE","GITHUB_API_PATH_PREFIX":"/api/v3","LOGGER_LEVEL":"debug","OIDC_PROVIDER_PORT":"{{ .Values.global.oidcProviderPort }}","OIDC_PROVIDER_PROTOCOL":"{{ .Values.global.oidcProviderProtocol }}","OIDC_PROVIDER_TOKEN_ENDPOINT":"{{ .Values.global.oidcProviderTokenEndpoint }}","OIDC_PROVIDER_URI":"{{ .Values.global.oidcProviderService }}","ON_PREMISE":true,"RUNTIME_MONGO_DB":"codefresh","RUNTIME_REDIS_DB":0},"image":{"registry":"us-docker.pkg.dev/codefresh-enterprise/gcr.io","repository":"codefresh/cf-api"}}` | Container configuration | | cfapi.container.env | object | See below | Env vars | -| cfapi.container.image | object | `{"registry":"us-docker.pkg.dev/codefresh-inc/gcr.io","repository":"codefresh/dev/cf-api"}` | Image | -| cfapi.container.image.registry | string | `"us-docker.pkg.dev/codefresh-inc/gcr.io"` | Registry prefix | -| cfapi.container.image.repository | string | `"codefresh/dev/cf-api"` | Repository | +| cfapi.container.image | object | `{"registry":"us-docker.pkg.dev/codefresh-enterprise/gcr.io","repository":"codefresh/cf-api"}` | Image | +| cfapi.container.image.registry | string | `"us-docker.pkg.dev/codefresh-enterprise/gcr.io"` | Registry prefix | +| cfapi.container.image.repository | string | `"codefresh/cf-api"` | Repository | | cfapi.controller | object | `{"replicas":2}` | Controller configuration | | cfapi.controller.replicas | int | `2` | Replicas number | | cfapi.enabled | bool | `true` | Enable cf-api |