Skip to content

Commit 1a490e3

Browse files
authored
fix: fix ssh clone issue on fips clusters and update deps (#977)
* Update deps for v1.16.4 Signed-off-by: Siddhesh Ghadi <sghadi1203@gmail.com> * Fix test Signed-off-by: Siddhesh Ghadi <sghadi1203@gmail.com> * Update prometheus dep Signed-off-by: Siddhesh Ghadi <sghadi1203@gmail.com> * Add jq install Signed-off-by: Siddhesh Ghadi <sghadi1203@gmail.com> * Refactor infra test Signed-off-by: Siddhesh Ghadi <sghadi1203@gmail.com> * Fix ssh issue on fips clusters Signed-off-by: Siddhesh Ghadi <sghadi1203@gmail.com> * missing go.sum changes Signed-off-by: Siddhesh Ghadi <sghadi1203@gmail.com> * Fix formatting Signed-off-by: Siddhesh Ghadi <sghadi1203@gmail.com> --------- Signed-off-by: Siddhesh Ghadi <sghadi1203@gmail.com>
1 parent ba637f0 commit 1a490e3

File tree

19 files changed

+435
-2571
lines changed

19 files changed

+435
-2571
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: openshift-gitops-go-toolset
3+
namespace: ci
4+
tag: 1.24.6

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: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ undeploy: ## Undeploy controller from the K8s cluster specified in ~/.kube/confi
251251
CONTROLLER_GEN = $(shell pwd)/bin/controller-gen
252252
.PHONY: controller-gen
253253
controller-gen: ## Download controller-gen locally if necessary.
254-
$(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0)
254+
$(call go-get-tool,$(CONTROLLER_GEN),sigs.k8s.io/controller-tools/cmd/controller-gen@v0.17.3)
255255

256256
KUSTOMIZE = $(shell pwd)/bin/kustomize
257257
.PHONY: kustomize

bundle/manifests/gitops-operator.clusterserviceversion.yaml

Lines changed: 15 additions & 183 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ metadata:
180180
capabilities: Deep Insights
181181
console.openshift.io/plugins: '["gitops-plugin"]'
182182
containerImage: quay.io/redhat-developer/gitops-operator
183-
createdAt: "2025-03-07T13:13:07Z"
183+
createdAt: "2025-09-30T07:01:55Z"
184184
description: Enables teams to adopt GitOps principles for managing cluster configurations
185185
and application delivery across hybrid multi-cluster Kubernetes environments.
186186
features.operators.openshift.io/disconnected: "true"
@@ -359,25 +359,6 @@ spec:
359359
- endpoints
360360
- events
361361
- namespaces
362-
- pods
363-
- secrets
364-
- serviceaccounts
365-
- services
366-
- services/finalizers
367-
verbs:
368-
- create
369-
- delete
370-
- get
371-
- list
372-
- patch
373-
- update
374-
- watch
375-
- apiGroups:
376-
- ""
377-
resources:
378-
- configmaps
379-
- endpoints
380-
- events
381362
- persistentvolumeclaims
382363
- pods
383364
- secrets
@@ -396,22 +377,11 @@ spec:
396377
- ""
397378
resources:
398379
- deployments
380+
- podtemplates
399381
verbs:
400382
- get
401383
- list
402384
- watch
403-
- apiGroups:
404-
- ""
405-
resources:
406-
- namespaces
407-
- resourcequotas
408-
verbs:
409-
- create
410-
- delete
411-
- get
412-
- list
413-
- update
414-
- watch
415385
- apiGroups:
416386
- ""
417387
resources:
@@ -427,10 +397,13 @@ spec:
427397
- apiGroups:
428398
- ""
429399
resources:
430-
- podtemplates
400+
- resourcequotas
431401
verbs:
402+
- create
403+
- delete
432404
- get
433405
- list
406+
- update
434407
- watch
435408
- apiGroups:
436409
- apiextensions.k8s.io
@@ -471,22 +444,9 @@ spec:
471444
resources:
472445
- daemonsets
473446
- deployments
474-
- replicasets
475-
- statefulsets
476-
verbs:
477-
- create
478-
- delete
479-
- get
480-
- list
481-
- patch
482-
- update
483-
- watch
484-
- apiGroups:
485-
- apps
486-
resources:
487-
- deployments
488447
- podtemplates
489448
- replicasets
449+
- statefulsets
490450
verbs:
491451
- create
492452
- delete
@@ -526,21 +486,14 @@ spec:
526486
resources:
527487
- analysisruns
528488
- analysisruns/finalizers
489+
- analysistemplates
490+
- clusteranalysistemplates
529491
- experiments
530492
- experiments/finalizers
531-
verbs:
532-
- create
533-
- delete
534-
- deletecollection
535-
- get
536-
- list
537-
- patch
538-
- update
539-
- watch
540-
- apiGroups:
541-
- argoproj.io
542-
resources:
543-
- analysistemplates
493+
- rollouts
494+
- rollouts/finalizers
495+
- rollouts/scale
496+
- rollouts/status
544497
verbs:
545498
- create
546499
- delete
@@ -558,6 +511,7 @@ spec:
558511
- argocds
559512
- argocds/finalizers
560513
- argocds/status
514+
- rolloutmanagers
561515
verbs:
562516
- create
563517
- delete
@@ -566,38 +520,13 @@ spec:
566520
- patch
567521
- update
568522
- watch
569-
- apiGroups:
570-
- argoproj.io
571-
resources:
572-
- clusteranalysistemplates
573-
verbs:
574-
- create
575-
- delete
576-
- deletecollection
577-
- get
578-
- list
579-
- patch
580-
- update
581-
- watch
582523
- apiGroups:
583524
- argoproj.io
584525
resources:
585526
- notificationsconfigurations
586527
- notificationsconfigurations/finalizers
587528
verbs:
588529
- '*'
589-
- apiGroups:
590-
- argoproj.io
591-
resources:
592-
- rolloutmanagers
593-
verbs:
594-
- create
595-
- delete
596-
- get
597-
- list
598-
- patch
599-
- update
600-
- watch
601530
- apiGroups:
602531
- argoproj.io
603532
resources:
@@ -612,22 +541,6 @@ spec:
612541
- get
613542
- patch
614543
- update
615-
- apiGroups:
616-
- argoproj.io
617-
resources:
618-
- rollouts
619-
- rollouts/finalizers
620-
- rollouts/scale
621-
- rollouts/status
622-
verbs:
623-
- create
624-
- delete
625-
- deletecollection
626-
- get
627-
- list
628-
- patch
629-
- update
630-
- watch
631544
- apiGroups:
632545
- autoscaling
633546
resources:
@@ -653,18 +566,6 @@ spec:
653566
- patch
654567
- update
655568
- watch
656-
- apiGroups:
657-
- batch
658-
resources:
659-
- jobs
660-
verbs:
661-
- create
662-
- delete
663-
- get
664-
- list
665-
- patch
666-
- update
667-
- watch
668569
- apiGroups:
669570
- config.openshift.io
670571
resources:
@@ -688,17 +589,6 @@ spec:
688589
- console.openshift.io
689590
resources:
690591
- consolelinks
691-
verbs:
692-
- create
693-
- delete
694-
- get
695-
- list
696-
- patch
697-
- update
698-
- watch
699-
- apiGroups:
700-
- console.openshift.io
701-
resources:
702592
- consoleplugins
703593
verbs:
704594
- create
@@ -735,6 +625,7 @@ spec:
735625
- watch
736626
- apiGroups:
737627
- getambassador.io
628+
- x.getambassador.io
738629
resources:
739630
- ambassadormappings
740631
- mappings
@@ -770,17 +661,6 @@ spec:
770661
- patch
771662
- update
772663
- watch
773-
- apiGroups:
774-
- networking.k8s.io
775-
resources:
776-
- ingresses
777-
verbs:
778-
- create
779-
- get
780-
- list
781-
- patch
782-
- update
783-
- watch
784664
- apiGroups:
785665
- networking.k8s.io
786666
resources:
@@ -821,17 +701,6 @@ spec:
821701
- pipelines.openshift.io
822702
resources:
823703
- '*'
824-
verbs:
825-
- create
826-
- delete
827-
- get
828-
- list
829-
- patch
830-
- update
831-
- watch
832-
- apiGroups:
833-
- pipelines.openshift.io
834-
resources:
835704
- gitopsservices
836705
verbs:
837706
- create
@@ -859,20 +728,6 @@ spec:
859728
- rbac.authorization.k8s.io
860729
resources:
861730
- '*'
862-
verbs:
863-
- bind
864-
- create
865-
- delete
866-
- deletecollection
867-
- escalate
868-
- get
869-
- list
870-
- patch
871-
- update
872-
- watch
873-
- apiGroups:
874-
- rbac.authorization.k8s.io
875-
resources:
876731
- clusterrolebindings
877732
- clusterroles
878733
verbs:
@@ -903,17 +758,6 @@ spec:
903758
- route.openshift.io
904759
resources:
905760
- '*'
906-
verbs:
907-
- create
908-
- delete
909-
- get
910-
- list
911-
- patch
912-
- update
913-
- watch
914-
- apiGroups:
915-
- route.openshift.io
916-
resources:
917761
- routes
918762
- routes/custom-host
919763
verbs:
@@ -956,18 +800,6 @@ spec:
956800
- get
957801
- update
958802
- watch
959-
- apiGroups:
960-
- x.getambassador.io
961-
resources:
962-
- ambassadormappings
963-
- mappings
964-
verbs:
965-
- create
966-
- delete
967-
- get
968-
- list
969-
- update
970-
- watch
971803
- apiGroups:
972804
- authentication.k8s.io
973805
resources:

bundle/manifests/pipelines.openshift.io_gitopsservices.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.17.3
66
creationTimestamp: null
77
name: gitopsservices.pipelines.openshift.io
88
spec:

0 commit comments

Comments
 (0)