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: diff --git a/codefresh/.ci/values/external-secrets.yaml b/codefresh/.ci/values/external-secrets.yaml index e146a6d1d..356912d99 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 + +postgresql: + fullnameOverride: my-postgresql + +mongodb: + fullnameOverride: my-mongodb 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 c00155686..4b1515006 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/ @@ -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 diff --git a/codefresh/README.md b/codefresh/README.md index 4aa54ac9d..c942f2ae6 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. diff --git a/codefresh/templates/seed-e2e/seed-e2e.yaml b/codefresh/templates/seed-e2e/seed-e2e.yaml index 5e8932c6e..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: @@ -38,6 +35,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: