Skip to content

Commit 46c43ce

Browse files
nmiraschsvghadivarshab1210
authored
Upgrade Argo CD to v3 in GitOps operator (#918)
* Upgrade Argo CD to v3 in GitOps operator Signed-off-by: nmirasch <[email protected]> * Update CRDs Signed-off-by: Siddhesh Ghadi <[email protected]> * Update golang to 1.24 in CI Signed-off-by: Siddhesh Ghadi <[email protected]> * Try brew image Signed-off-by: Siddhesh Ghadi <[email protected]> * Use mirrored image Signed-off-by: Siddhesh Ghadi <[email protected]> * Add root user to dockerfiles Signed-off-by: Siddhesh Ghadi <[email protected]> * Use different image' Signed-off-by: Siddhesh Ghadi <[email protected]> * Revert "Add root user to dockerfiles" This reverts commit 34ac4b3. * Revert ci-operator changes Signed-off-by: Siddhesh Ghadi <[email protected]> * Use SkipNameValidation to avoid controller name validation With controller-runtime v0.19.0, unique controller name validation is enforced. The operator fails to start due to this as we don't have unique names. Use SkipNameValidation to ingnore the uniquness check and prevent panic. Signed-off-by: Siddhesh Ghadi <[email protected]> * Try rhel9 image Signed-off-by: Siddhesh Ghadi <[email protected]> * Update operator to latest commit Signed-off-by: Siddhesh Ghadi <[email protected]> * Try new golang image Signed-off-by: Siddhesh Ghadi <[email protected]> * Update ci operator Signed-off-by: Siddhesh Ghadi <[email protected]> * Fix rollouts upgrade hack go.sum Signed-off-by: Siddhesh Ghadi <[email protected]> * add ginkgo test changes Signed-off-by: Varsha B <[email protected]> * Fix vendoring Signed-off-by: Siddhesh Ghadi <[email protected]> * Update base image Signed-off-by: Siddhesh Ghadi <[email protected]> * fix old e2e tests Signed-off-by: Siddhesh Ghadi <[email protected]> * Update Argo CD to v3.0.11 Signed-off-by: Siddhesh Ghadi <[email protected]> --------- Signed-off-by: nmirasch <[email protected]> Signed-off-by: Siddhesh Ghadi <[email protected]> Signed-off-by: Varsha B <[email protected]> Co-authored-by: Siddhesh Ghadi <[email protected]> Co-authored-by: Varsha B <[email protected]>
1 parent ad92261 commit 46c43ce

File tree

53 files changed

+5916
-3750
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+5916
-3750
lines changed

‎.ci-operator.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
build_root_image:
2-
name: release
3-
namespace: openshift
4-
tag: golang-1.22
2+
name: builder
3+
namespace: ocp
4+
tag: rhel-9-golang-1.24-openshift-4.20

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build the manager binary
2-
FROM golang:1.22 as builder
2+
FROM golang:1.24 as builder
33

44
WORKDIR /workspace
55
# Copy the Go Modules manifests

‎Makefile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -116,8 +116,8 @@ test-all: manifests generate fmt vet ## Run all tests.
116116

117117
.PHONY: test-e2e
118118
test-e2e: manifests generate fmt vet ## Run e2e tests.
119-
go test -p 1 -timeout 1h ./test/e2e -coverprofile cover.out -ginkgo.v
120-
go test -p 1 -timeout 1h ./test/nondefaulte2e -coverprofile cover.out -ginkgo.v
119+
REDIS_CONFIG_PATH="build/redis" go test -p 1 -timeout 1h ./test/e2e -coverprofile cover.out -ginkgo.v
120+
REDIS_CONFIG_PATH="build/redis" go test -p 1 -timeout 1h ./test/nondefaulte2e -coverprofile cover.out -ginkgo.v
121121

122122
.PHONY: test-metrics
123123
test-metrics:
@@ -152,7 +152,7 @@ test-gitopsservice-nondefault:
152152

153153
.PHONY: test
154154
test: manifests generate fmt vet ## Run unit tests.
155-
go test `go list ./... | grep -v test` -coverprofile cover.out
155+
REDIS_CONFIG_PATH="build/redis" go test `go list ./... | grep -v test` -coverprofile cover.out
156156

157157

158158
.PHONY: e2e-tests-ginkgo
@@ -267,7 +267,7 @@ undeploy: ## Undeploy controller from the K8s cluster specified in ~/.kube/confi
267267
CONTROLLER_GEN = $(shell pwd)/bin/controller-gen
268268
.PHONY: controller-gen
269269
controller-gen: ## Download controller-gen locally if necessary.
270-
$(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0)
270+
$(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.18.0)
271271

272272
KUSTOMIZE = $(shell pwd)/bin/kustomize
273273
.PHONY: kustomize

‎bundle/manifests/argoproj.io_applications.yaml‎

Lines changed: 142 additions & 7 deletions
Large diffs are not rendered by default.

‎bundle/manifests/argoproj.io_applicationsets.yaml‎

Lines changed: 204 additions & 0 deletions
Large diffs are not rendered by default.

‎bundle/manifests/argoproj.io_appprojects.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -279,6 +279,10 @@ spec:
279279
description: SyncWindow contains the kind, time, duration and attributes
280280
that are used to assign the syncWindows to apps
281281
properties:
282+
andOperator:
283+
description: UseAndOperator use AND operator for matching applications,
284+
namespaces and clusters instead of the default OR operator
285+
type: boolean
282286
applications:
283287
description: Applications contains a list of applications that
284288
the window will apply to

‎bundle/manifests/argoproj.io_argocds.yaml‎

Lines changed: 2331 additions & 787 deletions
Large diffs are not rendered by default.

‎bundle/manifests/argoproj.io_notificationsconfigurations.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.14.0
5+
controller-gen.kubebuilder.io/version: v0.18.0
66
creationTimestamp: null
77
name: notificationsconfigurations.argoproj.io
88
spec:

0 commit comments

Comments
 (0)