Skip to content

Commit 9093ffb

Browse files
Merge pull request #656 from ishitasequeira/update-rollouts-manager
chore: update rollouts manager to 0.0.2 with crds
2 parents 37e61a5 + 8ca926c commit 9093ffb

File tree

10 files changed

+465
-12
lines changed

10 files changed

+465
-12
lines changed

bundle/manifests/argoproj.io_analysisruns.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ spec:
1414
shortNames:
1515
- ar
1616
singular: analysisrun
17+
preserveUnknownFields: false
1718
scope: Namespaced
1819
versions:
1920
- additionalPrinterColumns:

bundle/manifests/argoproj.io_analysistemplates.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ spec:
1414
shortNames:
1515
- at
1616
singular: analysistemplate
17+
preserveUnknownFields: false
1718
scope: Namespaced
1819
versions:
1920
- additionalPrinterColumns:

bundle/manifests/argoproj.io_clusteranalysistemplates.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ spec:
1414
shortNames:
1515
- cat
1616
singular: clusteranalysistemplate
17+
preserveUnknownFields: false
1718
scope: Cluster
1819
versions:
1920
- additionalPrinterColumns:

bundle/manifests/argoproj.io_experiments.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ spec:
1414
shortNames:
1515
- exp
1616
singular: experiment
17+
preserveUnknownFields: false
1718
scope: Namespaced
1819
versions:
1920
- additionalPrinterColumns:

bundle/manifests/argoproj.io_rollouts.yaml

Lines changed: 139 additions & 6 deletions
Large diffs are not rendered by default.

go.mod

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/redhat-developer/gitops-operator
33
go 1.21
44

55
require (
6-
github.com/argoproj-labs/argo-rollouts-manager v0.0.2-0.20230515023837-0632f3e856d5
6+
github.com/argoproj-labs/argo-rollouts-manager v0.0.2
77
github.com/argoproj-labs/argocd-operator v0.10.0
88
github.com/coreos/prometheus-operator v0.40.0
99
github.com/go-logr/logr v1.4.1
@@ -27,6 +27,7 @@ require (
2727

2828
require (
2929
github.com/argoproj/argo-cd/v2 v2.10.1 // indirect
30+
github.com/argoproj/argo-rollouts v1.6.6 // indirect
3031
github.com/beorn7/perks v1.0.1 // indirect
3132
github.com/blang/semver/v4 v4.0.0 // indirect
3233
github.com/cespare/xxhash/v2 v2.2.0 // indirect

go.sum

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -637,12 +637,14 @@ github.com/apache/arrow/go/v11 v11.0.0/go.mod h1:Eg5OsL5H+e299f7u5ssuXsuHQVEGC4x
637637
github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
638638
github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
639639
github.com/apache/thrift v0.16.0/go.mod h1:PHK3hniurgQaNMZYaCLEqXKsYK8upmhPbmdP2FXSqgU=
640-
github.com/argoproj-labs/argo-rollouts-manager v0.0.2-0.20230515023837-0632f3e856d5 h1:SlFbeNb42H7DUGzE9B/uYYjlQjNSR4y+eaWiTqN3PGs=
641-
github.com/argoproj-labs/argo-rollouts-manager v0.0.2-0.20230515023837-0632f3e856d5/go.mod h1:AiEjAr6e/DCDiicjoC7W7LaZdO28sfgoBhjbGryzEZ8=
640+
github.com/argoproj-labs/argo-rollouts-manager v0.0.2 h1:f7V6PP1J9vkhYNsMbCWwB4hHqqgJvs+IbT2RFLsn9ho=
641+
github.com/argoproj-labs/argo-rollouts-manager v0.0.2/go.mod h1:r6/vgsXjS3ZdzfrP8QyDHtoFoKXLbVUIndkPeMzHJGc=
642642
github.com/argoproj-labs/argocd-operator v0.10.0 h1:B2k6Rwiff3O7fG3K7nNiFuo9TV7Kr0s/K9f4Mo+5Qak=
643643
github.com/argoproj-labs/argocd-operator v0.10.0/go.mod h1:4TThdvK88j46P6ybACEhHHqJstdnF+CFHkmlS068dqk=
644644
github.com/argoproj/argo-cd/v2 v2.10.1 h1:VD06GPeoq14Bo7IfiW+EKim3T1C9xaMElVrEtw+zll0=
645645
github.com/argoproj/argo-cd/v2 v2.10.1/go.mod h1:SK1uGZ9xWVzxuyg079MaO6+hz/Oz9wSDkGyT0gEkYSs=
646+
github.com/argoproj/argo-rollouts v1.6.6 h1:JCJ0cGAwWkh2xCAHZ1OQmrobysRjCatmG9IZaLJpS1g=
647+
github.com/argoproj/argo-rollouts v1.6.6/go.mod h1:X2kTiBaYCSounmw1kmONdIZTwJNzNQYC0SrXUgSw9UI=
646648
github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
647649
github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
648650
github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=

test/openshift/e2e/parallel/1-031_validate_toolchain/01-check.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ commands:
77
88
# These variables need to be maintained according to the component matrix: https://spaces.redhat.com/display/GITOPS/GitOps+Component+Matrix
99
expected_kustomizeVersion='v5.2.1'
10-
expected_helmVersion='v3.13.2'
11-
expected_argocdVersion='v2.9.2'
10+
expected_helmVersion='v3.14.0'
11+
expected_argocdVersion='v2.10.1+a79e0ea'
1212
1313
if CI="prow"; then
1414
# when running against openshift-ci

test/openshift/e2e/parallel/1-090_validate_permissions/01-assert.yaml

Lines changed: 302 additions & 1 deletion
Large diffs are not rendered by default.

test/openshift/e2e/parallel/1-101_validate_rollout_policyrules/01-assert.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,10 @@ apiVersion: rbac.authorization.k8s.io/v1
33
kind: Role
44
metadata:
55
name: argo-rollouts
6+
labels:
7+
app.kubernetes.io/component: argo-rollouts
8+
app.kubernetes.io/name: argo-rollouts
9+
app.kubernetes.io/part-of: argo-rollouts
610
rules:
711
- apiGroups:
812
- argoproj.io
@@ -209,3 +213,11 @@ rules:
209213
- watch
210214
- get
211215
- update
216+
- apiGroups:
217+
- apisix.apache.org
218+
resources:
219+
- apisixroutes
220+
verbs:
221+
- watch
222+
- get
223+
- update

0 commit comments

Comments
 (0)