diff --git a/charts/gitops-runtime/Chart.yaml b/charts/gitops-runtime/Chart.yaml index 7a6318e94..538de6c33 100644 --- a/charts/gitops-runtime/Chart.yaml +++ b/charts/gitops-runtime/Chart.yaml @@ -13,6 +13,12 @@ maintainers: url: https://codefresh-io.github.io/ annotations: artifacthub.io/alternativeName: "codefresh-gitops-runtime" + artifacthub.io/changes: |- + - kind: changed + description: 'Release 0.30.0' + links: + - name: 'Release notes' + url: 'https://github.com/codefresh-io/gitops-runtime-helm/releases/tag/0.30.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. diff --git a/charts/gitops-runtime/README.md b/charts/gitops-runtime/README.md index 65c05b727..cdb02beac 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.30.0](https://img.shields.io/badge/Version-0.30.0-informational?style=flat-square) ![AppVersion: 0.1.72](https://img.shields.io/badge/AppVersion-0.1.72-informational?style=flat-square) ## Table of Content @@ -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 | @@ -205,7 +206,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.30.0 ``` `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 @@ -218,7 +219,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.30.0 ``` ## Openshift @@ -596,7 +597,7 @@ 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.global.networkPolicy.create | bool | `false` | | | 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..8d1c81f96 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.2 <=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..01d45b9bc 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: