Merge pull request #656 from ishitasequeira/update-rollouts-manager

chore: update rollouts manager to 0.0.2 with crds
redhat-developer · Mar 1, 2024 · 9093ffb · 9093ffb
2 parents 37e61a5 + 8ca926c
commit 9093ffb
Show file tree

Hide file tree

Showing 10 changed files with 465 additions and 12 deletions.
diff --git a/bundle/manifests/argoproj.io_analysisruns.yaml b/bundle/manifests/argoproj.io_analysisruns.yaml
@@ -14,6 +14,7 @@ spec:
     shortNames:
     - ar
     singular: analysisrun
+  preserveUnknownFields: false
   scope: Namespaced
   versions:
   - additionalPrinterColumns:

diff --git a/bundle/manifests/argoproj.io_analysistemplates.yaml b/bundle/manifests/argoproj.io_analysistemplates.yaml
@@ -14,6 +14,7 @@ spec:
     shortNames:
     - at
     singular: analysistemplate
+  preserveUnknownFields: false
   scope: Namespaced
   versions:
   - additionalPrinterColumns:

diff --git a/bundle/manifests/argoproj.io_clusteranalysistemplates.yaml b/bundle/manifests/argoproj.io_clusteranalysistemplates.yaml
@@ -14,6 +14,7 @@ spec:
     shortNames:
     - cat
     singular: clusteranalysistemplate
+  preserveUnknownFields: false
   scope: Cluster
   versions:
   - additionalPrinterColumns:

diff --git a/bundle/manifests/argoproj.io_experiments.yaml b/bundle/manifests/argoproj.io_experiments.yaml
@@ -14,6 +14,7 @@ spec:
     shortNames:
     - exp
     singular: experiment
+  preserveUnknownFields: false
   scope: Namespaced
   versions:
   - additionalPrinterColumns:

diff --git a/bundle/manifests/argoproj.io_rollouts.yaml b/bundle/manifests/argoproj.io_rollouts.yaml
diff --git a/go.mod b/go.mod
@@ -3,7 +3,7 @@ module github.com/redhat-developer/gitops-operator
 go 1.21
 
 require (
-	github.com/argoproj-labs/argo-rollouts-manager v0.0.2-0.20230515023837-0632f3e856d5
+	github.com/argoproj-labs/argo-rollouts-manager v0.0.2
 	github.com/argoproj-labs/argocd-operator v0.10.0
 	github.com/coreos/prometheus-operator v0.40.0
 	github.com/go-logr/logr v1.4.1
@@ -27,6 +27,7 @@ require (
 
 require (
 	github.com/argoproj/argo-cd/v2 v2.10.1 // indirect
+	github.com/argoproj/argo-rollouts v1.6.6 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/blang/semver/v4 v4.0.0 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect

diff --git a/go.sum b/go.sum
@@ -637,12 +637,14 @@ github.com/apache/arrow/go/v11 v11.0.0/go.mod h1:Eg5OsL5H+e299f7u5ssuXsuHQVEGC4x
 github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
 github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
 github.com/apache/thrift v0.16.0/go.mod h1:PHK3hniurgQaNMZYaCLEqXKsYK8upmhPbmdP2FXSqgU=
-github.com/argoproj-labs/argo-rollouts-manager v0.0.2-0.20230515023837-0632f3e856d5 h1:SlFbeNb42H7DUGzE9B/uYYjlQjNSR4y+eaWiTqN3PGs=
-github.com/argoproj-labs/argo-rollouts-manager v0.0.2-0.20230515023837-0632f3e856d5/go.mod h1:AiEjAr6e/DCDiicjoC7W7LaZdO28sfgoBhjbGryzEZ8=
+github.com/argoproj-labs/argo-rollouts-manager v0.0.2 h1:f7V6PP1J9vkhYNsMbCWwB4hHqqgJvs+IbT2RFLsn9ho=
+github.com/argoproj-labs/argo-rollouts-manager v0.0.2/go.mod h1:r6/vgsXjS3ZdzfrP8QyDHtoFoKXLbVUIndkPeMzHJGc=
 github.com/argoproj-labs/argocd-operator v0.10.0 h1:B2k6Rwiff3O7fG3K7nNiFuo9TV7Kr0s/K9f4Mo+5Qak=
 github.com/argoproj-labs/argocd-operator v0.10.0/go.mod h1:4TThdvK88j46P6ybACEhHHqJstdnF+CFHkmlS068dqk=
 github.com/argoproj/argo-cd/v2 v2.10.1 h1:VD06GPeoq14Bo7IfiW+EKim3T1C9xaMElVrEtw+zll0=
 github.com/argoproj/argo-cd/v2 v2.10.1/go.mod h1:SK1uGZ9xWVzxuyg079MaO6+hz/Oz9wSDkGyT0gEkYSs=
+github.com/argoproj/argo-rollouts v1.6.6 h1:JCJ0cGAwWkh2xCAHZ1OQmrobysRjCatmG9IZaLJpS1g=
+github.com/argoproj/argo-rollouts v1.6.6/go.mod h1:X2kTiBaYCSounmw1kmONdIZTwJNzNQYC0SrXUgSw9UI=
 github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
 github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
 github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=

diff --git a/test/openshift/e2e/parallel/1-031_validate_toolchain/01-check.yaml b/test/openshift/e2e/parallel/1-031_validate_toolchain/01-check.yaml
@@ -7,8 +7,8 @@ commands:
 
       # These variables need to be maintained according to the component matrix: https://spaces.redhat.com/display/GITOPS/GitOps+Component+Matrix
       expected_kustomizeVersion='v5.2.1'
-      expected_helmVersion='v3.13.2'
-      expected_argocdVersion='v2.9.2'
+      expected_helmVersion='v3.14.0'
+      expected_argocdVersion='v2.10.1+a79e0ea'
       
       if CI="prow"; then
       # when running against openshift-ci

diff --git a/test/openshift/e2e/parallel/1-090_validate_permissions/01-assert.yaml b/test/openshift/e2e/parallel/1-090_validate_permissions/01-assert.yaml
diff --git a/test/openshift/e2e/parallel/1-101_validate_rollout_policyrules/01-assert.yaml b/test/openshift/e2e/parallel/1-101_validate_rollout_policyrules/01-assert.yaml
@@ -3,6 +3,10 @@ apiVersion: rbac.authorization.k8s.io/v1
 kind: Role
 metadata:
   name: argo-rollouts
+  labels:
+    app.kubernetes.io/component: argo-rollouts
+    app.kubernetes.io/name: argo-rollouts
+    app.kubernetes.io/part-of: argo-rollouts
 rules:
 - apiGroups:
   - argoproj.io
@@ -209,3 +213,11 @@ rules:
   - watch
   - get
   - update
+- apiGroups:
+  - apisix.apache.org
+  resources:
+  - apisixroutes
+  verbs:
+  - watch
+  - get
+  - update