From 4ba82ff05a54bb855c80ac75934ea646959371a5 Mon Sep 17 00:00:00 2001 From: Mikhail Klimko Date: Wed, 4 Dec 2024 12:08:42 +0300 Subject: [PATCH 1/3] onprem: 2.6.1 --- codefresh/Chart.lock | 4 +- codefresh/Chart.yaml | 52 +- codefresh/README.md | 57 ++- codefresh/README.md.gotmpl | 56 +++ codefresh/files/indexes/2.6/agenttasks.json | 29 ++ .../files/indexes/2.6/workflowprocesses.json | 460 ++++++++++++++++++ codefresh/values.yaml | 2 +- 7 files changed, 631 insertions(+), 29 deletions(-) create mode 100644 codefresh/files/indexes/2.6/agenttasks.json create mode 100644 codefresh/files/indexes/2.6/workflowprocesses.json diff --git a/codefresh/Chart.lock b/codefresh/Chart.lock index 59c7269fa..52c165096 100644 --- a/codefresh/Chart.lock +++ b/codefresh/Chart.lock @@ -155,5 +155,5 @@ dependencies: - name: cf-oidc-provider repository: oci://quay.io/codefresh/charts version: 0.0.15 -digest: sha256:6dfa88dd2f583c13454e0e6d7c4a83ebeadd846f9f18a7ce99e8d6685ecfb1c6 -generated: "2024-12-03T16:51:41.402147+03:00" +digest: sha256:b2c2471f1c519f8b06daf9872eb9b64d8a8d61166b0f8a728b032f7cae208a4a +generated: "2024-12-04T11:41:36.404834+03:00" diff --git a/codefresh/Chart.yaml b/codefresh/Chart.yaml index 887a6eec8..0ce8f04a4 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.6.0 +version: 2.6.1 keywords: - codefresh home: https://codefresh.io/ @@ -15,11 +15,13 @@ appVersion: 2.6.0 annotations: artifacthub.io/prerelease: "true" artifacthub.io/alternativeName: "codefresh-onprem" - # artifacthub.io/containsSecurityUpdates: "true" + artifacthub.io/containsSecurityUpdates: "true" # supported kinds are added, changed, deprecated, removed, fixed and security. artifacthub.io/changes: | + - kind: security + description: "Misc security updates" - kind: changed - description: "Initial onprem 2.6 release" + description: "Upate Readme.md in images digests and auto-index creation" dependencies: - name: cf-common repository: oci://quay.io/codefresh/charts @@ -93,11 +95,11 @@ dependencies: repository: oci://quay.io/codefresh/charts condition: tasker-kubernetes.enabled - name: context-manager - version: "*" + version: "~2.31.0" repository: oci://quay.io/codefresh/charts condition: context-manager.enabled - name: pipeline-manager - version: "*" + version: "~3.137.0" repository: oci://quay.io/codefresh/charts condition: pipeline-manager.enabled - name: gitops-dashboard-manager @@ -106,96 +108,96 @@ dependencies: condition: gitops-dashboard-manager.enabled - name: cfapi alias: cfapi - version: "*" + version: "~21.268.0" repository: oci://quay.io/codefresh/charts condition: cfapi.enabled - name: cfapi alias: cfapi-auth - version: "*" + version: "~21.268.0" repository: oci://quay.io/codefresh/charts condition: cfapi-auth.enabled - name: cfapi alias: cfapi-internal - version: "*" + version: "~21.268.0" repository: oci://quay.io/codefresh/charts condition: cfapi-internal.enabled - name: cfapi alias: cfapi-ws - version: "*" + version: "~21.268.0" repository: oci://quay.io/codefresh/charts condition: cfapi-ws.enabled - name: cfapi alias: cfapi-admin - version: "*" + version: "~21.268.0" repository: oci://quay.io/codefresh/charts condition: cfapi-admin.enabled - name: cfapi alias: cfapi-endpoints - version: "*" + version: "~21.268.0" repository: oci://quay.io/codefresh/charts condition: cfapi-endpoints.enabled - name: cfapi alias: cfapi-terminators - version: "*" + version: "~21.268.0" repository: oci://quay.io/codefresh/charts condition: cfapi-terminators.enabled - name: cfapi alias: cfapi-sso-group-synchronizer - version: "*" + version: "~21.268.0" repository: oci://quay.io/codefresh/charts condition: cfapi-sso-group-synchronizer.enabled - name: cfapi alias: cfapi-buildmanager - version: "*" + version: "~21.268.0" repository: oci://quay.io/codefresh/charts condition: cfapi-buildmanager.enabled - name: cfapi alias: cfapi-cacheevictmanager - version: "*" + version: "~21.268.0" repository: oci://quay.io/codefresh/charts condition: cfapi-cacheevictmanager.enabled - name: cfapi alias: cfapi-eventsmanagersubscriptions - version: "*" + version: "~21.268.0" repository: oci://quay.io/codefresh/charts condition: cfapi-eventsmanagersubscriptions.enabled - name: cfapi alias: cfapi-kubernetesresourcemonitor - version: "*" + version: "~21.268.0" repository: oci://quay.io/codefresh/charts condition: cfapi-kubernetesresourcemonitor.enabled - name: cfapi alias: cfapi-environments - version: "*" + version: "~21.268.0" repository: oci://quay.io/codefresh/charts condition: cfapi-environments.enabled - name: cfapi alias: cfapi-gitops-resource-receiver - version: "*" + version: "~21.268.0" repository: oci://quay.io/codefresh/charts condition: cfapi-gitops-resource-receiver.enabled - name: cfapi alias: cfapi-downloadlogmanager - version: "*" + version: "~21.268.0" repository: oci://quay.io/codefresh/charts condition: cfapi-downloadlogmanager.enabled - name: cfapi alias: cfapi-teams - version: "*" + version: "~21.268.0" repository: oci://quay.io/codefresh/charts condition: cfapi-teams.enabled - name: cfapi alias: cfapi-kubernetes-endpoints - version: "*" + version: "~21.268.0" repository: oci://quay.io/codefresh/charts condition: cfapi-kubernetes-endpoints.enabled - name: cfapi alias: cfapi-test-reporting - version: "*" + version: "~21.268.0" repository: oci://quay.io/codefresh/charts condition: cfapi-test-reporting.enabled - name: cfui - version: "*" + version: "~14.96.0" repository: oci://quay.io/codefresh/charts condition: cfui.enabled - name: k8s-monitor @@ -203,7 +205,7 @@ dependencies: repository: oci://quay.io/codefresh/charts condition: k8s-monitor.enabled - name: runtime-environment-manager - version: "*" + version: "~3.38.0" repository: oci://quay.io/codefresh/charts condition: runtime-environment-manager.enabled - name: cf-broadcaster diff --git a/codefresh/README.md b/codefresh/README.md index 0b0f59f6a..620b4290f 100644 --- a/codefresh/README.md +++ b/codefresh/README.md @@ -1,6 +1,6 @@ ## Codefresh On-Premises -![Version: 2.6.0](https://img.shields.io/badge/Version-2.6.0-informational?style=flat-square) ![AppVersion: 2.6.0](https://img.shields.io/badge/AppVersion-2.6.0-informational?style=flat-square) +![Version: 2.6.1](https://img.shields.io/badge/Version-2.6.1-informational?style=flat-square) ![AppVersion: 2.6.0](https://img.shields.io/badge/AppVersion-2.6.0-informational?style=flat-square) Helm chart for deploying [Codefresh On-Premises](https://codefresh.io/docs/docs/getting-started/intro-to-codefresh/) to Kubernetes. @@ -1928,6 +1928,61 @@ cfapi: ### [What's new in 2.6.x](https://codefresh.io/docs/docs/whats-new/on-prem-release-notes/#on-premises-version-26) +#### Affected values + +In Codefresh On-Prem 2.6.x all Codefresh owner microservices include image digests in the default subchart values. + +For example, default values for `cfapi` might look like this: + +```yaml +container: + image: + registry: 839151377425.dkr.ecr.us-east-1.amazonaws.com/codefresh-inc + repository: codefresh/cf-api + tag: 21.268.1 + digest: "sha256:bae42f8efc18facc2bf93690fce4ab03ef9607cec4443fada48292d1be12f5f8" + pullPolicy: IfNotPresent +``` + +this resulting in the following image reference in the pod spec: + +```yaml +spec: + containers: + - name: cfapi + image: 839151377425.dkr.ecr.us-east-1.amazonaws.com/codefresh-inc/codefresh/cf-api:21.268.1@sha256:bae42f8efc18facc2bf93690fce4ab03ef9607cec4443fada48292d1be12f5f8 +``` + +Note, that when the `digest` is providerd, the `tag` is ignored! You can omit digest and use tag only like the following `values.yaml` example: + +```yaml +cfapi: + container: + image: + tag: 21.268.1 + # -- Set empty tag for digest + digest: "" +``` + +#### Auto-index creation in MongoDB + +In Codefresh On-Prem 2.6.x, the `cfapi` can create indexes in MongoDB automatically. This feature is disabled by default. To enable it, set the following environment variable: + +> **Note!** Enabling this feature can cause performance degradation during the index creation process. + +> **Note!** It is recommended to add indexes during a maintenance window. The indexes list is provided in `codefresh/files/indexes//.json` files. + +```yaml +cfapi: + container: + env: + MONGOOSE_AUTO_INDEX: "true" +``` + +Ref: +- [Create an Index in Atlas DB](https://www.mongodb.com/docs/atlas/atlas-ui/indexes/#create-an-index) +- [Create an Index with mongosh](https://www.mongodb.com/docs/manual/reference/method/db.collection.createIndex/) + ## Troubleshooting ### Error: Failed to validate connection to Docker daemon; caused by Error: certificate has expired diff --git a/codefresh/README.md.gotmpl b/codefresh/README.md.gotmpl index 335079a25..f908ef470 100644 --- a/codefresh/README.md.gotmpl +++ b/codefresh/README.md.gotmpl @@ -1936,6 +1936,62 @@ cfapi: ### [What's new in 2.6.x](https://codefresh.io/docs/docs/whats-new/on-prem-release-notes/#on-premises-version-26) +#### Affected values + +In Codefresh On-Prem 2.6.x all Codefresh owner microservices include image digests in the default subchart values. + +For example, default values for `cfapi` might look like this: + +```yaml +container: + image: + registry: 839151377425.dkr.ecr.us-east-1.amazonaws.com/codefresh-inc + repository: codefresh/cf-api + tag: 21.268.1 + digest: "sha256:bae42f8efc18facc2bf93690fce4ab03ef9607cec4443fada48292d1be12f5f8" + pullPolicy: IfNotPresent +``` + +this resulting in the following image reference in the pod spec: + +```yaml +spec: + containers: + - name: cfapi + image: 839151377425.dkr.ecr.us-east-1.amazonaws.com/codefresh-inc/codefresh/cf-api:21.268.1@sha256:bae42f8efc18facc2bf93690fce4ab03ef9607cec4443fada48292d1be12f5f8 +``` + +Note, that when the `digest` is providerd, the `tag` is ignored! You can omit digest and use tag only like the following `values.yaml` example: + +```yaml +cfapi: + container: + image: + tag: 21.268.1 + # -- Set empty tag for digest + digest: "" +``` + +#### Auto-index creation in MongoDB + +In Codefresh On-Prem 2.6.x, the `cfapi` can create indexes in MongoDB automatically. This feature is disabled by default. To enable it, set the following environment variable: + +> **Note!** Enabling this feature can cause performance degradation during the index creation process. + +> **Note!** It is recommended to add indexes during a maintenance window. The indexes list is provided in `codefresh/files/indexes//.json` files. + +```yaml +cfapi: + container: + env: + MONGOOSE_AUTO_INDEX: "true" +``` + +Ref: +- [Create an Index in Atlas DB](https://www.mongodb.com/docs/atlas/atlas-ui/indexes/#create-an-index) +- [Create an Index with mongosh](https://www.mongodb.com/docs/manual/reference/method/db.collection.createIndex/) + + ## Troubleshooting ### Error: Failed to validate connection to Docker daemon; caused by Error: certificate has expired diff --git a/codefresh/files/indexes/2.6/agenttasks.json b/codefresh/files/indexes/2.6/agenttasks.json new file mode 100644 index 000000000..8c761fcd0 --- /dev/null +++ b/codefresh/files/indexes/2.6/agenttasks.json @@ -0,0 +1,29 @@ +[ + { + "v" : 2.0, + "key" : { + "_id" : 1.0 + }, + "name" : "_id_" + }, + { + "v" : 2.0, + "key" : { + "metadata.accountId" : 1, + "metadata.reIdentifier" : 1, + "metadata.shouldExecute" : 1, + "metadata.startAt" : 1, + "metadata.status" : 1, + "metadata.expireAt" : 1 + }, + "name" : "metadata.accountId_1_metadata.reIdentifier_1_metadata.shouldExecute_1_metadata.startAt_1_metadata.status_1_metadata.expireAt_1" + }, + { + "v" : 2.0, + "key" : { + "metadata.expireAt" : 1 + }, + "name" : "metadata.expireAt_1", + "expireAfterSeconds" : 0.0 + } +] diff --git a/codefresh/files/indexes/2.6/workflowprocesses.json b/codefresh/files/indexes/2.6/workflowprocesses.json new file mode 100644 index 000000000..e2e6e65a3 --- /dev/null +++ b/codefresh/files/indexes/2.6/workflowprocesses.json @@ -0,0 +1,460 @@ +[ + { + "v" : 1.0, + "key" : { + "account" : 1.0, + "pendingLicense" : 1.0, + "created" : 1.0 + }, + "name" : "account_1_pendingLicense_1_created_1" + }, + { + "v" : 1.0, + "key" : { + "pipeline" : 1.0, + "status" : 1.0 + }, + "name" : "pipeline_1_status_1" + }, + { + "v" : 2.0, + "key" : { + "account" : 1.0, + "triggerType" : 1.0 + }, + "name" : "account_1_triggerType_1" + }, + { + "v" : 2.0, + "key" : { + "account" : 1.0, + "pipelineInfo.pipelineId" : 1.0 + }, + "name" : "account_1_pipelineInfo.pipelineId_1" + }, + { + "v" : 1.0, + "key" : { + "account" : 1.0, + "startImmediately" : 1.0, + "status" : 1.0 + }, + "name" : "account_1_startImmediately_1_status_1" + }, + { + "v" : 1.0, + "key" : { + "account" : 1.0, + "scmMetadata.repoName" : 1.0, + "scmMetadata.repoOwner" : 1.0, + "trigger" : 1.0, + "service" : 1.0 + }, + "name" : "account_1_scmMetadata.repoName_1_scmMetadata.repoOwner_1_trigger_1_service_1" + }, + { + "v" : 1.0, + "key" : { + "isPublic" : 1.0 + }, + "name" : "isPublic_1" + }, + { + "v" : 2.0, + "key" : { + "codefreshEnv" : 1, + "status" : 1, + "shouldPerformFinishSystem" : 1, + "_id" : 1 + }, + "name" : "codefreshEnv_1_status_1_shouldPerformFinishSystem_1__id_1" + }, + { + "v" : 2.0, + "key" : { + "account" : 1, + "helmInfo.boardId" : 1 + }, + "name" : "account_1_helmInfo.boardId_1" + }, + { + "v" : 2.0, + "key" : { + "account" : 1.0, + "environs" : 1.0 + }, + "name" : "account_1_environs_1" + }, + { + "v" : 1.0, + "key" : { + "account" : 1.0, + "status" : 1.0, + "trigger" : 1.0 + }, + "name" : "account_1_status_1_trigger_1" + }, + { + "v" : 2.0, + "key" : { + "account" : 1, + "pipeline" : 1, + "trigger" : 1, + "_id" : -1 + }, + "name" : "account_1_pipeline_1_trigger_1__id_-1" + }, + { + "v" : 1.0, + "key" : { + "scmMetadata.branchName" : 1.0, + "account" : 1.0, + "pipeline" : 1.0, + "created" : -1.0, + "finished" : 1.0 + }, + "name" : "scmMetadata.branchName_1_account_1_pipeline_1_created_-1_finished_1" + }, + { + "v" : 2.0, + "key" : { + "trigger" : 1.0, + "account" : 1.0, + "status" : 1.0, + "_id" : -1.0 + }, + "name" : "trigger_1_account_1_status_1__id_-1" + }, + { + "v" : 1.0, + "key" : { + "account" : 1.0, + "trigger" : 1.0, + "scmMetadata.repoName" : 1.0, + "service" : 1.0 + }, + "name" : "account_1_trigger_1_scmMetadata.repoName_1_service_1" + }, + { + "v" : 1.0, + "key" : { + "service" : 1.0, + "status" : 1.0 + }, + "name" : "service_1_status_1" + }, + { + "v" : 1.0, + "key" : { + "finished" : 1.0 + }, + "name" : "finished_1" + }, + { + "v" : 2.0, + "key" : { + "healthStatus.engine.status" : 1.0 + }, + "name" : "healthStatus.engine.status_1" + }, + { + "v" : 2.0, + "key" : { + "codefreshEnv" : 1, + "status" : 1, + "_id" : 1 + }, + "name" : "codefreshEnv_1_status_1__id_1" + }, + { + "v" : 1.0, + "key" : { + "account" : 1.0, + "service" : 1.0, + "trigger" : 1.0 + }, + "name" : "account_1_service_1_trigger_1" + }, + { + "v" : 1.0, + "key" : { + "scmMetadata.branchName" : 1.0, + "service" : 1.0, + "status" : 1.0, + "created" : -1.0 + }, + "name" : "scmMetadata.branchName_1_service_1_status_1_created_-1" + }, + { + "v" : 1.0, + "key" : { + "status" : 1.0, + "trigger" : 1.0 + }, + "name" : "status_1_trigger_1" + }, + { + "v" : 2.0, + "key" : { + "pipeline" : 1.0, + "finished" : -1.0 + }, + "name" : "pipeline_1_finished_-1" + }, + { + "v" : 1.0, + "key" : { + "progress" : 1.0 + }, + "name" : "progress_1" + }, + { + "v" : 2.0, + "key" : { + "account" : 1.0, + "environ" : 1.0 + }, + "name" : "account_1_environ_1" + }, + { + "v" : 2.0, + "key" : { + "status" : 1, + "created" : -1 + }, + "name" : "status_1_created_-1" + }, + { + "v" : 2.0, + "key" : { + "createdAt" : 1.0 + }, + "name" : "createdAt_1" + }, + { + "v" : 1.0, + "key" : { + "request" : 1.0 + }, + "name" : "request_1" + }, + { + "v" : 2.0, + "key" : { + "account" : 1, + "_id" : 1, + "scmMetadata.repoName" : 1 + }, + "name" : "account_1__id_1_scmMetadata.repoName_1" + }, + { + "v" : 2.0, + "key" : { + "pipeline" : 1, + "created" : -1 + }, + "name" : "pipeline_1_created_-1" + }, + { + "v" : 2.0, + "key" : { + "account" : 1, + "status" : 1, + "created" : 1 + }, + "name" : "account_1_status_1_created_1" + }, + { + "v" : 2.0, + "key" : { + "status" : 1, + "runtimeEnvironmentMetadata.agent" : 1, + "created" : 1 + }, + "name" : "status_1_runtimeEnvironmentMetadata.agent_1_created_1" + }, + { + "v" : 2.0, + "key" : { + "created" : 1 + }, + "name" : "created_1", + "expireAfterSeconds" : 31536000.0 + }, + { + "v" : 2.0, + "key" : { + "account" : 1, + "status" : 1, + "trigger" : 1, + "pipeline" : 1, + "keepPVCsForPendingApproval" : 1 + }, + "name" : "account_1_status_1_trigger_1_pipeline_1_keepPVCsForPendingApproval_1", + "partialFilterExpression" : { + "status" : { + "$in" : [ + "pending", + "delayed", + "elected", + "running", + "terminating", + "pending-approval" + ] + } + } + }, + { + "v" : 2.0, + "key" : { + "_id" : 1.0 + }, + "name" : "_id_" + }, + { + "v" : 2.0, + "key" : { + "account" : 1, + "scmMetadata.revision" : 1, + "_id" : -1, + "pipeline" : 1 + }, + "name" : "account_1_scmMetadata.revision_1__id_-1_pipeline_1", + "partialFilterExpression" : { + "scmMetadata.revision" : { + "$exists" : true + } + } + }, + { + "v" : 2.0, + "key" : { + "account" : 1, + "trigger" : 1, + "scmMetadata.userName" : 1, + "_id" : -1, + "pipeline" : 1 + }, + "name" : "account_1_trigger_1_scmMetadata.userName_1__id_-1_pipeline_1", + "partialFilterExpression" : { + "scmMetadata.userName" : { + "$exists" : true + } + } + }, + { + "v" : 2.0, + "key" : { + "account" : 1, + "trigger" : 1, + "annotations.key" : 1, + "annotations.value" : 1, + "_id" : -1, + "pipeline" : 1 + }, + "name" : "account_1_trigger_1_annotations.key_1_annotations.value_1__id_-1_pipeline_1", + "sparse" : true + }, + { + "v" : 2.0, + "key" : { + "account" : 1, + "trigger" : 1, + "pipelineTrigger" : 1, + "_id" : -1, + "pipeline" : 1 + }, + "name" : "account_1_trigger_1_pipelineTrigger_1__id_-1_pipeline_1", + "partialFilterExpression" : { + "pipelineTrigger" : { + "$exists" : true + } + } + }, + { + "v" : 2.0, + "key" : { + "account" : 1, + "trigger" : 1, + "scmMetadata.branchName" : 1, + "_id" : -1, + "pipeline" : 1 + }, + "name" : "account_1_trigger_1_scmMetadata.branchName_1__id_-1_pipeline_1", + "partialFilterExpression" : { + "scmMetadata.branchName" : { + "$exists" : true + } + } + }, + { + "v" : 2.0, + "key" : { + "account" : 1, + "trigger" : 1, + "_id" : -1, + "pipeline" : 1 + }, + "name" : "account_1_trigger_1__id_-1_pipeline_1" + }, + { + "v" : 2.0, + "key" : { + "account" : 1, + "trigger" : 1, + "scmMetadata.provider" : 1, + "_id" : -1, + "pipeline" : 1 + }, + "name" : "account_1_trigger_1_scmMetadata.provider_1__id_-1_pipeline_1", + "partialFilterExpression" : { + "scmMetadata.provider" : { + "$exists" : true + } + } + }, + { + "v" : 2.0, + "key" : { + "account" : 1, + "trigger" : 1, + "scmMetadata.repoName" : 1, + "_id" : -1, + "pipeline" : 1 + }, + "name" : "account_1_trigger_1_scmMetadata.repoName_1__id_-1_pipeline_1", + "partialFilterExpression" : { + "scmMetadata.repoName" : { + "$exists" : true + } + } + }, + { + "v" : 2.0, + "key" : { + "account" : 1, + "trigger" : 1, + "scmMetadata.provider" : 1, + "scmMetadata.event" : 1, + "_id" : -1, + "pipeline" : 1 + }, + "name" : "account_1_trigger_1_scmMetadata.provider_1_scmMetadata.event_1__id_-1_pipeline_1", + "partialFilterExpression" : { + "scmMetadata.event" : { + "$exists" : true + }, + "scmMetadata.provider" : { + "$exists" : true + } + } + }, + { + "v" : 2.0, + "key" : { + "pipeline" : 1, + "_id" : -1 + }, + "name" : "pipeline_1__id_-1" + } +] diff --git a/codefresh/values.yaml b/codefresh/values.yaml index 1c3ca5f26..ab013ee11 100644 --- a/codefresh/values.yaml +++ b/codefresh/values.yaml @@ -925,7 +925,7 @@ helm-repo-manager: enabled: false image: repository: quay.io/codefresh/chartmuseum - tag: a02769a5 + tag: 8795e993 resources: requests: cpu: 100m From e275f5047b73a78a965710c8155890693d146470 Mon Sep 17 00:00:00 2001 From: Mikhail Klimko Date: Wed, 4 Dec 2024 12:20:29 +0300 Subject: [PATCH 2/3] onprem: 2.6.1 --- codefresh/README.md | 2 +- codefresh/README.md.gotmpl | 2 +- codefresh/values.yaml | 10 +++++----- scripts/update_re_images.sh | 2 ++ 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/codefresh/README.md b/codefresh/README.md index 620b4290f..416e719a8 100644 --- a/codefresh/README.md +++ b/codefresh/README.md @@ -1953,7 +1953,7 @@ spec: image: 839151377425.dkr.ecr.us-east-1.amazonaws.com/codefresh-inc/codefresh/cf-api:21.268.1@sha256:bae42f8efc18facc2bf93690fce4ab03ef9607cec4443fada48292d1be12f5f8 ``` -Note, that when the `digest` is providerd, the `tag` is ignored! You can omit digest and use tag only like the following `values.yaml` example: +> **Note!** When the `digest` is providerd, the `tag` is ignored! You can omit digest and use tag only like the following `values.yaml` example: ```yaml cfapi: diff --git a/codefresh/README.md.gotmpl b/codefresh/README.md.gotmpl index f908ef470..981e44588 100644 --- a/codefresh/README.md.gotmpl +++ b/codefresh/README.md.gotmpl @@ -1961,7 +1961,7 @@ spec: image: 839151377425.dkr.ecr.us-east-1.amazonaws.com/codefresh-inc/codefresh/cf-api:21.268.1@sha256:bae42f8efc18facc2bf93690fce4ab03ef9607cec4443fada48292d1be12f5f8 ``` -Note, that when the `digest` is providerd, the `tag` is ignored! You can omit digest and use tag only like the following `values.yaml` example: +> **Note!** When the `digest` is providerd, the `tag` is ignored! You can omit digest and use tag only like the following `values.yaml` example: ```yaml cfapi: diff --git a/codefresh/values.yaml b/codefresh/values.yaml index ab013ee11..ee86ea9b5 100644 --- a/codefresh/values.yaml +++ b/codefresh/values.yaml @@ -455,17 +455,17 @@ postgresqlCleanJob: # @default -- See below runtimeImages: COMPOSE_IMAGE: quay.io/codefresh/compose:v2.28.1-1.5.0 - CONTAINER_LOGGER_IMAGE: us-docker.pkg.dev/codefresh-inc/public-gcr-io/codefresh/cf-container-logger:1.11.7 - DIND_IMAGE: us-docker.pkg.dev/codefresh-inc/public-gcr-io/codefresh/dind:26.1.4-1.28.8 + CONTAINER_LOGGER_IMAGE: quay.io/codefresh/cf-container-logger:1.11.8 + DIND_IMAGE: quay.io/codefresh/dind:26.1.4-1.28.8 DOCKER_BUILDER_IMAGE: quay.io/codefresh/cf-docker-builder:1.3.17 DOCKER_PULLER_IMAGE: quay.io/codefresh/cf-docker-puller:8.0.18 - DOCKER_PUSHER_IMAGE: us-docker.pkg.dev/codefresh-inc/public-gcr-io/codefresh/cf-docker-pusher:6.0.16 + DOCKER_PUSHER_IMAGE: quay.io/codefresh/cf-docker-pusher:6.0.16 DOCKER_TAG_PUSHER_IMAGE: quay.io/codefresh/cf-docker-tag-pusher:1.3.15 - ENGINE_IMAGE: us-docker.pkg.dev/codefresh-inc/public-gcr-io/codefresh/engine:1.174.19 + ENGINE_IMAGE: quay.io/codefresh/engine:1.175.2 FS_OPS_IMAGE: quay.io/codefresh/fs-ops:1.2.7 GIT_CLONE_IMAGE: quay.io/codefresh/cf-git-cloner:10.2.0 KUBE_DEPLOY: quay.io/codefresh/cf-deploy-kubernetes:16.2.6 - PIPELINE_DEBUGGER_IMAGE: quay.io/codefresh/cf-debugger:1.3.6 + PIPELINE_DEBUGGER_IMAGE: quay.io/codefresh/cf-debugger:1.3.7 TEMPLATE_ENGINE: quay.io/codefresh/pikolo:0.14.1 CR_6177_FIXER: docker.io/library/alpine:3.20 GC_BUILDER_IMAGE: docker.io/library/alpine:3.20 diff --git a/scripts/update_re_images.sh b/scripts/update_re_images.sh index dfed0a8db..b87405f9d 100755 --- a/scripts/update_re_images.sh +++ b/scripts/update_re_images.sh @@ -58,5 +58,7 @@ done sed -i 's|us-docker.pkg.dev/codefresh-inc/public-gcr-io|quay.io|' $CHARTDIR/values.yaml +sed -i 's/!!merge //g' $CHARTDIR/values.yaml + msg "The list of updated runtime images:\n" echo -e "\e[33m$(cat $CHARTDIR/values.yaml)\e[0m" From 083ab780e4c2932301f2c1d1672ff99e40f7b089 Mon Sep 17 00:00:00 2001 From: Mikhail Klimko Date: Wed, 4 Dec 2024 12:22:35 +0300 Subject: [PATCH 3/3] onprem: 2.6.1 --- codefresh/README.md | 4 ++-- codefresh/README.md.gotmpl | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/codefresh/README.md b/codefresh/README.md index 416e719a8..512747e35 100644 --- a/codefresh/README.md +++ b/codefresh/README.md @@ -1937,7 +1937,7 @@ For example, default values for `cfapi` might look like this: ```yaml container: image: - registry: 839151377425.dkr.ecr.us-east-1.amazonaws.com/codefresh-inc + registry: us-docker.pkg.dev/codefresh-enterprise/gcr.io repository: codefresh/cf-api tag: 21.268.1 digest: "sha256:bae42f8efc18facc2bf93690fce4ab03ef9607cec4443fada48292d1be12f5f8" @@ -1950,7 +1950,7 @@ this resulting in the following image reference in the pod spec: spec: containers: - name: cfapi - image: 839151377425.dkr.ecr.us-east-1.amazonaws.com/codefresh-inc/codefresh/cf-api:21.268.1@sha256:bae42f8efc18facc2bf93690fce4ab03ef9607cec4443fada48292d1be12f5f8 + image: us-docker.pkg.dev/codefresh-enterprise/gcr.io/codefresh/cf-api:21.268.1@sha256:bae42f8efc18facc2bf93690fce4ab03ef9607cec4443fada48292d1be12f5f8 ``` > **Note!** When the `digest` is providerd, the `tag` is ignored! You can omit digest and use tag only like the following `values.yaml` example: diff --git a/codefresh/README.md.gotmpl b/codefresh/README.md.gotmpl index 981e44588..db4f04f93 100644 --- a/codefresh/README.md.gotmpl +++ b/codefresh/README.md.gotmpl @@ -1945,7 +1945,7 @@ For example, default values for `cfapi` might look like this: ```yaml container: image: - registry: 839151377425.dkr.ecr.us-east-1.amazonaws.com/codefresh-inc + registry: us-docker.pkg.dev/codefresh-enterprise/gcr.io repository: codefresh/cf-api tag: 21.268.1 digest: "sha256:bae42f8efc18facc2bf93690fce4ab03ef9607cec4443fada48292d1be12f5f8" @@ -1958,7 +1958,7 @@ this resulting in the following image reference in the pod spec: spec: containers: - name: cfapi - image: 839151377425.dkr.ecr.us-east-1.amazonaws.com/codefresh-inc/codefresh/cf-api:21.268.1@sha256:bae42f8efc18facc2bf93690fce4ab03ef9607cec4443fada48292d1be12f5f8 + image: us-docker.pkg.dev/codefresh-enterprise/gcr.io/codefresh/cf-api:21.268.1@sha256:bae42f8efc18facc2bf93690fce4ab03ef9607cec4443fada48292d1be12f5f8 ``` > **Note!** When the `digest` is providerd, the `tag` is ignored! You can omit digest and use tag only like the following `values.yaml` example: