onprem: 2.4.0-rc.4 (#1311)

Author: mikhail-klimko

codefresh/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v2
 description: Helm Chart for Codefresh On-Prem
 name: codefresh
-version: 2.4.0-rc.3
+version: 2.4.0-rc.4
 keywords:
   - codefresh
 home: https://codefresh.io/
@@ -17,8 +17,8 @@ annotations:
   artifacthub.io/alternativeName: "codefresh-onprem"
   # artifacthub.io/containsSecurityUpdates: "true"
   artifacthub.io/changes: |
-    - kind: added
-      description: Update docs for 2.4.x upgrade
+    - kind: changed
+      description: Update runtime images
 dependencies:
   - name: cf-common
     repository: oci://quay.io/codefresh/charts

codefresh/README.md

@@ -1,6 +1,6 @@
 ## Codefresh On-Premises
 
-![Version: 2.4.0-rc.3](https://img.shields.io/badge/Version-2.4.0--rc.3-informational?style=flat-square) ![AppVersion: 2.4.0](https://img.shields.io/badge/AppVersion-2.4.0-informational?style=flat-square)
+![Version: 2.4.0-rc.4](https://img.shields.io/badge/Version-2.4.0--rc.4-informational?style=flat-square) ![AppVersion: 2.4.0](https://img.shields.io/badge/AppVersion-2.4.0-informational?style=flat-square)
 
 Helm chart for deploying [Codefresh On-Premises](https://codefresh.io/docs/docs/getting-started/intro-to-codefresh/) to Kubernetes.
 

codefresh/values.yaml

@@ -456,12 +456,12 @@ postgresqlCleanJob:
 runtimeImages:
   COMPOSE_IMAGE: quay.io/codefresh/compose:v2.20.3-1.4.0
   CONTAINER_LOGGER_IMAGE: quay.io/codefresh/cf-container-logger:1.11.4
-  DIND_IMAGE: quay.io/codefresh/dind:25.0.4-1.28.5
+  DIND_IMAGE: quay.io/codefresh/dind:26.0.0-1.28.6
   DOCKER_BUILDER_IMAGE: quay.io/codefresh/cf-docker-builder:1.3.11
-  DOCKER_PULLER_IMAGE: quay.io/codefresh/cf-docker-puller:8.0.14
+  DOCKER_PULLER_IMAGE: quay.io/codefresh/cf-docker-puller:8.0.17
   DOCKER_PUSHER_IMAGE: quay.io/codefresh/cf-docker-pusher:6.0.13
   DOCKER_TAG_PUSHER_IMAGE: quay.io/codefresh/cf-docker-tag-pusher:1.3.11
-  ENGINE_IMAGE: quay.io/codefresh/engine:1.169.9
+  ENGINE_IMAGE: quay.io/codefresh/engine:1.171.3
   FS_OPS_IMAGE: quay.io/codefresh/fs-ops:1.2.7
   GIT_CLONE_IMAGE: quay.io/codefresh/cf-git-cloner:10.1.27
   KUBE_DEPLOY: quay.io/codefresh/cf-deploy-kubernetes:16.2.6
@@ -542,70 +542,70 @@ cfapi: &cf-api
 # cfapi roles
 # @ignored internal
 cfapi-auth:
-  <<: *cf-api
+  !!merge <<: *cf-api
   enabled: false
 cfapi-internal:
-  <<: *cf-api
+  !!merge <<: *cf-api
   enabled: false
 # @ignored ws
 cfapi-ws:
-  <<: *cf-api
+  !!merge <<: *cf-api
   enabled: false
 # @ignored admin
 cfapi-admin:
-  <<: *cf-api
+  !!merge <<: *cf-api
   enabled: false
 # @ignored endpoints
 cfapi-endpoints:
-  <<: *cf-api
+  !!merge <<: *cf-api
   enabled: false
 # @ignored terminators
 cfapi-terminators:
-  <<: *cf-api
+  !!merge <<: *cf-api
   enabled: false
 # @ignored sso-group-synchronizer
 cfapi-sso-group-synchronizer:
-  <<: *cf-api
+  !!merge <<: *cf-api
   enabled: false
 # @ignored buildmanager
 cfapi-buildmanager:
-  <<: *cf-api
+  !!merge <<: *cf-api
   enabled: false
 # @ignored cacheevictmanager
 cfapi-cacheevictmanager:
-  <<: *cf-api
+  !!merge <<: *cf-api
   enabled: false
 # @ignored eventsmanagersubscriptions
 cfapi-eventsmanagersubscriptions:
-  <<: *cf-api
+  !!merge <<: *cf-api
   enabled: false
 # @ignored kubernetesresourcemonitor
 cfapi-kubernetesresourcemonitor:
-  <<: *cf-api
+  !!merge <<: *cf-api
   enabled: false
 # @ignored environments
 cfapi-environments:
-  <<: *cf-api
+  !!merge <<: *cf-api
   enabled: false
 # @ignored gitops-resource-receiver
 cfapi-gitops-resource-receiver:
-  <<: *cf-api
+  !!merge <<: *cf-api
   enabled: false
 # @ignored downloadlogmanager
 cfapi-downloadlogmanager:
-  <<: *cf-api
+  !!merge <<: *cf-api
   enabled: false
 # @ignored teams
 cfapi-teams:
-  <<: *cf-api
+  !!merge <<: *cf-api
   enabled: false
 # @ignored kubernetes-endpoints
 cfapi-kubernetes-endpoints:
-  <<: *cf-api
+  !!merge <<: *cf-api
   enabled: false
 # @ignored test-reporting
 cfapi-test-reporting:
-  <<: *cf-api
+  !!merge <<: *cf-api
   enabled: false
 
 # -- internal-gateway

scripts/update_re_images.sh

@@ -56,5 +56,7 @@ for k in ${RUNTIME_IMAGES[@]}; do
    fi
 done
 
+sed -i 's|us-docker.pkg.dev/codefresh-inc/public-gcr-io|quay.io|' $CHARTDIR/values.yaml
+
 msg "The list of updated runtime images:\n"
-echo -e "\e[33m$(cat $CHARTDIR/values.yaml)\e[0m"
+echo -e "\e[33m$(cat $CHARTDIR/values.yaml)\e[0m"