diff --git a/charts/gitops-runtime/Chart.yaml b/charts/gitops-runtime/Chart.yaml index 9e6afa660..1a6f23da5 100644 --- a/charts/gitops-runtime/Chart.yaml +++ b/charts/gitops-runtime/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: 0.1.72 description: A Helm chart for Codefresh gitops runtime name: gitops-runtime -version: 0.0.0 +version: 0.32.2 home: https://github.com/codefresh-io/gitops-runtime-helm icon: https://avatars1.githubusercontent.com/u/11412079?v=3 keywords: @@ -13,27 +13,31 @@ maintainers: url: https://codefresh-io.github.io/ annotations: artifacthub.io/alternativeName: "codefresh-gitops-runtime" + artifacthub.io/changes: |- + - kind: changed + description: 'Release 0.32.0' + links: + - name: 'Release notes' + url: 'https://github.com/codefresh-io/gitops-runtime-helm/releases/tag/0.32.0' dependencies: - # The image for this chart was overridden because argocd doesn’t release the chart for 3.3.10 version. - # Don't forget to remove the image override after updating to a new version of the chart. - name: argo-cd repository: https://argoproj.github.io/argo-helm condition: argo-cd.enabled - version: 10.2.2 + version: 10.17.2 - name: argo-workflows repository: https://codefresh-io.github.io/argo-helm - version: 0.45.27-v3.6.7-cap-CFS-16765 + version: 0.45.28-v3.6.7-cap-CF-2552-security condition: argo-workflows.enabled - name: sealed-secrets repository: https://bitnami.github.io/sealed-secrets - version: 2.18.0 + version: 2.18.6 condition: sealed-secrets.enabled - name: codefresh-tunnel-client repository: oci://quay.io/codefresh/charts - version: 0.1.26 + version: 0.1.27 alias: tunnel-client condition: tunnel-client.enabled - name: redis-ha - version: 4.33.4 + version: 4.39.0 repository: https://dandydeveloper.github.io/charts/ condition: redis-ha.enabled diff --git a/charts/gitops-runtime/README.md b/charts/gitops-runtime/README.md index 8d20b187b..0f0756494 100644 --- a/charts/gitops-runtime/README.md +++ b/charts/gitops-runtime/README.md @@ -1,5 +1,5 @@ ## Codefresh gitops runtime -![Version: 0.0.0](https://img.shields.io/badge/Version-0.0.0-informational?style=flat-square) ![AppVersion: 0.1.72](https://img.shields.io/badge/AppVersion-0.1.72-informational?style=flat-square) +![Version: 0.32.2](https://img.shields.io/badge/Version-0.32.2-informational?style=flat-square) ![AppVersion: 0.1.72](https://img.shields.io/badge/AppVersion-0.1.72-informational?style=flat-square) ## Table of Content @@ -16,6 +16,7 @@ - [Upgrading](#upgrading) - [To 0.23.x](#to-023x) - [> 0.24.x](#-024x) + - [To 0.32.x](#to-032x) ## Prerequisites @@ -60,6 +61,7 @@ argo-workflows: enabled: false tunnel-client: enabled: false +# gitops-operator is disabled by default (End-of-Life). gitops-operator: crds: install: false @@ -76,6 +78,7 @@ argo-cd: argo-workflows: crds: install: true +# gitops-operator is disabled by default (End-of-Life). gitops-operator: crds: install: true @@ -187,6 +190,8 @@ data: | GitOps Runtime version | Supported ArgoCD versions | |------------------------|---------------------------| +| 0.32.x | >=3.4 <=3.6 | +| 0.31.x | >=3.3 <=3.5 | | 0.30.x | >=3.2 <=3.4 | | 0.29.x | >=3.1 <=3.3 | | 0.28.x | >=3.0 <=3.2 | @@ -206,7 +211,7 @@ We have created a helper utility to resolve this issue: The utility is packaged in a container image. Below are instructions on executing the utility using Docker: ``` -docker run -v :/output quay.io/codefresh/gitops-runtime-private-registry-utils:0.0.0 +docker run -v :/output quay.io/codefresh/gitops-runtime-private-registry-utils:0.32.2 ``` `output_dir` - is a local directory where the utility will output files.
`local_registry` - is your local registry where you want to mirror the images to @@ -219,7 +224,7 @@ The utility will output 4 files into the folder: For usage with external ArgoCD run the utility with `EXTERNAL_ARGOCD` environment variable set to `true`. ``` -docker run -e EXTERNAL_ARGOCD=true -v :/output quay.io/codefresh/gitops-runtime-private-registry-utils:0.0.0 +docker run -e EXTERNAL_ARGOCD=true -v :/output quay.io/codefresh/gitops-runtime-private-registry-utils:0.32.2 ``` ## Openshift @@ -279,6 +284,7 @@ app-proxy: matchLabels: app: cap-app-proxy +# gitops-operator is disabled by default (End-of-Life). gitops-operator: replicaCount: 2 pdb: @@ -456,6 +462,25 @@ global: ... ``` +### To 0.32.x + +#### GitOps operator is disabled by default + +The GitOps operator has reached End-of-Life and `.Values.gitops-operator.enabled` now defaults to `false`. +On upgrade, the chart removes the `gitops-operator` Deployment, ServiceAccount, RBAC, PDB, the `promotion-template` ServiceAccount/RBAC, and the operator CRDs +(`products`, `promotionflows`, `promotionpolicies`, `promotiontasks`, `promotiontemplates`, `restrictedgitsources` in the `codefresh.io` group). + +> [!WARNING] +> Deleting a CRD deletes all custom resources of that kind in the cluster. +> To keep the CRDs and their resources, set `gitops-operator.crds.keep: true` in your **currently installed** release (run `helm upgrade` with it first), and only then upgrade to 0.32.x. + +If you still rely on the GitOps operator(you use restricted-git-sources with your runtime), enable it explicitly when upgrading: + +```yaml +gitops-operator: + enabled: true +``` + ## Values | Key | Type | Default | Description | @@ -507,13 +532,13 @@ global: | app-proxy.extraVolumeMounts | list | `[]` | Extra volume mounts for main container | | app-proxy.extraVolumes | list | `[]` | extra volumes | | app-proxy.fullnameOverride | string | `"cap-app-proxy"` | | -| app-proxy.image-enrichment | object | `{"config":{"clientHeartbeatIntervalInSeconds":5,"concurrencyCmKey":"imageReportExecutor","concurrencyCmName":"workflow-synchronization-semaphores","images":{"gitEnrichment":{"registry":"quay.io","repository":"codefreshplugins/argo-hub-codefresh-csdp-image-enricher-git-info","tag":"1.1.36"},"jiraEnrichment":{"registry":"quay.io","repository":"codefreshplugins/argo-hub-codefresh-csdp-image-enricher-jira-info","tag":"1.1.36"},"reportImage":{"registry":"quay.io","repository":"codefreshplugins/argo-hub-codefresh-csdp-report-image-info","tag":"1.1.36"}},"podGcStrategy":"OnWorkflowCompletion","ttlActiveInSeconds":900,"ttlAfterCompletionInSeconds":86400},"enabled":true,"serviceAccount":{"annotations":null,"create":true,"name":"codefresh-image-enrichment-sa"}}` | Image enrichment process configuration | -| app-proxy.image-enrichment.config | object | `{"clientHeartbeatIntervalInSeconds":5,"concurrencyCmKey":"imageReportExecutor","concurrencyCmName":"workflow-synchronization-semaphores","images":{"gitEnrichment":{"registry":"quay.io","repository":"codefreshplugins/argo-hub-codefresh-csdp-image-enricher-git-info","tag":"1.1.36"},"jiraEnrichment":{"registry":"quay.io","repository":"codefreshplugins/argo-hub-codefresh-csdp-image-enricher-jira-info","tag":"1.1.36"},"reportImage":{"registry":"quay.io","repository":"codefreshplugins/argo-hub-codefresh-csdp-report-image-info","tag":"1.1.36"}},"podGcStrategy":"OnWorkflowCompletion","ttlActiveInSeconds":900,"ttlAfterCompletionInSeconds":86400}` | Configurations for image enrichment workflow | +| app-proxy.image-enrichment | object | `{"config":{"clientHeartbeatIntervalInSeconds":5,"concurrencyCmKey":"imageReportExecutor","concurrencyCmName":"workflow-synchronization-semaphores","images":{"gitEnrichment":{"registry":"quay.io","repository":"codefreshplugins/argo-hub-codefresh-csdp-image-enricher-git-info","tag":"1.1.37"},"jiraEnrichment":{"registry":"quay.io","repository":"codefreshplugins/argo-hub-codefresh-csdp-image-enricher-jira-info","tag":"1.1.37"},"reportImage":{"registry":"quay.io","repository":"codefreshplugins/argo-hub-codefresh-csdp-report-image-info","tag":"1.1.37"}},"podGcStrategy":"OnWorkflowCompletion","ttlActiveInSeconds":900,"ttlAfterCompletionInSeconds":86400},"enabled":true,"serviceAccount":{"annotations":null,"create":true,"name":"codefresh-image-enrichment-sa"}}` | Image enrichment process configuration | +| app-proxy.image-enrichment.config | object | `{"clientHeartbeatIntervalInSeconds":5,"concurrencyCmKey":"imageReportExecutor","concurrencyCmName":"workflow-synchronization-semaphores","images":{"gitEnrichment":{"registry":"quay.io","repository":"codefreshplugins/argo-hub-codefresh-csdp-image-enricher-git-info","tag":"1.1.37"},"jiraEnrichment":{"registry":"quay.io","repository":"codefreshplugins/argo-hub-codefresh-csdp-image-enricher-jira-info","tag":"1.1.37"},"reportImage":{"registry":"quay.io","repository":"codefreshplugins/argo-hub-codefresh-csdp-report-image-info","tag":"1.1.37"}},"podGcStrategy":"OnWorkflowCompletion","ttlActiveInSeconds":900,"ttlAfterCompletionInSeconds":86400}` | Configurations for image enrichment workflow | | app-proxy.image-enrichment.config.clientHeartbeatIntervalInSeconds | int | `5` | Client heartbeat interval in seconds for image enrichemnt workflow | | app-proxy.image-enrichment.config.concurrencyCmKey | string | `"imageReportExecutor"` | The name of the key in the configmap to use as synchronization semaphore | | app-proxy.image-enrichment.config.concurrencyCmName | string | `"workflow-synchronization-semaphores"` | The name of the configmap to use as synchronization semaphore, see https://argoproj.github.io/argo-workflows/synchronization/ | -| app-proxy.image-enrichment.config.images | object | `{"gitEnrichment":{"registry":"quay.io","repository":"codefreshplugins/argo-hub-codefresh-csdp-image-enricher-git-info","tag":"1.1.36"},"jiraEnrichment":{"registry":"quay.io","repository":"codefreshplugins/argo-hub-codefresh-csdp-image-enricher-jira-info","tag":"1.1.36"},"reportImage":{"registry":"quay.io","repository":"codefreshplugins/argo-hub-codefresh-csdp-report-image-info","tag":"1.1.36"}}` | Enrichemnt images | -| app-proxy.image-enrichment.config.images.reportImage | object | `{"registry":"quay.io","repository":"codefreshplugins/argo-hub-codefresh-csdp-report-image-info","tag":"1.1.36"}` | Report image enrichment task image | +| app-proxy.image-enrichment.config.images | object | `{"gitEnrichment":{"registry":"quay.io","repository":"codefreshplugins/argo-hub-codefresh-csdp-image-enricher-git-info","tag":"1.1.37"},"jiraEnrichment":{"registry":"quay.io","repository":"codefreshplugins/argo-hub-codefresh-csdp-image-enricher-jira-info","tag":"1.1.37"},"reportImage":{"registry":"quay.io","repository":"codefreshplugins/argo-hub-codefresh-csdp-report-image-info","tag":"1.1.37"}}` | Enrichemnt images | +| app-proxy.image-enrichment.config.images.reportImage | object | `{"registry":"quay.io","repository":"codefreshplugins/argo-hub-codefresh-csdp-report-image-info","tag":"1.1.37"}` | Report image enrichment task image | | app-proxy.image-enrichment.config.podGcStrategy | string | `"OnWorkflowCompletion"` | Pod grabage collection strategy. By default all pods will be deleted when the enrichment workflow completes. | | app-proxy.image-enrichment.config.ttlActiveInSeconds | int | `900` | Maximum allowed runtime for the enrichment workflow | | app-proxy.image-enrichment.config.ttlAfterCompletionInSeconds | int | `86400` | Number of seconds to live after completion | @@ -602,7 +627,7 @@ global: | argo-cd.redis-ha.image.tag | string | `"8.2.2-alpine"` | Redis tag | | argo-cd.redis.image.repository | string | `"ecr-public.aws.com/docker/library/redis"` | Redis repository | | argo-cd.redis.image.tag | string | `"8.2.2-alpine"` | Redis tag | -| argo-gateway | object | `{"affinity":{},"hpa":{"enabled":true,"maxReplicas":10,"minReplicas":1,"targetCPUUtilizationPercentage":70},"image":{"registry":"quay.io","repository":"codefresh/cf-argocd-extras","tag":"70aa9f5"},"livenessProbe":{"failureThreshold":3,"initialDelaySeconds":10,"periodSeconds":10,"successThreshold":1,"timeoutSeconds":10},"nodeSelector":{},"pdb":{"enabled":true,"maxUnavailable":"","minAvailable":"50%"},"readinessProbe":{"failureThreshold":3,"initialDelaySeconds":10,"periodSeconds":10,"successThreshold":1,"timeoutSeconds":10},"resources":{"requests":{"cpu":"100m","memory":"128Mi"}},"service":{"type":"ClusterIP"},"serviceAccount":{"create":true},"serviceMonitor":{"enabled":false,"interval":"30s","labels":{},"scrapeTimeout":"10s"},"tolerations":[]}` | Argo Gateway Argo Gateway is used to perform operations on ArgoCD from Codefresh platform | +| argo-gateway | object | `{"affinity":{},"hpa":{"enabled":true,"maxReplicas":10,"minReplicas":1,"targetCPUUtilizationPercentage":70},"image":{"registry":"quay.io","repository":"codefresh/cf-argocd-extras","tag":"a289436"},"livenessProbe":{"failureThreshold":3,"initialDelaySeconds":10,"periodSeconds":10,"successThreshold":1,"timeoutSeconds":10},"nodeSelector":{},"pdb":{"enabled":true,"maxUnavailable":"","minAvailable":"50%"},"readinessProbe":{"failureThreshold":3,"initialDelaySeconds":10,"periodSeconds":10,"successThreshold":1,"timeoutSeconds":10},"resources":{"requests":{"cpu":"100m","memory":"128Mi"}},"service":{"type":"ClusterIP"},"serviceAccount":{"create":true},"serviceMonitor":{"enabled":false,"interval":"30s","labels":{},"scrapeTimeout":"10s"},"tolerations":[]}` | Argo Gateway Argo Gateway is used to perform operations on ArgoCD from Codefresh platform | | argo-workflows.crds.install | bool | `true` | Install and upgrade CRDs | | argo-workflows.enabled | bool | `true` | | | argo-workflows.executor.resources.requests.ephemeral-storage | string | `"10Mi"` | | @@ -649,7 +674,7 @@ global: | gitops-operator.crds.annotations | object | `{}` | Annotations on gitops operator CRDs | | gitops-operator.crds.install | bool | `true` | Whether or not to install CRDs | | gitops-operator.crds.keep | bool | `false` | Keep CRDs if gitops runtime release is uninstalled | -| gitops-operator.enabled | bool | `true` | | +| gitops-operator.enabled | bool | `false` | Enable the GitOps operator. Disabled by default, the operator is End-of-Life. Set to `true` only if you still rely on it | | gitops-operator.env.<<[0].OTEL_EXPORTER_OTLP_COMPRESSION | string | `"gzip"` | Specifies the compression algorithm to be used for all telemetry data. Ref: https://opentelemetry.io/docs/specs/otel/protocol/exporter/ | | gitops-operator.env.<<[0].OTEL_EXPORTER_OTLP_ENDPOINT | string | `"http://localhost:4317"` | Base endpoint URL for all OpenTelemetry signals. Ref: https://opentelemetry.io/docs/languages/sdk-configuration/otlp-exporter/ | | gitops-operator.env.<<[0].OTEL_EXPORTER_OTLP_PROTOCOL | string | `"grpc"` | Specifies the OTLP transport protocol to be used for all telemetry data. Ref: https://opentelemetry.io/docs/languages/sdk-configuration/otlp-exporter/ | @@ -664,7 +689,7 @@ global: | gitops-operator.env.<<[0].OTEL_TRACES_SAMPLER | string | `"parentbased_always_on"` | OTel sampler to be used for traces. Ref: https://opentelemetry.io/docs/specs/otel/configuration/sdk-environment-variables/ | | gitops-operator.env.GITOPS_OPERATOR_VERSION | string | `"0.11.1"` | | | gitops-operator.fullnameOverride | string | `""` | | -| gitops-operator.image | object | `{"registry":"quay.io","repository":"codefresh/codefresh-gitops-operator","tag":"569808d"}` | GitOps operator image | +| gitops-operator.image | object | `{"registry":"quay.io","repository":"codefresh/codefresh-gitops-operator","tag":681822}` | GitOps operator image | | gitops-operator.imagePullSecrets | list | `[]` | | | gitops-operator.nameOverride | string | `""` | | | gitops-operator.nodeSelector | object | `{}` | | @@ -694,7 +719,7 @@ global: | global.codefresh.userToken | object | `{"secretKeyRef":{},"token":""}` | User token. Used for runtime registration against the patform. One of token (for plain text value) or secretKeyRef must be provided. | | global.codefresh.userToken.secretKeyRef | object | `{}` | User token that references an existing secret containing the token. | | global.codefresh.userToken.token | string | `""` | User token in plain text. The chart creates and manages the secret for this token. | -| global.event-reporters | object | `{"affinity":{},"config":{},"image":{"registry":"quay.io","repository":"codefresh/cf-argocd-extras","tag":"70aa9f5"},"livenessProbe":{"failureThreshold":3,"initialDelaySeconds":10,"periodSeconds":10,"successThreshold":1,"timeoutSeconds":10},"nodeSelector":{},"pdb":{"enabled":true,"maxUnavailable":"","minAvailable":"50%"},"readinessProbe":{"failureThreshold":3,"initialDelaySeconds":10,"periodSeconds":10,"successThreshold":1,"timeoutSeconds":10},"replicaCount":2,"resources":{"requests":{"cpu":"100m","memory":"128Mi"}},"service":{"ports":{"http":{"port":8088,"targetPort":8088},"metrics":{"port":8087,"targetPort":8087}},"type":"ClusterIP"},"serviceAccount":{"create":true},"serviceMonitor":{"enabled":false,"interval":"30s","labels":{},"scrapeTimeout":"10s"},"tolerations":[]}` | Global settings for event reporters Event reporters are used for reporting runtime and cluster resources to Codefresh platform | +| global.event-reporters | object | `{"affinity":{},"config":{},"image":{"registry":"quay.io","repository":"codefresh/cf-argocd-extras","tag":"a289436"},"livenessProbe":{"failureThreshold":3,"initialDelaySeconds":10,"periodSeconds":10,"successThreshold":1,"timeoutSeconds":10},"nodeSelector":{},"pdb":{"enabled":true,"maxUnavailable":"","minAvailable":"50%"},"readinessProbe":{"failureThreshold":3,"initialDelaySeconds":10,"periodSeconds":10,"successThreshold":1,"timeoutSeconds":10},"replicaCount":2,"resources":{"requests":{"cpu":"100m","memory":"128Mi"}},"service":{"ports":{"http":{"port":8088,"targetPort":8088},"metrics":{"port":8087,"targetPort":8087}},"type":"ClusterIP"},"serviceAccount":{"create":true},"serviceMonitor":{"enabled":false,"interval":"30s","labels":{},"scrapeTimeout":"10s"},"tolerations":[]}` | Global settings for event reporters Event reporters are used for reporting runtime and cluster resources to Codefresh platform | | global.httpProxy | string | `""` | global HTTP_PROXY for all components | | global.httpsProxy | string | `""` | global HTTPS_PROXY for all components | | global.imageRegistry | string | `""` | | @@ -747,8 +772,8 @@ global: | internal-router.env | object | `{}` | Environment variables - see values.yaml inside the chart for usage | | internal-router.fullnameOverride | string | `"internal-router"` | | | internal-router.image.pullPolicy | string | `"IfNotPresent"` | | -| internal-router.image.repository | string | `"docker.io/nginxinc/nginx-unprivileged"` | | -| internal-router.image.tag | string | `"1.31.6-alpine3.24"` | | +| internal-router.image.repository | string | `"docker.io/nginx/nginx-unprivileged"` | | +| internal-router.image.tag | string | `"1.31.8-alpine3.24"` | | | internal-router.imagePullSecrets | list | `[]` | | | internal-router.ipv6 | object | `{"enabled":false}` | For ipv6 enabled clusters switch ipv6 enabled to true | | internal-router.nameOverride | string | `""` | | @@ -805,7 +830,7 @@ global: | redis-ha.topologySpreadConstraints.maxSkew | string | `""` (defaults to `1`) | Max skew of pods tolerated | | redis-ha.topologySpreadConstraints.topologyKey | string | `""` (defaults to `topology.kubernetes.io/zone`) | Topology key for spread | | redis-ha.topologySpreadConstraints.whenUnsatisfiable | string | `""` (defaults to `ScheduleAnyway`) | Enforcement policy, hard or soft | -| redis-secret-init | object | `{"affinity":{},"image":{"registry":"docker.io","repository":"alpine/kubectl","tag":"1.37.0"},"nodeSelector":{},"tolerations":[]}` | Enable hook job to create redis secret | +| redis-secret-init | object | `{"affinity":{},"image":{"registry":"docker.io","repository":"alpine/kubectl","tag":"1.37.2"},"nodeSelector":{},"tolerations":[]}` | Enable hook job to create redis secret | | redis.image | object | `{"registry":"public.ecr.aws","repository":"docker/library/redis","tag":"8.2.1-alpine"}` | Redis image | | redis.metrics | object | `{"enabled":true,"env":{},"envFrom":[],"image":{"registry":"ghcr.io","repository":"oliver006/redis_exporter","tag":"v1.72.1"},"livenessProbe":{"enabled":true,"failureThreshold":5,"initialDelaySeconds":30,"periodSeconds":15,"successThreshold":1,"timeoutSeconds":15},"readinessProbe":{"enabled":true,"failureThreshold":5,"initialDelaySeconds":30,"periodSeconds":15,"successThreshold":1,"timeoutSeconds":15},"resources":{},"serviceMonitor":{"enabled":false}}` | Enable metrics sidecar | | redis.metrics.serviceMonitor | object | `{"enabled":false}` | Enable a prometheus ServiceMonitor | @@ -813,7 +838,7 @@ global: | redis.readinessProbe | object | `{"enabled":true,"failureThreshold":5,"initialDelaySeconds":30,"periodSeconds":15,"successThreshold":1,"timeoutSeconds":15}` | Probes configuration | | redis.service | object | `{"annotations":{},"labels":{},"ports":{"metrics":{"port":9121,"targetPort":9121},"redis":{"port":6379,"targetPort":6379}},"type":"ClusterIP"}` | Service configuration | | redis.serviceAccount | object | `{"annotations":{},"create":true,"name":""}` | Create ServiceAccount for redis | -| sealed-secrets | object | `{"fullnameOverride":"sealed-secrets-controller","image":{"registry":"quay.io","repository":"codefresh/sealed-secrets-controller","tag":"0.36.0"},"keyrenewperiod":"720h","resources":{"limits":{"cpu":"500m","memory":"1Gi"},"requests":{"cpu":"200m","memory":"512Mi"}}}` | --------------------------------------------------------------------------------------------------------------------- | +| sealed-secrets | object | `{"fullnameOverride":"sealed-secrets-controller","image":{"registry":"quay.io","repository":"codefresh/sealed-secrets-controller","tag":"0.41.2"},"keyrenewperiod":"720h","resources":{"limits":{"cpu":"500m","memory":"1Gi"},"requests":{"cpu":"200m","memory":"512Mi"}}}` | --------------------------------------------------------------------------------------------------------------------- | | tunnel-client | object | `{"affinity":{},"enabled":true,"libraryMode":true,"nodeSelector":{},"tolerations":[],"tunnelServer":{"host":"register-tunnels.cf-cd.com","subdomainHost":"tunnels.cf-cd.com"}}` | Tunnel based runtime. Not supported for on-prem platform. In on-prem use ingress based runtimes. | | tunnel-client.enabled | bool | `true` | Will only be used if global.runtime.ingress.enabled = false | | tunnel-client.libraryMode | bool | `true` | Do not change this value! Breaks chart logic | diff --git a/charts/gitops-runtime/README.md.gotmpl b/charts/gitops-runtime/README.md.gotmpl index 35280e350..33acf6bf8 100644 --- a/charts/gitops-runtime/README.md.gotmpl +++ b/charts/gitops-runtime/README.md.gotmpl @@ -16,6 +16,7 @@ - [Upgrading](#upgrading) - [To 0.23.x](#to-023x) - [> 0.24.x](#-024x) + - [To 0.32.x](#to-032x) ## Prerequisites @@ -60,6 +61,7 @@ argo-workflows: enabled: false tunnel-client: enabled: false +# gitops-operator is disabled by default (End-of-Life). gitops-operator: crds: install: false @@ -76,6 +78,7 @@ argo-cd: argo-workflows: crds: install: true +# gitops-operator is disabled by default (End-of-Life). gitops-operator: crds: install: true @@ -190,6 +193,8 @@ data: | GitOps Runtime version | Supported ArgoCD versions | |------------------------|---------------------------| +| 0.32.x | >=3.4 <=3.6 | +| 0.31.x | >=3.3 <=3.5 | | 0.30.x | >=3.2 <=3.4 | | 0.29.x | >=3.1 <=3.3 | | 0.28.x | >=3.0 <=3.2 | @@ -284,6 +289,7 @@ app-proxy: matchLabels: app: cap-app-proxy +# gitops-operator is disabled by default (End-of-Life). gitops-operator: replicaCount: 2 pdb: @@ -461,4 +467,23 @@ global: ... ``` +### To 0.32.x + +#### GitOps operator is disabled by default + +The GitOps operator has reached End-of-Life and `.Values.gitops-operator.enabled` now defaults to `false`. +On upgrade, the chart removes the `gitops-operator` Deployment, ServiceAccount, RBAC, PDB, the `promotion-template` ServiceAccount/RBAC, and the operator CRDs +(`products`, `promotionflows`, `promotionpolicies`, `promotiontasks`, `promotiontemplates`, `restrictedgitsources` in the `codefresh.io` group). + +> [!WARNING] +> Deleting a CRD deletes all custom resources of that kind in the cluster. +> To keep the CRDs and their resources, set `gitops-operator.crds.keep: true` in your **currently installed** release (run `helm upgrade` with it first), and only then upgrade to 0.32.x. + +If you still rely on the GitOps operator(you use restricted-git-sources with your runtime), enable it explicitly when upgrading: + +```yaml +gitops-operator: + enabled: true +``` + {{ template "chart.valuesSection" . }} diff --git a/charts/gitops-runtime/templates/hooks/pre-install/_env.yaml b/charts/gitops-runtime/templates/hooks/pre-install/_env.yaml index 8d1c81f96..084984364 100644 --- a/charts/gitops-runtime/templates/hooks/pre-install/_env.yaml +++ b/charts/gitops-runtime/templates/hooks/pre-install/_env.yaml @@ -22,7 +22,7 @@ NAMESPACE: valueFrom: fieldRef: fieldPath: metadata.namespace -REQUIRED_VERSION_CONSTRAINT: ">=3.2 <=3.4" +REQUIRED_VERSION_CONSTRAINT: ">=3.4 <=3.6" {{- end -}} {{- define "installer.validate-values.environment-variables" -}} diff --git a/charts/gitops-runtime/tests/custom-ca_test.yaml b/charts/gitops-runtime/tests/custom-ca_test.yaml index afd63ede0..cc0f12899 100644 --- a/charts/gitops-runtime/tests/custom-ca_test.yaml +++ b/charts/gitops-runtime/tests/custom-ca_test.yaml @@ -11,6 +11,8 @@ templates: - _components/cap-app-proxy/_deployment.yaml - _components/cap-app-proxy/_config.yaml - codefresh-cm.yaml +set: + gitops-operator.enabled: true tests: - it: test chart created secret contents - default secret key diff --git a/charts/gitops-runtime/tests/external_argocd_test.yaml b/charts/gitops-runtime/tests/external_argocd_test.yaml index e145efd5b..88f8cfa8b 100644 --- a/charts/gitops-runtime/tests/external_argocd_test.yaml +++ b/charts/gitops-runtime/tests/external_argocd_test.yaml @@ -8,6 +8,8 @@ templates: - _components/gitops-operator/* - app-proxy/external-argocd-token.yaml - codefresh-cm.yaml +set: + gitops-operator.enabled: true tests: - it: app-proxy ConfigMap should have valid ArgoCd URL values: diff --git a/charts/gitops-runtime/tests/gitops-controller-misc_test.yaml b/charts/gitops-runtime/tests/gitops-controller-misc_test.yaml index 01cfe4019..702c0aa5b 100644 --- a/charts/gitops-runtime/tests/gitops-controller-misc_test.yaml +++ b/charts/gitops-runtime/tests/gitops-controller-misc_test.yaml @@ -2,6 +2,8 @@ suite: misc tests on gitops-operator templates generation templates: - gitops-operator/* - _components/gitops-operator/* +set: + gitops-operator.enabled: true tests: - it: override both images works template: gitops-operator/deployment.yaml diff --git a/charts/gitops-runtime/tests/gitops-operator-disabled_test.yaml b/charts/gitops-runtime/tests/gitops-operator-disabled_test.yaml new file mode 100644 index 000000000..2d8d13a90 --- /dev/null +++ b/charts/gitops-runtime/tests/gitops-operator-disabled_test.yaml @@ -0,0 +1,11 @@ +# yaml-language-server: $schema=https://raw.githubusercontent.com/helm-unittest/helm-unittest/main/schema/helm-testsuite.json +suite: Test GitOps Operator is disabled by default +templates: + - gitops-operator/* +values: + - ./values/mandatory-values.yaml +tests: + - it: should not render any gitops-operator resources by default + asserts: + - hasDocuments: + count: 0 diff --git a/charts/gitops-runtime/tests/gitops-operator_test.yaml b/charts/gitops-runtime/tests/gitops-operator_test.yaml index 8368a8275..4bdfdd4ae 100644 --- a/charts/gitops-runtime/tests/gitops-operator_test.yaml +++ b/charts/gitops-runtime/tests/gitops-operator_test.yaml @@ -3,6 +3,8 @@ suite: Test GitOps Operator templates: - gitops-operator/** - _components/gitops-operator/** +set: + gitops-operator.enabled: true tests: - it: should have LEADER_ELECT set to true if replicaCount is greater than 1 values: diff --git a/charts/gitops-runtime/tests/global_constraints_test.yaml b/charts/gitops-runtime/tests/global_constraints_test.yaml index 3081e1f7e..7ddc90c84 100644 --- a/charts/gitops-runtime/tests/global_constraints_test.yaml +++ b/charts/gitops-runtime/tests/global_constraints_test.yaml @@ -19,6 +19,8 @@ templates: - codefresh-cm.yaml values: - ./values/mandatory-values.yaml +set: + gitops-operator.enabled: true tests: - it: components should have nodeSelector and tolerations from .Values.global values: diff --git a/charts/gitops-runtime/values-ha.yaml b/charts/gitops-runtime/values-ha.yaml index ae9463af9..b46e9e3c8 100644 --- a/charts/gitops-runtime/values-ha.yaml +++ b/charts/gitops-runtime/values-ha.yaml @@ -17,6 +17,7 @@ app-proxy: matchLabels: app: cap-app-proxy +# gitops-operator is disabled by default (End-of-Life). gitops-operator: replicaCount: 2 pdb: diff --git a/charts/gitops-runtime/values-multi-runtimes-first.yaml b/charts/gitops-runtime/values-multi-runtimes-first.yaml index 7edbb31b1..e9052bfdd 100644 --- a/charts/gitops-runtime/values-multi-runtimes-first.yaml +++ b/charts/gitops-runtime/values-multi-runtimes-first.yaml @@ -8,6 +8,7 @@ argo-cd: argo-workflows: crds: install: true +# gitops-operator is disabled by default (End-of-Life). gitops-operator: crds: install: true diff --git a/charts/gitops-runtime/values-multi-runtimes.yaml b/charts/gitops-runtime/values-multi-runtimes.yaml index 5450bdd18..4f20f1a31 100644 --- a/charts/gitops-runtime/values-multi-runtimes.yaml +++ b/charts/gitops-runtime/values-multi-runtimes.yaml @@ -23,6 +23,7 @@ argo-workflows: enabled: false tunnel-client: enabled: false +# gitops-operator is disabled by default (End-of-Life). gitops-operator: crds: install: false diff --git a/charts/gitops-runtime/values.yaml b/charts/gitops-runtime/values.yaml index 8a37a72db..b5e0bfa16 100644 --- a/charts/gitops-runtime/values.yaml +++ b/charts/gitops-runtime/values.yaml @@ -159,7 +159,7 @@ global: image: registry: quay.io repository: codefresh/cf-argocd-extras - tag: "70aa9f5" + tag: "a289436" nodeSelector: {} tolerations: [] affinity: {} @@ -267,7 +267,7 @@ sealed-secrets: image: registry: 'quay.io' repository: 'codefresh/sealed-secrets-controller' - tag: '0.36.0' + tag: '0.41.2' resources: limits: cpu: 500m @@ -348,9 +348,9 @@ codefreshWorkflowLogStoreCM: internal-router: replicaCount: 1 image: - repository: docker.io/nginxinc/nginx-unprivileged + repository: docker.io/nginx/nginx-unprivileged pullPolicy: IfNotPresent - tag: 1.31.6-alpine3.24 + tag: 1.31.8-alpine3.24 imagePullSecrets: [] nameOverride: "" fullnameOverride: "internal-router" @@ -469,17 +469,17 @@ app-proxy: reportImage: registry: quay.io repository: codefreshplugins/argo-hub-codefresh-csdp-report-image-info - tag: 1.1.36 + tag: 1.1.37 # Git enrichment task image gitEnrichment: registry: quay.io repository: codefreshplugins/argo-hub-codefresh-csdp-image-enricher-git-info - tag: 1.1.36 + tag: 1.1.37 # Jira enrichment task image jiraEnrichment: registry: quay.io repository: codefreshplugins/argo-hub-codefresh-csdp-image-enricher-jira-info - tag: 1.1.36 + tag: 1.1.37 image: repository: quay.io/codefresh/cap-app-proxy tag: 1.4186.0 @@ -640,7 +640,8 @@ app-proxy: # gitops-operator #----------------------------------------------------------------------------------------------------------------------- gitops-operator: - enabled: true + # -- Enable the GitOps operator. Disabled by default, the operator is End-of-Life. Set to `true` only if you still rely on it + enabled: false replicaCount: 1 # -- Codefresh gitops operator crds crds: @@ -670,7 +671,7 @@ gitops-operator: image: registry: quay.io repository: codefresh/codefresh-gitops-operator - tag: 569808d + tag: 0681822 env: !!merge <<: - *otel-config @@ -702,7 +703,7 @@ argo-gateway: image: registry: quay.io repository: codefresh/cf-argocd-extras - tag: "70aa9f5" + tag: "a289436" nodeSelector: {} tolerations: [] affinity: {} @@ -745,7 +746,7 @@ redis-secret-init: image: registry: docker.io repository: alpine/kubectl - tag: 1.37.0 + tag: 1.37.2 nodeSelector: {} tolerations: [] affinity: {} diff --git a/docs/RELEASE_GUIDE.md b/docs/RELEASE_GUIDE.md index 28f658f77..0fec03786 100644 --- a/docs/RELEASE_GUIDE.md +++ b/docs/RELEASE_GUIDE.md @@ -2,14 +2,6 @@ This guide explains how to perform releases for the GitOps Runtime Helm chart. -> **Tip**: There's a CLI that automates most of these steps: -> ```bash -> npx @codefresh-io/gitops-release --help -> ``` -> See the [CLI repository](https://github.com/codefresh-io/gitops-release) for details. - -The instructions below explain how to do everything manually if you prefer that approach, don't have an Anthropic API key for AI release notes, or need to troubleshoot. - --- ## Table of Contents @@ -30,25 +22,20 @@ The instructions below explain how to do everything manually if you prefer that ## Overview -The GitOps Runtime release process uses **Argo Events and Workflows** to automate most of the work. Your job as release manager is to: +The GitOps Runtime release process uses **Codefresh CI** to automate most of the work. +The developers: -1. **Trigger pipelines** by creating branches or merging PRs -2. **Review and approve** the automatically created prepare-release PRs +1. **Trigger pipelines** by creating branches +2. **Review and approve** the PRs 3. **Write/edit release notes** (the AI can help, but human review is essential) -4. **Publish releases** by merging the prepare-release PR +4. **Publish releases** by merging the PR ### How It Works ``` -You create stable/X.Y branch - ↓ -[Argo Workflow: prepare-release] runs automatically - ↓ -Creates prep/vX.Y.0 branch + PR + draft GitHub release - ↓ -You review, edit release notes, then merge the PR +You complete work on a PR for main, edit release notes, then merge the PR ↓ -[Argo Workflow: promote] runs automatically +[CF CI: promote] runs automatically ↓ Chart published to quay.io + GitHub release published ``` @@ -81,56 +68,18 @@ gh auth login ## Release Types -| Type | When | Branch Created | Example | -|------|------|----------------|---------| -| **Minor Release** | New features, starting a release line | `stable/0.27` | 0.27.0 | -| **Patch Release** | Bug fixes to existing release | Already exists | 0.26.6 | +| Type | When | Example | +|------|------|---------| +| **Minor Release** | New features, starting a release line | 0.27.0 | +| **Patch Release** | Bug fixes to existing release | 0.26.6 | --- -## Creating a New Minor Release +## Basic release sanity checks -Use this when starting a new release line (e.g., 0.27.x). - -### Step 1: Create the Stable Branch - -**Option A: GitHub UI (easiest)** -1. Go to https://github.com/codefresh-io/gitops-runtime-helm -2. Click the branch dropdown -3. Type `stable/0.27` (replace with your version) -4. Click "Create branch: stable/0.27 from main" - -**Option B: Git command line** -```bash -git fetch origin -git checkout main -git pull -git checkout -b stable/0.27 -git push -u origin stable/0.27 -``` - -**From a specific commit:** -```bash -git checkout -b stable/0.27 abc1234 -git push -u origin stable/0.27 -``` - -### Step 2: Wait for the Pipeline - -The **prepare-release** pipeline will automatically: -- Create `prep/v0.27.0` branch -- Bump version in `Chart.yaml` -- Open a PR with the `prepare-release` label -- Create a draft GitHub release - -This usually takes 2-5 minutes. - -### Step 3: Verify - -Check that everything was created: ```bash # Check for the PR -gh pr list --repo codefresh-io/gitops-runtime-helm --head prep/v0.27.0 +gh pr list --repo codefresh-io/gitops-runtime-helm --head your-branch-name # Check for draft release gh release list --repo codefresh-io/gitops-runtime-helm | head -5 @@ -144,7 +93,7 @@ Or visit: ## Release Validation -After the prepare-release PR is automatically created and before publishing the release, the release should be validated to ensure stability. +After the PR is reviewed and approved, the release should be validated to ensure stability. ### Current Approach @@ -157,7 +106,7 @@ The CI pipeline runs e2e tests on every PR. If these tests pass, the release is Before publishing, ensure: - [ ] All CI checks pass (unit tests, linting, e2e tests) -- [ ] The prepare-release PR has been reviewed +- [ ] The PR has been reviewed by the right reviewers - [ ] Release notes accurately reflect the changes - [ ] No known critical issues exist in the changes being released @@ -174,11 +123,6 @@ Before publishing, verify: gh pr checks --repo codefresh-io/gitops-runtime-helm ``` -2. **PR has the `prepare-release` label** (CRITICAL - this triggers the promote pipeline) - ```bash - gh pr view --repo codefresh-io/gitops-runtime-helm --json labels - ``` - 3. **Release notes are complete** (see [Writing Release Notes](#writing-release-notes)) ### Step 2: Review the PR @@ -190,7 +134,6 @@ Before publishing, verify: ### Step 3: Merge the PR ```bash -# Merge the prepare-release PR gh pr merge --repo codefresh-io/gitops-runtime-helm --squash ``` @@ -218,63 +161,6 @@ No manual action required. If notifications don't appear, see [Troubleshooting: --- -## Creating a Patch Release - -Patch releases (e.g., 0.26.6) happen when fixes are merged to an existing stable branch. - -### Step 1: Merge Fixes to Stable Branch - -Either: -- Merge PRs directly to `stable/0.26` -- Cherry-pick commits (see [Cherry-Picking Fixes](#cherry-picking-fixes)) - -### Step 2: Pipeline Creates New Prep PR - -When commits are merged to `stable/X.Y`, the prepare-release pipeline automatically: -- Creates `prep/v0.26.6` (incremented patch version) -- Opens a new prepare-release PR -- Creates a new draft release - -### Step 3: Publish - -Follow the same [Publishing a Release](#publishing-a-release) steps. - ---- - -## Cherry-Picking Fixes - -To backport a fix from `main` to a stable branch: - -```bash -# Make sure you have the latest -git fetch origin - -# Checkout stable branch -git checkout stable/0.26 -git pull - -# Create backport branch -git checkout -b backport/fix-memory-leak - -# Cherry-pick the commit(s) from main -git cherry-pick abc1234 - -# If there are conflicts, resolve them, then: -git add . -git cherry-pick --continue - -# Push and create PR -git push -u origin backport/fix-memory-leak -gh pr create --base stable/0.26 --title "Backport: Fix memory leak" --body "Cherry-picked from main" -``` - -**Multiple commits:** -```bash -git cherry-pick abc1234 def5678 ghi9012 -``` - ---- - ## Writing Release Notes > **Important**: AI-generated release notes are only as good as the commit messages. If commits are not descriptive or miss important context (like breaking changes), you MUST manually edit the notes. @@ -357,27 +243,6 @@ Valid `kind` values: `added`, `changed`, `deprecated`, `removed`, `fixed`, `secu ## Troubleshooting -### Pipeline Didn't Run - -**Symptom**: Created stable branch but no prep PR appeared - -**Check**: -1. Verify the branch was created correctly: - ```bash - gh api repos/codefresh-io/gitops-runtime-helm/branches/stable/0.27 - ``` -2. Check Argo Events sensor logs (requires cluster access) -3. Try creating a small commit to the branch to re-trigger - -### PR Doesn't Have `prepare-release` Label - -**Symptom**: PR exists but missing the label - -**Fix**: -```bash -gh pr edit --repo codefresh-io/gitops-runtime-helm --add-label prepare-release -``` - ### CI Checks Failing **Symptom**: PR checks are red @@ -387,37 +252,6 @@ gh pr edit --repo codefresh-io/gitops-runtime-helm --add-label prepa 2. Fix issues on the `prep/vX.Y.Z` branch 3. Push fixes - checks will re-run -### Merge Conflicts - -**Symptom**: PR shows merge conflicts - -**Fix**: -```bash -# Checkout the prep branch -git fetch origin -git checkout prep/v0.27.0 - -# Rebase or merge from stable -git rebase origin/stable/0.27 -# OR -git merge origin/stable/0.27 - -# Resolve conflicts, then force push -git push --force-with-lease -``` - -### Release Not Publishing After Merge - -**Symptom**: Merged the PR but release is still draft - -**Check**: -1. Verify the PR had the `prepare-release` label when merged -2. Check promote pipeline logs (requires cluster access) -3. Manual fallback - publish the release: - ```bash - gh release edit 0.27.0 --repo codefresh-io/gitops-runtime-helm --draft=false - ``` - ### Slack Notifications Not Sent **Symptom**: Release published but no Slack notifications appeared @@ -454,15 +288,8 @@ git push --force-with-lease | Pattern | Purpose | Example | |---------|---------|---------| -| `main` | Development branch | - | -| `stable/X.Y` | Release branch | `stable/0.27` | -| `prep/vX.Y.Z` | Prepare-release branch | `prep/v0.27.0` | - -### Important Labels - -| Label | Purpose | -|-------|---------| -| `prepare-release` | **CRITICAL**: Triggers promote pipeline when PR is merged | +| `main` | Release branch | - | +| `(feat|fix|...)/XX-YYYY-desc` | Development branches | `feat/CF-1234-fancy-stuff` | ### Version Formats @@ -590,8 +417,8 @@ Updates alpine base image to 3.19.1 which patches CVE-2024-12345 # List recent releases gh release list --repo codefresh-io/gitops-runtime-helm -# View open prepare-release PRs -gh pr list --repo codefresh-io/gitops-runtime-helm --label prepare-release +# View open PRs +gh pr list --repo codefresh-io/gitops-runtime-helm # Check PR status gh pr view --repo codefresh-io/gitops-runtime-helm @@ -599,14 +426,9 @@ gh pr view --repo codefresh-io/gitops-runtime-helm # Check PR CI status gh pr checks --repo codefresh-io/gitops-runtime-helm -# Merge prepare-release PR +# Merge a PR gh pr merge --repo codefresh-io/gitops-runtime-helm --squash # View a release gh release view --repo codefresh-io/gitops-runtime-helm - -# Create stable branch from main -git fetch origin && git checkout main && git pull -git checkout -b stable/0.27 -git push -u origin stable/0.27 ``` diff --git a/installer-image/Dockerfile b/installer-image/Dockerfile index 64563b2ab..04ed9473b 100644 --- a/installer-image/Dockerfile +++ b/installer-image/Dockerfile @@ -1,9 +1,9 @@ # syntax=docker/dockerfile:1 # DHI source: https://hub.docker.com/repository/docker/octopusdeploy/dhi-golang/tags/1.25-debian13-dev -FROM octopusdeploy/dhi-golang:1.27-debian13-dev@sha256:a6a651898220076b5f5623fd8a4a4baef96acdd5eb45cd9f8a1a257b550891d5 AS build +FROM octopusdeploy/dhi-golang:1.27-debian13-dev@sha256:48a2039a252d0ed9ec60a213f7f2726c0c1caac310b3dd9e46438366838a8554 AS build ARG TARGETARCH -ARG CF_CLI_VERSION=v1.0.10 +ARG CF_CLI_VERSION=v1.0.11 RUN go install github.com/davidrjonas/semver-cli@latest \ && cp $GOPATH/bin/semver-cli /tmp/semver-cli RUN apt-get update && apt-get install -y --no-install-recommends sed && rm -rf /var/lib/apt/lists/* @@ -11,7 +11,7 @@ ADD --unpack=true --chown=nonroot:nonroot --chmod=755 https://github.com/codefre # DHI source: https://hub.docker.com/repository/docker/octopusdeploy/dhi-debian-base/customizations/8106437942896324135 -FROM octopusdeploy/dhi-debian-base:trixie_cf-gitops-runtime-installer-debian13@sha256:958e36664d33a9e8cfe64f8eebf81735807b1f8a2d0563e3ba9ce696068e55c7 AS production +FROM octopusdeploy/dhi-debian-base:trixie_cf-gitops-runtime-installer-debian13@sha256:53695b7d2b4b4b2f3e60ab90e82b8b66072a60720bcb88df2de09d0ea375a86a AS production ARG TARGETARCH COPY --from=build --chown=nonroot:nonroot --chmod=755 /tmp/cf/cf-linux-${TARGETARCH} /usr/local/bin/cf COPY --from=build --chown=nonroot:nonroot --chmod=755 /tmp/semver-cli /usr/local/bin/semver-cli diff --git a/tests/component-tests/setup/values/runtime.values.yaml b/tests/component-tests/setup/values/runtime.values.yaml index 316ebe80a..194c889fd 100644 --- a/tests/component-tests/setup/values/runtime.values.yaml +++ b/tests/component-tests/setup/values/runtime.values.yaml @@ -12,6 +12,7 @@ # - Configures internal router and app-proxy for test networking. # - Sets a unique runtime name and disables validation steps. # - Uses a test-specific image tag for the gitops-operator. +# - Enables the gitops-operator (disabled by default in the chart). # # These values are used by the Helm install command in the test suite. # ----------------------------------------------------------------------------- @@ -49,3 +50,7 @@ internal-router: app-proxy: config: cors: "http://mockserver.mockserver:1080" + +# gitops-operator is disabled by default; component tests cover promotions, so it must be enabled +gitops-operator: + enabled: true