From 2a20c44088bb0c5676f36032e6301e157763f1f8 Mon Sep 17 00:00:00 2001 From: Ilia Medvedev Date: Sun, 25 Dec 2022 12:09:04 +0200 Subject: [PATCH 1/6] test --- charts/argo-cd/Chart.yaml | 2 +- charts/argo-cd/templates/argocd-server/deployment.yaml | 1 + charts/argo-events/templates/argo-events-controller/config.yaml | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index 39f131cb..9247be91 100644 --- a/charts/argo-cd/Chart.yaml +++ b/charts/argo-cd/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 appVersion: v2.4.15 description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes. name: argo-cd -version: 5.7.0-cf-init +version: 5.7.0-cf-test1 home: https://github.com/argoproj/argo-helm icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png sources: diff --git a/charts/argo-cd/templates/argocd-server/deployment.yaml b/charts/argo-cd/templates/argocd-server/deployment.yaml index 10c21541..cecc83f0 100755 --- a/charts/argo-cd/templates/argocd-server/deployment.yaml +++ b/charts/argo-cd/templates/argocd-server/deployment.yaml @@ -1,3 +1,4 @@ +# TEST apiVersion: apps/v1 kind: Deployment metadata: diff --git a/charts/argo-events/templates/argo-events-controller/config.yaml b/charts/argo-events/templates/argo-events-controller/config.yaml index 486fa364..4fc95b9b 100644 --- a/charts/argo-events/templates/argo-events-controller/config.yaml +++ b/charts/argo-events/templates/argo-events-controller/config.yaml @@ -1,3 +1,4 @@ +# Test1 apiVersion: v1 kind: ConfigMap metadata: From 2fdb695799c557eae03cadfd0a319f0f0f317d31 Mon Sep 17 00:00:00 2001 From: Ilia Medvedev Date: Sun, 25 Dec 2022 12:34:24 +0200 Subject: [PATCH 2/6] change to cf images --- charts/argo-cd/Chart.yaml | 4 ++-- charts/argo-cd/templates/argocd-server/deployment.yaml | 1 - charts/argo-cd/values.yaml | 10 +++++----- .../templates/argo-events-controller/config.yaml | 1 - 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml index 9247be91..f6b43008 100644 --- a/charts/argo-cd/Chart.yaml +++ b/charts/argo-cd/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v2 -appVersion: v2.4.15 +appVersion: v2.4.15-cap-CR-15677-rollout-rollback description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes. name: argo-cd -version: 5.7.0-cf-test1 +version: 5.7.0-cf-initial home: https://github.com/argoproj/argo-helm icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png sources: diff --git a/charts/argo-cd/templates/argocd-server/deployment.yaml b/charts/argo-cd/templates/argocd-server/deployment.yaml index cecc83f0..10c21541 100755 --- a/charts/argo-cd/templates/argocd-server/deployment.yaml +++ b/charts/argo-cd/templates/argocd-server/deployment.yaml @@ -1,4 +1,3 @@ -# TEST apiVersion: apps/v1 kind: Deployment metadata: diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml index 11b6d568..707679c2 100755 --- a/charts/argo-cd/values.yaml +++ b/charts/argo-cd/values.yaml @@ -43,7 +43,7 @@ crds: global: image: # -- If defined, a repository applied to all Argo CD deployments - repository: quay.io/argoproj/argocd + repository: quay.io/codefresh/argocd # -- Overrides the global Argo CD image tag whose default is the chart appVersion tag: "" # -- If defined, a imagePullPolicy applied to all Argo CD deployments @@ -980,9 +980,9 @@ redis: ## Redis image image: # -- Redis repository - repository: public.ecr.aws/docker/library/redis + repository: quay.io/codefresh/redis # -- Redis tag - tag: 7.0.5-alpine + tag: 7.0.4-alpine # -- Redis imagePullPolicy imagePullPolicy: IfNotPresent @@ -2046,10 +2046,10 @@ applicationSet: image: # -- Repository to use for the application set controller # @default -- `""` (defaults to global.image.repository) - repository: "" + repository: "quay.io/codefresh/applicationset" # -- Tag to use for the application set controller # @default -- `""` (defaults to global.image.tag) - tag: "" + tag: "v0.4.2-CR-13254-remove-private-logs" # -- Image pull policy for the application set controller # @default -- `""` (defaults to global.image.imagePullPolicy) imagePullPolicy: "" diff --git a/charts/argo-events/templates/argo-events-controller/config.yaml b/charts/argo-events/templates/argo-events-controller/config.yaml index 4fc95b9b..486fa364 100644 --- a/charts/argo-events/templates/argo-events-controller/config.yaml +++ b/charts/argo-events/templates/argo-events-controller/config.yaml @@ -1,4 +1,3 @@ -# Test1 apiVersion: v1 kind: ConfigMap metadata: From 26d1950138278ae44492affb6fc0e9422e223a59 Mon Sep 17 00:00:00 2001 From: Ilia Medvedev Date: Sun, 25 Dec 2022 12:37:48 +0200 Subject: [PATCH 3/6] fix doc --- charts/argo-cd/README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/argo-cd/README.md b/charts/argo-cd/README.md index f4a238ac..19d4e5c1 100644 --- a/charts/argo-cd/README.md +++ b/charts/argo-cd/README.md @@ -354,7 +354,7 @@ NAME: my-release | global.additionalLabels | object | `{}` | Additional labels to add to all resources | | global.hostAliases | list | `[]` | Mapping between IP and hostnames that will be injected as entries in the pod's hosts files | | global.image.imagePullPolicy | string | `"IfNotPresent"` | If defined, a imagePullPolicy applied to all Argo CD deployments | -| global.image.repository | string | `"quay.io/argoproj/argocd"` | If defined, a repository applied to all Argo CD deployments | +| global.image.repository | string | `"quay.io/codefresh/argocd"` | If defined, a repository applied to all Argo CD deployments | | global.image.tag | string | `""` | Overrides the global Argo CD image tag whose default is the chart appVersion | | global.imagePullSecrets | list | `[]` | Secrets with credentials to pull images from a private registry | | global.logging.format | string | `"text"` | Set the global logging format. Either: `text` or `json` | @@ -816,8 +816,8 @@ server: | redis.extraArgs | list | `[]` | Additional command line arguments to pass to redis-server | | redis.extraContainers | list | `[]` | Additional containers to be added to the redis pod | | redis.image.imagePullPolicy | string | `"IfNotPresent"` | Redis imagePullPolicy | -| redis.image.repository | string | `"public.ecr.aws/docker/library/redis"` | Redis repository | -| redis.image.tag | string | `"7.0.5-alpine"` | Redis tag | +| redis.image.repository | string | `"quay.io/codefresh/redis"` | Redis repository | +| redis.image.tag | string | `"7.0.4-alpine"` | Redis tag | | redis.imagePullSecrets | list | `[]` (defaults to global.imagePullSecrets) | Secrets with credentials to pull images from a private registry | | redis.initContainers | list | `[]` | Init containers to add to the redis pod | | redis.metrics.containerPort | int | `9121` | Port to use for redis-exporter sidecar | From 8c9f38a2572c11ec6b631cef23cafbe516f04976 Mon Sep 17 00:00:00 2001 From: Ilia Medvedev Date: Sun, 25 Dec 2022 12:55:50 +0200 Subject: [PATCH 4/6] disabled notifications controller --- charts/argo-cd/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml index 707679c2..b0f47019 100755 --- a/charts/argo-cd/values.yaml +++ b/charts/argo-cd/values.yaml @@ -2259,7 +2259,7 @@ applicationSet: ## Notifications controller notifications: # -- Enable notifications controller - enabled: true + enabled: false # -- Notifications controller name string name: notifications-controller From d208bfd51a7c3ae3026bc955cd1b988c46724df8 Mon Sep 17 00:00:00 2001 From: Ilia Medvedev Date: Sun, 25 Dec 2022 12:57:02 +0200 Subject: [PATCH 5/6] disabled notifications controller --- charts/argo-cd/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/argo-cd/README.md b/charts/argo-cd/README.md index 19d4e5c1..b71caef2 100644 --- a/charts/argo-cd/README.md +++ b/charts/argo-cd/README.md @@ -1010,7 +1010,7 @@ If you want to use an existing Redis (eg. a managed service from a cloud provide | notifications.cm.create | bool | `true` | Whether helm chart creates controller config map | | notifications.containerSecurityContext | object | `{}` | Container Security Context | | notifications.context | object | `{}` | Define user-defined context | -| notifications.enabled | bool | `true` | Enable notifications controller | +| notifications.enabled | bool | `false` | Enable notifications controller | | notifications.extraArgs | list | `[]` | Extra arguments to provide to the controller | | notifications.extraEnv | list | `[]` | Additional container environment variables | | notifications.extraEnvFrom | list | `[]` (See [values.yaml]) | envFrom to pass to the controller | From 833359e415b91afb1172ccaf8279e1757c63ea9b Mon Sep 17 00:00:00 2001 From: Ilia Medvedev Date: Sun, 25 Dec 2022 13:54:04 +0200 Subject: [PATCH 6/6] adjust appset controller --- charts/argo-cd/templates/argocd-applicationset/deployment.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/charts/argo-cd/templates/argocd-applicationset/deployment.yaml b/charts/argo-cd/templates/argocd-applicationset/deployment.yaml index 2dbc5b70..9b69d61d 100644 --- a/charts/argo-cd/templates/argocd-applicationset/deployment.yaml +++ b/charts/argo-cd/templates/argocd-applicationset/deployment.yaml @@ -37,7 +37,8 @@ spec: imagePullPolicy: {{ default .Values.global.image.imagePullPolicy .Values.applicationSet.image.imagePullPolicy }} command: - entrypoint.sh - - argocd-applicationset-controller + {{/* Codefresh - change argocd-applicationset-controller to applicationset-controller*/}} + - applicationset-controller - --logformat - {{ default .Values.global.logging.format .Values.applicationSet.logFormat }} - --loglevel