Skip to content

Commit b1f1f58

Browse files
oleksandr-codefresholeksandr-codefresh
authored
Merge pull request #93 from codefresh-io/CR-23060-argo-cd-v2-reporter-always-enabled
chore: removed eventReporter.enabled condition to use new reporter always
2 parents 8e6ffa5 + d996fc0 commit b1f1f58

23 files changed

+112
-55
lines changed

‎.github/configs/ct-install.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ charts:
66
- charts/argo-cd
77
chart-repos:
88
- dandydeveloper=https://dandydeveloper.github.io/charts/
9-
helm-extra-args: "--timeout 600s"
9+
helm-extra-args: "--timeout 600s"
1010
validate-chart-schema: false
1111
validate-maintainers: true
1212
validate-yaml: true

‎.github/workflows/lint-and-test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,4 +90,4 @@ jobs:
9090
9191
- name: Run chart-testing (install)
9292
run: ct install --config ./.github/configs/ct-install.yaml --target-branch ${{ github.base_ref }}
93-
if: steps.list-changed.outputs.changed == 'true'
93+
if: steps.list-changed.outputs.changed == 'true'

‎charts/argo-cd/Chart.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
apiVersion: v2
2-
appVersion: v2.11-2024.7.30-a31bf96bb
2+
appVersion: v2.11-2024.8.19-6be897266
33
kubeVersion: ">=1.23.0-0"
44
description: A Helm chart for Argo CD, a declarative, GitOps continuous delivery tool for Kubernetes.
55
name: argo-cd
6-
version: 6.11.1-6-cap-2.11-2024.7.30-a31bf96bb
6+
version: 6.11.1-7-cap-2.11-2024.8.19-6be897266
77
home: https://github.com/argoproj/argo-helm
88
icon: https://argo-cd.readthedocs.io/en/stable/assets/logo.png
99
sources:
@@ -27,4 +27,4 @@ annotations:
2727
url: https://argoproj.github.io/argo-helm/pgp_keys.asc
2828
artifacthub.io/changes: |
2929
- kind: changed
30-
description: Upgrade argo-cd to v2.11-2024.7.30-a31bf96bb with fix - self heal is not working in monorepo
30+
description: Upgrade argo-cd to v2.11-2024.8.19-6be897266 with v1 reporter removal

‎charts/argo-cd/README.md‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -661,7 +661,6 @@ NAME: my-release
661661
| eventReporter.containerSecurityContext | object | See [values.yaml] | Event reporter container-level security context |
662662
| eventReporter.dnsConfig | object | `{}` | [DNS configuration] |
663663
| eventReporter.dnsPolicy | string | `"ClusterFirst"` | Alternative DNS policy for event reporter pods |
664-
| eventReporter.enabled | bool | `true` | |
665664
| eventReporter.env | list | `[]` | Environment variables to pass to event reporter |
666665
| eventReporter.envFrom | list | `[]` (See [values.yaml]) | envFrom to pass to event reporter |
667666
| eventReporter.extraArgs | list | `[]` | Additional command line arguments to pass to event reporter |
@@ -723,7 +722,6 @@ NAME: my-release
723722
| eventReporter.terminationGracePeriodSeconds | int | `30` | terminationGracePeriodSeconds for container lifecycle hook |
724723
| eventReporter.tolerations | list | `[]` (defaults to global.tolerations) | [Tolerations] for use with node taints |
725724
| eventReporter.topologySpreadConstraints | list | `[]` (defaults to global.topologySpreadConstraints) | Assign custom [TopologySpreadConstraints] rules to the event reporter |
726-
| eventReporter.version | string | `"v2"` | |
727725
| eventReporter.volumeMounts | list | `[]` | Additional volumeMounts to the event reporter main container |
728726
| eventReporter.volumes | list | `[]` | Additional volumes to the event reporter pod |
729727
| extraObjects | list | `[]` | Array of extra K8s manifests to deploy |

‎charts/argo-cd/ci/default-values.yaml‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,19 @@
22
crds:
33
keep: false
44

5-
# these tests only support vanilla argo-cd
6-
# do not work for event reporter component
7-
eventReporter:
8-
enabled: false
5+
# needed for correct work of event reporter component
6+
extraObjects:
7+
- apiVersion: v1
8+
kind: Secret
9+
metadata:
10+
name: argocd-token
11+
type: Opaque
12+
data:
13+
token: c29tZS10ZXN0LXBhc3N3b3Jk # some-test-password
14+
- apiVersion: v1
15+
kind: Secret
16+
metadata:
17+
name: codefresh-token
18+
type: Opaque
19+
data:
20+
token: c29tZS10ZXN0LXBhc3N3b3Jk # some-test-password

‎charts/argo-cd/ci/dynamic-sharding-values.yaml‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,18 @@ controller:
77

88
# these tests only support vanilla argo-cd
99
# do not work for event reporter component
10-
eventReporter:
11-
enabled: false
10+
extraObjects:
11+
- apiVersion: v1
12+
kind: Secret
13+
metadata:
14+
name: argocd-token
15+
type: Opaque
16+
data:
17+
token: c29tZS10ZXN0LXBhc3N3b3Jk # some-test-password
18+
- apiVersion: v1
19+
kind: Secret
20+
metadata:
21+
name: codefresh-token
22+
type: Opaque
23+
data:
24+
token: c29tZS10ZXN0LXBhc3N3b3Jk # some-test-password

‎charts/argo-cd/ci/extension-values.yaml‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,19 @@ server:
1313
- name: EXTENSION_CHECKSUM_URL
1414
value: https://github.com/argoproj-labs/argocd-extension-metrics/releases/download/v1.0.0/extension_checksums.txt
1515

16-
# these tests only support vanilla argo-cd
17-
# do not work for event reporter component
18-
eventReporter:
19-
enabled: false
16+
# needed for correct work of event reporter component
17+
extraObjects:
18+
- apiVersion: v1
19+
kind: Secret
20+
metadata:
21+
name: argocd-token
22+
type: Opaque
23+
data:
24+
token: c29tZS10ZXN0LXBhc3N3b3Jk # some-test-password
25+
- apiVersion: v1
26+
kind: Secret
27+
metadata:
28+
name: codefresh-token
29+
type: Opaque
30+
data:
31+
token: c29tZS10ZXN0LXBhc3N3b3Jk # some-test-password

‎charts/argo-cd/ci/external-redis-values.yaml‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,19 @@ externalRedis:
1111
host: "redis-master.redis.svc.cluster.local"
1212
password: "argocd"
1313

14-
# these tests only support vanilla argo-cd
15-
# do not work for event reporter component
16-
eventReporter:
17-
enabled: false
14+
# needed for correct work of event reporter component
15+
extraObjects:
16+
- apiVersion: v1
17+
kind: Secret
18+
metadata:
19+
name: argocd-token
20+
type: Opaque
21+
data:
22+
token: c29tZS10ZXN0LXBhc3N3b3Jk # some-test-password
23+
- apiVersion: v1
24+
kind: Secret
25+
metadata:
26+
name: codefresh-token
27+
type: Opaque
28+
data:
29+
token: c29tZS10ZXN0LXBhc3N3b3Jk # some-test-password

‎charts/argo-cd/ci/ha-autoscaling-values.yaml‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,19 @@ repoServer:
1515
enabled: true
1616
minReplicas: 2
1717

18-
# these tests only support vanilla argo-cd
19-
# do not work for event reporter component
20-
eventReporter:
21-
enabled: false
18+
# needed for correct work of event reporter component
19+
extraObjects:
20+
- apiVersion: v1
21+
kind: Secret
22+
metadata:
23+
name: argocd-token
24+
type: Opaque
25+
data:
26+
token: c29tZS10ZXN0LXBhc3N3b3Jk # some-test-password
27+
- apiVersion: v1
28+
kind: Secret
29+
metadata:
30+
name: codefresh-token
31+
type: Opaque
32+
data:
33+
token: c29tZS10ZXN0LXBhc3N3b3Jk # some-test-password

‎charts/argo-cd/ci/ha-static-values.yaml‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,19 @@ server:
1111
repoServer:
1212
replicas: 2
1313

14-
# these tests only support vanilla argo-cd
15-
# do not work for event reporter component
16-
eventReporter:
17-
enabled: false
14+
# needed for correct work of event reporter component
15+
extraObjects:
16+
- apiVersion: v1
17+
kind: Secret
18+
metadata:
19+
name: argocd-token
20+
type: Opaque
21+
data:
22+
token: c29tZS10ZXN0LXBhc3N3b3Jk # some-test-password
23+
- apiVersion: v1
24+
kind: Secret
25+
metadata:
26+
name: codefresh-token
27+
type: Opaque
28+
data:
29+
token: c29tZS10ZXN0LXBhc3N3b3Jk # some-test-password

0 commit comments

Comments
 (0)