Skip to content

Commit 2b99d3d

Browse files
Merge pull request #1 from codefresh-io/test-change-argo-cd
Initial Codefresh ArgoCD - App version v2.4.15-cap-CR-15677-rollout-rollback
2 parents 0bd0298 + 833359e commit 2b99d3d

File tree

4 files changed

+14
-13
lines changed

4 files changed

+14
-13
lines changed

charts/argo-cd/Chart.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
apiVersion: v2
2-
appVersion: v2.4.15
2+
appVersion: v2.4.15-cap-CR-15677-rollout-rollback
33
description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes.
44
name: argo-cd
5-
version: 5.7.0-cf-init
5+
version: 5.7.0-cf-initial
66
home: https://github.com/argoproj/argo-helm
77
icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
88
sources:

charts/argo-cd/README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,7 @@ NAME: my-release
354354
| global.additionalLabels | object | `{}` | Additional labels to add to all resources |
355355
| global.hostAliases | list | `[]` | Mapping between IP and hostnames that will be injected as entries in the pod's hosts files |
356356
| global.image.imagePullPolicy | string | `"IfNotPresent"` | If defined, a imagePullPolicy applied to all Argo CD deployments |
357-
| global.image.repository | string | `"quay.io/argoproj/argocd"` | If defined, a repository applied to all Argo CD deployments |
357+
| global.image.repository | string | `"quay.io/codefresh/argocd"` | If defined, a repository applied to all Argo CD deployments |
358358
| global.image.tag | string | `""` | Overrides the global Argo CD image tag whose default is the chart appVersion |
359359
| global.imagePullSecrets | list | `[]` | Secrets with credentials to pull images from a private registry |
360360
| global.logging.format | string | `"text"` | Set the global logging format. Either: `text` or `json` |
@@ -816,8 +816,8 @@ server:
816816
| redis.extraArgs | list | `[]` | Additional command line arguments to pass to redis-server |
817817
| redis.extraContainers | list | `[]` | Additional containers to be added to the redis pod |
818818
| redis.image.imagePullPolicy | string | `"IfNotPresent"` | Redis imagePullPolicy |
819-
| redis.image.repository | string | `"public.ecr.aws/docker/library/redis"` | Redis repository |
820-
| redis.image.tag | string | `"7.0.5-alpine"` | Redis tag |
819+
| redis.image.repository | string | `"quay.io/codefresh/redis"` | Redis repository |
820+
| redis.image.tag | string | `"7.0.4-alpine"` | Redis tag |
821821
| redis.imagePullSecrets | list | `[]` (defaults to global.imagePullSecrets) | Secrets with credentials to pull images from a private registry |
822822
| redis.initContainers | list | `[]` | Init containers to add to the redis pod |
823823
| redis.metrics.containerPort | int | `9121` | Port to use for redis-exporter sidecar |
@@ -1010,7 +1010,7 @@ If you want to use an existing Redis (eg. a managed service from a cloud provide
10101010
| notifications.cm.create | bool | `true` | Whether helm chart creates controller config map |
10111011
| notifications.containerSecurityContext | object | `{}` | Container Security Context |
10121012
| notifications.context | object | `{}` | Define user-defined context |
1013-
| notifications.enabled | bool | `true` | Enable notifications controller |
1013+
| notifications.enabled | bool | `false` | Enable notifications controller |
10141014
| notifications.extraArgs | list | `[]` | Extra arguments to provide to the controller |
10151015
| notifications.extraEnv | list | `[]` | Additional container environment variables |
10161016
| notifications.extraEnvFrom | list | `[]` (See [values.yaml]) | envFrom to pass to the controller |

charts/argo-cd/templates/argocd-applicationset/deployment.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ spec:
3737
imagePullPolicy: {{ default .Values.global.image.imagePullPolicy .Values.applicationSet.image.imagePullPolicy }}
3838
command:
3939
- entrypoint.sh
40-
- argocd-applicationset-controller
40+
{{/* Codefresh - change argocd-applicationset-controller to applicationset-controller*/}}
41+
- applicationset-controller
4142
- --logformat
4243
- {{ default .Values.global.logging.format .Values.applicationSet.logFormat }}
4344
- --loglevel

charts/argo-cd/values.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ crds:
4343
global:
4444
image:
4545
# -- If defined, a repository applied to all Argo CD deployments
46-
repository: quay.io/argoproj/argocd
46+
repository: quay.io/codefresh/argocd
4747
# -- Overrides the global Argo CD image tag whose default is the chart appVersion
4848
tag: ""
4949
# -- If defined, a imagePullPolicy applied to all Argo CD deployments
@@ -980,9 +980,9 @@ redis:
980980
## Redis image
981981
image:
982982
# -- Redis repository
983-
repository: public.ecr.aws/docker/library/redis
983+
repository: quay.io/codefresh/redis
984984
# -- Redis tag
985-
tag: 7.0.5-alpine
985+
tag: 7.0.4-alpine
986986
# -- Redis imagePullPolicy
987987
imagePullPolicy: IfNotPresent
988988

@@ -2046,10 +2046,10 @@ applicationSet:
20462046
image:
20472047
# -- Repository to use for the application set controller
20482048
# @default -- `""` (defaults to global.image.repository)
2049-
repository: ""
2049+
repository: "quay.io/codefresh/applicationset"
20502050
# -- Tag to use for the application set controller
20512051
# @default -- `""` (defaults to global.image.tag)
2052-
tag: ""
2052+
tag: "v0.4.2-CR-13254-remove-private-logs"
20532053
# -- Image pull policy for the application set controller
20542054
# @default -- `""` (defaults to global.image.imagePullPolicy)
20552055
imagePullPolicy: ""
@@ -2259,7 +2259,7 @@ applicationSet:
22592259
## Notifications controller
22602260
notifications:
22612261
# -- Enable notifications controller
2262-
enabled: true
2262+
enabled: false
22632263

22642264
# -- Notifications controller name string
22652265
name: notifications-controller

0 commit comments

Comments
 (0)