diff --git a/charts/gitops-runtime/Chart.yaml b/charts/gitops-runtime/Chart.yaml index 32e2e28f4..75db72097 100644 --- a/charts/gitops-runtime/Chart.yaml +++ b/charts/gitops-runtime/Chart.yaml @@ -19,10 +19,10 @@ dependencies: - name: argo-cd repository: https://argoproj.github.io/argo-helm condition: argo-cd.enabled - version: 9.4.17 + version: 10.2.2 - name: argo-workflows repository: https://codefresh-io.github.io/argo-helm - version: 0.45.24-v3.6.7-cap-CF-2129 + version: 0.45.25-v3.6.7-cap-CFS-15235 condition: argo-workflows.enabled - name: sealed-secrets repository: https://bitnami.github.io/sealed-secrets diff --git a/charts/gitops-runtime/README.md b/charts/gitops-runtime/README.md index 65c05b727..07356014c 100644 --- a/charts/gitops-runtime/README.md +++ b/charts/gitops-runtime/README.md @@ -187,6 +187,7 @@ data: | GitOps Runtime version | Supported ArgoCD versions | |------------------------|---------------------------| +| 0.30.x | >=3.2 <=3.4 | | 0.29.x | >=3.1 <=3.3 | | 0.28.x | >=3.0 <=3.2 | | 0.27.x | >=3.0 <=3.2 | @@ -506,13 +507,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.31"},"jiraEnrichment":{"registry":"quay.io","repository":"codefreshplugins/argo-hub-codefresh-csdp-image-enricher-jira-info","tag":"1.1.31"},"reportImage":{"registry":"quay.io","repository":"codefreshplugins/argo-hub-codefresh-csdp-report-image-info","tag":"1.1.31"}},"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.31"},"jiraEnrichment":{"registry":"quay.io","repository":"codefreshplugins/argo-hub-codefresh-csdp-image-enricher-jira-info","tag":"1.1.31"},"reportImage":{"registry":"quay.io","repository":"codefreshplugins/argo-hub-codefresh-csdp-report-image-info","tag":"1.1.31"}},"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.32"},"jiraEnrichment":{"registry":"quay.io","repository":"codefreshplugins/argo-hub-codefresh-csdp-image-enricher-jira-info","tag":"1.1.32"},"reportImage":{"registry":"quay.io","repository":"codefreshplugins/argo-hub-codefresh-csdp-report-image-info","tag":"1.1.32"}},"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.32"},"jiraEnrichment":{"registry":"quay.io","repository":"codefreshplugins/argo-hub-codefresh-csdp-image-enricher-jira-info","tag":"1.1.32"},"reportImage":{"registry":"quay.io","repository":"codefreshplugins/argo-hub-codefresh-csdp-report-image-info","tag":"1.1.32"}},"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.31"},"jiraEnrichment":{"registry":"quay.io","repository":"codefreshplugins/argo-hub-codefresh-csdp-image-enricher-jira-info","tag":"1.1.31"},"reportImage":{"registry":"quay.io","repository":"codefreshplugins/argo-hub-codefresh-csdp-report-image-info","tag":"1.1.31"}}` | 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.31"}` | 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.32"},"jiraEnrichment":{"registry":"quay.io","repository":"codefreshplugins/argo-hub-codefresh-csdp-image-enricher-jira-info","tag":"1.1.32"},"reportImage":{"registry":"quay.io","repository":"codefreshplugins/argo-hub-codefresh-csdp-report-image-info","tag":"1.1.32"}}` | 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.32"}` | 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 | @@ -523,14 +524,14 @@ global: | app-proxy.image-enrichment.serviceAccount.name | string | `"codefresh-image-enrichment-sa"` | Name of the service account to create or the name of the existing one to use | | app-proxy.image.pullPolicy | string | `"IfNotPresent"` | | | app-proxy.image.repository | string | `"quay.io/codefresh/cap-app-proxy"` | | -| app-proxy.image.tag | string | `"1.4124.0"` | | +| app-proxy.image.tag | string | `"1.4128.0"` | | | app-proxy.imagePullSecrets | list | `[]` | | | app-proxy.initContainer.command[0] | string | `"./init.sh"` | | | app-proxy.initContainer.env | object | `{}` | | | app-proxy.initContainer.extraVolumeMounts | list | `[]` | Extra volume mounts for init container | | app-proxy.initContainer.image.pullPolicy | string | `"IfNotPresent"` | | | app-proxy.initContainer.image.repository | string | `"quay.io/codefresh/cap-app-proxy-init"` | | -| app-proxy.initContainer.image.tag | string | `"1.4124.0"` | | +| app-proxy.initContainer.image.tag | string | `"1.4128.0"` | | | app-proxy.initContainer.resources.limits | object | `{}` | | | app-proxy.initContainer.resources.requests.cpu | string | `"0.2"` | | | app-proxy.initContainer.resources.requests.memory | string | `"256Mi"` | | @@ -596,7 +597,6 @@ global: | argo-cd.controller.statefulsetAnnotations."argocd.argoproj.io/sync-options" | string | `"Delete=false"` | | | argo-cd.enabled | bool | `true` | | | argo-cd.fullnameOverride | string | `"argo-cd"` | | -| argo-cd.global.image.tag | string | `"v3.3.10"` | | | argo-cd.notifications.enabled | bool | `false` | | | argo-cd.redis-ha.image.repository | string | `"ecr-public.aws.com/docker/library/redis"` | Redis repository | | argo-cd.redis-ha.image.tag | string | `"8.2.2-alpine"` | Redis tag | diff --git a/charts/gitops-runtime/README.md.gotmpl b/charts/gitops-runtime/README.md.gotmpl index c7efc6e50..35280e350 100644 --- a/charts/gitops-runtime/README.md.gotmpl +++ b/charts/gitops-runtime/README.md.gotmpl @@ -190,6 +190,7 @@ data: | GitOps Runtime version | Supported ArgoCD versions | |------------------------|---------------------------| +| 0.30.x | >=3.2 <=3.4 | | 0.29.x | >=3.1 <=3.3 | | 0.28.x | >=3.0 <=3.2 | | 0.27.x | >=3.0 <=3.2 | diff --git a/charts/gitops-runtime/ci/versions.json b/charts/gitops-runtime/ci/versions.json index e1c1fd222..7c743ddb8 100644 --- a/charts/gitops-runtime/ci/versions.json +++ b/charts/gitops-runtime/ci/versions.json @@ -1,7 +1,7 @@ [ { "argo-cd": { - "chartVersion": "8.0.0" + "chartVersion": "10.2.2" } } ] diff --git a/charts/gitops-runtime/templates/argocd-repo-server-networkpolicy.yaml b/charts/gitops-runtime/templates/argocd-repo-server-networkpolicy.yaml new file mode 100644 index 000000000..ab6932839 --- /dev/null +++ b/charts/gitops-runtime/templates/argocd-repo-server-networkpolicy.yaml @@ -0,0 +1,40 @@ +{{- if index .Values "argo-cd" "enabled" }} +{{- $argoCdGlobalNP := index .Values "argo-cd" "global" "networkPolicy" }} +{{- $repoServerNP := index .Values "argo-cd" "repoServer" "networkPolicy" }} +{{- if or $argoCdGlobalNP.create $repoServerNP.create }} +apiVersion: networking.k8s.io/v1 +kind: NetworkPolicy +metadata: + name: codefresh-to-argocd-repo-server + labels: + app.kubernetes.io/part-of: gitops-runtime + app.kubernetes.io/managed-by: {{ .Release.Service }} +spec: + podSelector: + matchLabels: + app.kubernetes.io/instance: {{ .Release.Name }} + app.kubernetes.io/name: argocd-repo-server + policyTypes: + - Ingress + ingress: + - from: + - podSelector: + matchLabels: + app: cap-app-proxy + - podSelector: + matchLabels: + app: gitops-operator + - podSelector: + matchLabels: + app.kubernetes.io/name: argo-gateway + - podSelector: + matchLabels: + app.kubernetes.io/name: cluster-event-reporter + - podSelector: + matchLabels: + app.kubernetes.io/name: runtime-event-reporter + ports: + - protocol: TCP + port: repo-server +{{- end }} +{{- end }} diff --git a/charts/gitops-runtime/templates/hooks/pre-install/_env.yaml b/charts/gitops-runtime/templates/hooks/pre-install/_env.yaml index 52282eba7..5de68d2dd 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 <=3.3" +REQUIRED_VERSION_CONSTRAINT: ">=3.1 <=3.4" {{- end -}} {{- define "installer.validate-values.environment-variables" -}} diff --git a/charts/gitops-runtime/values.yaml b/charts/gitops-runtime/values.yaml index 420bfee9d..0fe222361 100644 --- a/charts/gitops-runtime/values.yaml +++ b/charts/gitops-runtime/values.yaml @@ -281,9 +281,6 @@ sealed-secrets: argo-cd: enabled: true fullnameOverride: argo-cd - global: - image: - tag: v3.3.10 notifications: enabled: false redis: @@ -472,27 +469,27 @@ app-proxy: reportImage: registry: quay.io repository: codefreshplugins/argo-hub-codefresh-csdp-report-image-info - tag: 1.1.31 + tag: 1.1.32 # Git enrichment task image gitEnrichment: registry: quay.io repository: codefreshplugins/argo-hub-codefresh-csdp-image-enricher-git-info - tag: 1.1.31 + tag: 1.1.32 # Jira enrichment task image jiraEnrichment: registry: quay.io repository: codefreshplugins/argo-hub-codefresh-csdp-image-enricher-jira-info - tag: 1.1.31 + tag: 1.1.32 image: repository: quay.io/codefresh/cap-app-proxy - tag: 1.4124.0 + tag: 1.4128.0 pullPolicy: IfNotPresent # -- Extra volume mounts for main container extraVolumeMounts: [] initContainer: image: repository: quay.io/codefresh/cap-app-proxy-init - tag: 1.4124.0 + tag: 1.4128.0 pullPolicy: IfNotPresent command: - ./init.sh diff --git a/installer-image/Dockerfile b/installer-image/Dockerfile index bd98a9a81..0727f7038 100644 --- a/installer-image/Dockerfile +++ b/installer-image/Dockerfile @@ -3,7 +3,7 @@ # DHI source: https://hub.docker.com/repository/docker/octopusdeploy/dhi-golang/tags/1.25-debian13-dev FROM octopusdeploy/dhi-golang:1.25-debian13-dev@sha256:e6e6523b8d28c9e31354de5ecf58b849c18410b2bb7065b533066740fca549af AS build ARG TARGETARCH -ARG CF_CLI_VERSION=v1.0.6 +ARG CF_CLI_VERSION=v1.0.9 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/*