Skip to content

Commit 1f42107

Browse files
anandfanandf
authored
Upgraded ArgoCD operator, ArgoCD to pick up the fix error when route api is not available (#761)
* Upgraded ArgoCD operator, ArgoCD to pick up the fix for Route API not being available Signed-off-by: Anand Francis Joseph <[email protected]> * Reverted operator-sdk version to 1.35 Signed-off-by: Anand Francis Joseph <[email protected]> * fixed a failing test due to mount path mismatch Signed-off-by: Anand Francis Joseph <[email protected]> --------- Signed-off-by: Anand Francis Joseph <[email protected]>
1 parent 658f46b commit 1f42107

File tree

6 files changed

+33
-15
lines changed

6 files changed

+33
-15
lines changed

‎bundle/manifests/gitops-operator.clusterserviceversion.yaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -426,6 +426,13 @@ spec:
426426
- get
427427
- list
428428
- watch
429+
- apiGroups:
430+
- apiregistration.k8s.io
431+
resources:
432+
- apiservices
433+
verbs:
434+
- get
435+
- list
429436
- apiGroups:
430437
- appmesh.k8s.aws
431438
resources:

‎config/rbac/role.yaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,13 @@ rules:
9292
- get
9393
- list
9494
- watch
95+
- apiGroups:
96+
- apiregistration.k8s.io
97+
resources:
98+
- apiservices
99+
verbs:
100+
- get
101+
- list
95102
- apiGroups:
96103
- appmesh.k8s.aws
97104
resources:

‎controllers/gitopsservice_controller.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -190,6 +190,7 @@ type ReconcileGitopsService struct {
190190
//+kubebuilder:rbac:groups="x.getambassador.io",resources=ambassadormappings;mappings,verbs=create;watch;get;update;list;delete
191191
//+kubebuilder:rbac:groups=argoproj.io,resources=notificationsconfigurations;notificationsconfigurations/finalizers,verbs=*
192192
//+kubebuilder:rbac:groups=apiextensions.k8s.io,resources=customresourcedefinitions,verbs=get;list;watch;
193+
//+kubebuilder:rbac:groups="apiregistration.k8s.io",resources="apiservices",verbs=get;list
193194

194195
// Reconcile reads that state of the cluster for a GitopsService object and makes changes based on the state read
195196
// and what is in the GitopsService.Spec

‎go.mod‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
module github.com/redhat-developer/gitops-operator
22

3-
go 1.21
3+
go 1.21.0
44

55
require (
6-
github.com/argoproj-labs/argo-rollouts-manager v0.0.4-0.20240722162401-192dd2c3b5dd
7-
github.com/argoproj-labs/argocd-operator v0.9.0-rc3.0.20240802182151-b4daa97202ef
6+
github.com/argoproj-labs/argo-rollouts-manager v0.0.4-0.20240807084148-a96aa79b5464
7+
github.com/argoproj-labs/argocd-operator v0.9.0-rc3.0.20240808123233-e231fd3340f4
88
github.com/coreos/prometheus-operator v0.40.0
99
github.com/go-logr/logr v1.4.2
1010
github.com/google/go-cmp v0.6.0
@@ -17,17 +17,17 @@ require (
1717
go.uber.org/zap v1.27.0
1818
golang.org/x/mod v0.19.0
1919
gotest.tools v2.2.0+incompatible
20-
k8s.io/api v0.29.2
21-
k8s.io/apiextensions-apiserver v0.29.2
22-
k8s.io/apimachinery v0.29.2
20+
k8s.io/api v0.29.6
21+
k8s.io/apiextensions-apiserver v0.29.6
22+
k8s.io/apimachinery v0.29.6
2323
k8s.io/client-go v12.0.0+incompatible
2424
k8s.io/utils v0.0.0-20240102154912-e7106e64919e
2525
sigs.k8s.io/controller-runtime v0.17.2
2626
sigs.k8s.io/yaml v1.4.0
2727
)
2828

2929
require (
30-
github.com/argoproj/argo-cd/v2 v2.11.6 // indirect
30+
github.com/argoproj/argo-cd/v2 v2.12.0 // indirect
3131
github.com/beorn7/perks v1.0.1 // indirect
3232
github.com/blang/semver/v4 v4.0.0 // indirect
3333
github.com/cert-manager/cert-manager v1.14.4 // indirect
@@ -82,8 +82,9 @@ require (
8282
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
8383
gopkg.in/yaml.v2 v2.4.0 // indirect
8484
gopkg.in/yaml.v3 v3.0.1 // indirect
85-
k8s.io/component-base v0.29.2 // indirect
85+
k8s.io/component-base v0.29.6 // indirect
8686
k8s.io/klog/v2 v2.120.1 // indirect
87+
k8s.io/kube-aggregator v0.29.6 // indirect
8788
k8s.io/kube-openapi v0.0.0-20240227032403-f107216b40e2 // indirect
8889
sigs.k8s.io/gateway-api v1.0.0 // indirect
8990
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect

‎go.sum‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -620,12 +620,12 @@ github.com/apache/arrow/go/v11 v11.0.0/go.mod h1:Eg5OsL5H+e299f7u5ssuXsuHQVEGC4x
620620
github.com/apache/thrift v0.12.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
621621
github.com/apache/thrift v0.13.0/go.mod h1:cp2SuWMxlEZw2r+iP2GNCdIi4C1qmUzdZFSVb+bacwQ=
622622
github.com/apache/thrift v0.16.0/go.mod h1:PHK3hniurgQaNMZYaCLEqXKsYK8upmhPbmdP2FXSqgU=
623-
github.com/argoproj-labs/argo-rollouts-manager v0.0.4-0.20240722162401-192dd2c3b5dd h1:SA081fH129BJ8kAYUEefO2nVjRvXOf7xxRdsvaM5HDw=
624-
github.com/argoproj-labs/argo-rollouts-manager v0.0.4-0.20240722162401-192dd2c3b5dd/go.mod h1:seR9B+tx6AbGaya+JA61HDBFciKx7FM7t/1IMhOwXlM=
625-
github.com/argoproj-labs/argocd-operator v0.9.0-rc3.0.20240802182151-b4daa97202ef h1:Mbqo5TYtd6I4wriKY424gdISnkMHK3Zvcio2DlqUqaQ=
626-
github.com/argoproj-labs/argocd-operator v0.9.0-rc3.0.20240802182151-b4daa97202ef/go.mod h1:OWhagjNeROw0f/b1FDofceqYQ1TMun1U70wp+cYA5HA=
627-
github.com/argoproj/argo-cd/v2 v2.11.6 h1:rAqp1oduTOaugPjlhmjDmjY+zf1chBEX/5SQZItXDcY=
628-
github.com/argoproj/argo-cd/v2 v2.11.6/go.mod h1:RfmtLRki6JBwq9jkgCMie9MzfvYqs0DfzbuG3JcDrPk=
623+
github.com/argoproj-labs/argo-rollouts-manager v0.0.4-0.20240807084148-a96aa79b5464 h1:LTMoDmQoIjqhe+pulFiG7l80pnjjZX6WiivURO2uXsQ=
624+
github.com/argoproj-labs/argo-rollouts-manager v0.0.4-0.20240807084148-a96aa79b5464/go.mod h1:seR9B+tx6AbGaya+JA61HDBFciKx7FM7t/1IMhOwXlM=
625+
github.com/argoproj-labs/argocd-operator v0.9.0-rc3.0.20240808123233-e231fd3340f4 h1:DFFAnZ6GiNhNdfpBTgmdR+WkkI2usEgo+HSWH1KR2d8=
626+
github.com/argoproj-labs/argocd-operator v0.9.0-rc3.0.20240808123233-e231fd3340f4/go.mod h1:lO/2YsF+M1gU6X0NXmDJ8u0+iWzweQ3/Rx+MgcyXeEU=
627+
github.com/argoproj/argo-cd/v2 v2.12.0 h1:0F8nMPZ3kMvTF6i07lEOVp5ZR6r+xgP9aO8J/KuZ/DM=
628+
github.com/argoproj/argo-cd/v2 v2.12.0/go.mod h1:QbdGVT7f4aqrowJrMlJdoeKknLVcKKr5YDrzm1mVRmI=
629629
github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
630630
github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
631631
github.com/armon/go-metrics v0.3.0/go.mod h1:zXjbSimjXTd7vOpY8B0/2LpvNvDoXBuplAD+gJD3GYs=
@@ -2356,6 +2356,8 @@ k8s.io/klog/v2 v2.100.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0=
23562356
k8s.io/klog/v2 v2.120.1 h1:QXU6cPEOIslTGvZaXvFWiP9VKyeet3sawzTOvdXb4Vw=
23572357
k8s.io/klog/v2 v2.120.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
23582358
k8s.io/kms v0.28.3/go.mod h1:kSMjU2tg7vjqqoWVVCcmPmNZ/CofPsoTbSxAipCvZuE=
2359+
k8s.io/kube-aggregator v0.28.3 h1:CVbj3+cpshSHR5dWPzLYx3sVpIDEPLlzMSxY/lAc9cM=
2360+
k8s.io/kube-aggregator v0.28.3/go.mod h1:5DyLevbRTcWnT1f9b+lB3BfbXC1w7gDa/OtB6kKInCw=
23592361
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 h1:LyMgNKD2P8Wn1iAwQU5OhxCKlKJy0sHc+PcDwFB24dQ=
23602362
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9/go.mod h1:wZK2AVp1uHCp4VamDVgBP2COHZjqD1T68Rf0CM3YjSM=
23612363
k8s.io/utils v0.0.0-20191114200735-6ca3b61696b6/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew=

‎test/openshift/e2e/parallel/1-104_validate_applicationset_tls_scm_volume_mount/01-assert.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ spec:
5050
name: gpg-keyring
5151
- mountPath: /tmp
5252
name: tmp
53-
- mountPath: /app/tls/scm/cert
53+
- mountPath: /app/tls/scm/
5454
name: appset-gitlab-scm-tls-cert
5555
volumes:
5656
- configMap:

0 commit comments

Comments
 (0)