Skip to content

Commit 661b784

Browse files
jaideepr97varshab1210svghadi
authored
* update to go 1.20; disable http2 for servers; upgrade k8s packages Signed-off-by: Jaideep Rao <[email protected]> * remove secure serving option for metrics Signed-off-by: Jaideep Rao <[email protected]> * Changing go version for CI Signed-off-by: varshab1210 <[email protected]> * Disable http/2 on webhook server Signed-off-by: Siddhesh Ghadi <[email protected]> * Revert "Disable http/2 on webhook server" This reverts commit 6cff7f8. Previous changes work as expected. Signed-off-by: Siddhesh Ghadi <[email protected]> * consume keycloak segmentation fault fix Signed-off-by: Jaideep Rao <[email protected]> * update kube-rbac-proxy image Signed-off-by: Jaideep Rao <[email protected]> * undo makefile changes Signed-off-by: Jaideep Rao <[email protected]> * disable http2 for kube-rbac-proxy Signed-off-by: Jaideep Rao <[email protected]> * switch to floating tag for kube-rbac-proxy image Signed-off-by: Jaideep Rao <[email protected]> * consume argocd-operator commit Signed-off-by: Jaideep Rao <[email protected]> * remove http2 disable command line arg Signed-off-by: Jaideep Rao <[email protected]> --------- Signed-off-by: Jaideep Rao <[email protected]> Signed-off-by: varshab1210 <[email protected]> Signed-off-by: Siddhesh Ghadi <[email protected]> Co-authored-by: varshab1210 <[email protected]> Co-authored-by: Siddhesh Ghadi <[email protected]>
1 parent 13c8a02 commit 661b784

11 files changed

+1183
-281
lines changed

‎.ci-operator.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
build_root_image:
22
name: release
33
namespace: openshift
4-
tag: golang-1.19
4+
tag: golang-1.20

‎Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build the manager binary
2-
FROM golang:1.19 as builder
2+
FROM golang:1.20 as builder
33

44
WORKDIR /workspace
55
# Copy the Go Modules manifests

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -931,7 +931,7 @@ spec:
931931
- --tls-private-key-file=/etc/tls/private/tls.key
932932
- --logtostderr=true
933933
- --allow-paths=/metrics
934-
image: registry.redhat.io/openshift4/ose-kube-rbac-proxy@sha256:da5d5061dbc2ec5082cf14b6c600fb5400b83cf91d7ccebfa80680a238d275db
934+
image: registry.redhat.io/openshift4/ose-kube-rbac-proxy:v4.13
935935
name: kube-rbac-proxy
936936
ports:
937937
- containerPort: 8443

‎config/default/manager_auth_proxy_patch.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ spec:
1313
spec:
1414
containers:
1515
- name: kube-rbac-proxy
16-
image: registry.redhat.io/openshift4/ose-kube-rbac-proxy@sha256:da5d5061dbc2ec5082cf14b6c600fb5400b83cf91d7ccebfa80680a238d275db
16+
image: registry.redhat.io/openshift4/ose-kube-rbac-proxy:v4.13
1717
args:
1818
- --secure-listen-address=0.0.0.0:8443
1919
- --upstream=http://127.0.0.1:8080

‎controllers/argocd_metrics_controller_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ func newClient(s *runtime.Scheme, namespace, name string) client.Client {
6464
Namespace: namespace,
6565
},
6666
}
67-
return fake.NewFakeClientWithScheme(s, &ns, &argocd)
67+
return fake.NewClientBuilder().WithScheme(s).WithObjects(&ns, &argocd).Build()
6868
}
6969

7070
func newMetricsReconciler(t *testing.T, namespace, name string) ArgoCDMetricsReconciler {

‎controllers/gitopsservice_controller_test.go

+7-7
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@ func TestReconcile_BackendResourceLimits(t *testing.T) {
382382
s := scheme.Scheme
383383
addKnownTypesToScheme(s)
384384

385-
fakeClient := fake.NewFakeClientWithScheme(s, util.NewClusterVersion("4.7.1"), newGitopsService())
385+
fakeClient := fake.NewClientBuilder().WithScheme(s).WithObjects(util.NewClusterVersion("4.7.1"), newGitopsService()).Build()
386386
reconciler := newReconcileGitOpsService(fakeClient, s)
387387

388388
_, err := reconciler.Reconcile(context.TODO(), newRequest("test", "test"))
@@ -405,7 +405,7 @@ func TestReconcile_BackendSecurityContext(t *testing.T) {
405405
addKnownTypesToScheme(s)
406406

407407
// Testing on OCP versions < 4.11.0
408-
fakeClient := fake.NewFakeClientWithScheme(s, util.NewClusterVersion("4.10.1"), newGitopsService())
408+
fakeClient := fake.NewClientBuilder().WithScheme(s).WithObjects(util.NewClusterVersion("4.10.1"), newGitopsService()).Build()
409409
reconciler := newReconcileGitOpsService(fakeClient, s)
410410

411411
_, err := reconciler.Reconcile(context.TODO(), newRequest("test", "test"))
@@ -416,7 +416,7 @@ func TestReconcile_BackendSecurityContext(t *testing.T) {
416416
assertNoError(t, err)
417417

418418
// Testing on OCP versions < 4.11.0
419-
fakeClient = fake.NewFakeClientWithScheme(s, util.NewClusterVersion("4.12.1"), newGitopsService())
419+
fakeClient = fake.NewClientBuilder().WithScheme(s).WithObjects(util.NewClusterVersion("4.12.1"), newGitopsService()).Build()
420420
reconciler = newReconcileGitOpsService(fakeClient, s)
421421

422422
_, err = reconciler.Reconcile(context.TODO(), newRequest("test", "test"))
@@ -451,7 +451,7 @@ func TestReconcile_KamSecurityContext(t *testing.T) {
451451
defer util.SetConsoleAPIFound(false)
452452

453453
// Testing on OCP versions < 4.11.0
454-
fakeClient := fake.NewFakeClientWithScheme(s, util.NewClusterVersion("4.12.1"), newGitopsService())
454+
fakeClient := fake.NewClientBuilder().WithScheme(s).WithObjects(util.NewClusterVersion("4.12.1"), newGitopsService()).Build()
455455
reconciler := newReconcileGitOpsService(fakeClient, s)
456456

457457
_, err := reconciler.Reconcile(context.TODO(), newRequest("test", "test"))
@@ -463,7 +463,7 @@ func TestReconcile_KamSecurityContext(t *testing.T) {
463463

464464
// Testing on OCP versions < 4.11.0
465465

466-
fakeClient = fake.NewFakeClientWithScheme(s, util.NewClusterVersion("4.12.1"), newGitopsService())
466+
fakeClient = fake.NewClientBuilder().WithScheme(s).WithObjects(util.NewClusterVersion("4.12.1"), newGitopsService()).Build()
467467
reconciler = newReconcileGitOpsService(fakeClient, s)
468468

469469
_, err = reconciler.Reconcile(context.TODO(), newRequest("test", "test"))
@@ -494,7 +494,7 @@ func TestReconcile_testArgoCDForOperatorUpgrade(t *testing.T) {
494494
s := scheme.Scheme
495495
addKnownTypesToScheme(s)
496496

497-
fakeClient := fake.NewFakeClientWithScheme(s, util.NewClusterVersion("4.7.1"), newGitopsService())
497+
fakeClient := fake.NewClientBuilder().WithScheme(s).WithObjects(util.NewClusterVersion("4.7.1"), newGitopsService()).Build()
498498
reconciler := newReconcileGitOpsService(fakeClient, s)
499499

500500
// Create a basic ArgoCD CR. ArgoCD created by Operator version >= v1.6.0
@@ -548,7 +548,7 @@ func TestReconcile_VerifyResourceQuotaDeletionForUpgrade(t *testing.T) {
548548
s := scheme.Scheme
549549
addKnownTypesToScheme(s)
550550

551-
fakeClient := fake.NewFakeClientWithScheme(s, util.NewClusterVersion("4.7.1"), newGitopsService())
551+
fakeClient := fake.NewClientBuilder().WithScheme(s).WithObjects(util.NewClusterVersion("4.7.1"), newGitopsService()).Build()
552552
reconciler := newReconcileGitOpsService(fakeClient, s)
553553

554554
// Create namespace object for default ArgoCD instance and set resource quota to it.

‎go.mod

+51-61
Original file line numberDiff line numberDiff line change
@@ -1,99 +1,90 @@
11
module github.com/redhat-developer/gitops-operator
22

3-
go 1.19
3+
go 1.20
44

55
require (
66
github.com/argoproj-labs/argo-rollouts-manager v0.0.2-0.20230515023837-0632f3e856d5
7-
github.com/argoproj-labs/argocd-operator v0.0.16-0.20230911190332-91bf13127dd7
7+
github.com/argoproj-labs/argocd-operator v0.0.16-0.20231026135137-c8e49095b254
88
github.com/coreos/prometheus-operator v0.40.0
99
github.com/go-logr/logr v1.2.4
1010
github.com/google/go-cmp v0.5.9
1111
github.com/hashicorp/go-version v1.6.0
1212
github.com/onsi/ginkgo v1.16.5
13-
github.com/onsi/gomega v1.27.6
13+
github.com/onsi/gomega v1.27.10
1414
github.com/openshift/api v3.9.1-0.20190916204813-cdbe64fb0c91+incompatible
1515
github.com/operator-framework/api v0.17.5
1616
github.com/stretchr/testify v1.8.4
17-
go.uber.org/zap v1.24.0
17+
go.uber.org/zap v1.25.0
1818
golang.org/x/mod v0.10.0
1919
gotest.tools v2.2.0+incompatible
20-
k8s.io/api v0.27.1
21-
k8s.io/apimachinery v0.27.1
20+
k8s.io/api v0.28.3
21+
k8s.io/apimachinery v0.28.3
2222
k8s.io/client-go v12.0.0+incompatible
2323
k8s.io/utils v0.0.0-20230505201702-9f6742963106
24-
sigs.k8s.io/controller-runtime v0.14.6
24+
sigs.k8s.io/controller-runtime v0.16.3
2525
sigs.k8s.io/yaml v1.3.0
2626
)
2727

2828
require (
29-
cloud.google.com/go/compute v1.19.2 // indirect
30-
cloud.google.com/go/compute/metadata v0.2.3 // indirect
31-
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
32-
github.com/Azure/go-autorest/autorest v0.11.29 // indirect
33-
github.com/Azure/go-autorest/autorest/adal v0.9.23 // indirect
34-
github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect
35-
github.com/Azure/go-autorest/logger v0.2.1 // indirect
36-
github.com/Azure/go-autorest/tracing v0.6.0 // indirect
3729
github.com/argoproj/argo-cd/v2 v2.8.3 // indirect
3830
github.com/beorn7/perks v1.0.1 // indirect
3931
github.com/blang/semver/v4 v4.0.0 // indirect
4032
github.com/cespare/xxhash/v2 v2.2.0 // indirect
4133
github.com/davecgh/go-spew v1.1.1 // indirect
42-
github.com/emicklei/go-restful v2.16.0+incompatible // indirect
34+
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
4335
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
36+
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
4437
github.com/fsnotify/fsnotify v1.6.0 // indirect
4538
github.com/go-logr/zapr v1.2.4 // indirect
4639
github.com/go-openapi/jsonpointer v0.19.6 // indirect
4740
github.com/go-openapi/jsonreference v0.20.2 // indirect
48-
github.com/go-openapi/spec v0.20.9 // indirect
4941
github.com/go-openapi/swag v0.22.3 // indirect
5042
github.com/gogo/protobuf v1.3.2 // indirect
51-
github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
5243
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
5344
github.com/golang/protobuf v1.5.3 // indirect
45+
github.com/google/gnostic-models v0.6.8 // indirect
5446
github.com/google/gofuzz v1.2.0 // indirect
5547
github.com/google/uuid v1.3.0 // indirect
56-
github.com/googleapis/gnostic v0.5.5 // indirect
5748
github.com/imdario/mergo v0.3.16 // indirect
5849
github.com/josharian/intern v1.0.0 // indirect
5950
github.com/json-iterator/go v1.1.12 // indirect
60-
github.com/keycloak/keycloak-operator v0.0.0-20221116085200-4b9abfb29226 // indirect
6151
github.com/mailru/easyjson v0.7.7 // indirect
6252
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
6353
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
6454
github.com/modern-go/reflect2 v1.0.2 // indirect
55+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
6556
github.com/nxadm/tail v1.4.8 // indirect
6657
github.com/openshift/client-go v0.0.0-20200325131901-f7baeb993edb // indirect
6758
github.com/operator-framework/operator-sdk v0.18.2 // indirect
6859
github.com/pkg/errors v0.9.1 // indirect
6960
github.com/pmezard/go-difflib v1.0.0 // indirect
7061
github.com/prometheus/client_golang v1.16.0 // indirect
7162
github.com/prometheus/client_model v0.4.0 // indirect
72-
github.com/prometheus/common v0.43.0 // indirect
63+
github.com/prometheus/common v0.44.0 // indirect
7364
github.com/prometheus/procfs v0.10.1 // indirect
7465
github.com/sethvargo/go-password v0.2.0 // indirect
7566
github.com/sirupsen/logrus v1.9.3 // indirect
7667
github.com/spf13/pflag v1.0.5 // indirect
77-
go.uber.org/atomic v1.11.0 // indirect
7868
go.uber.org/multierr v1.11.0 // indirect
79-
golang.org/x/crypto v0.10.0 // indirect
80-
golang.org/x/net v0.11.0 // indirect
69+
golang.org/x/crypto v0.14.0 // indirect
70+
golang.org/x/exp v0.0.0-20230522175609-2e198f4a06a1 // indirect
71+
golang.org/x/net v0.17.0 // indirect
8172
golang.org/x/oauth2 v0.9.0 // indirect
82-
golang.org/x/sys v0.9.0 // indirect
83-
golang.org/x/term v0.9.0 // indirect
84-
golang.org/x/text v0.10.0 // indirect
73+
golang.org/x/sys v0.13.0 // indirect
74+
golang.org/x/term v0.13.0 // indirect
75+
golang.org/x/text v0.13.0 // indirect
8576
golang.org/x/time v0.3.0 // indirect
86-
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
77+
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
8778
google.golang.org/appengine v1.6.7 // indirect
8879
google.golang.org/protobuf v1.31.0 // indirect
8980
gopkg.in/inf.v0 v0.9.1 // indirect
9081
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
9182
gopkg.in/yaml.v2 v2.4.0 // indirect
9283
gopkg.in/yaml.v3 v3.0.1 // indirect
93-
k8s.io/apiextensions-apiserver v0.27.1 // indirect
94-
k8s.io/component-base v0.27.1 // indirect
84+
k8s.io/apiextensions-apiserver v0.28.3 // indirect
85+
k8s.io/component-base v0.28.3 // indirect
9586
k8s.io/klog/v2 v2.100.1 // indirect
96-
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
87+
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
9788
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
9889
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
9990
)
@@ -103,34 +94,33 @@ replace (
10394
github.com/onsi/ginkgo => github.com/onsi/ginkgo v1.16.4
10495
github.com/onsi/gomega => github.com/onsi/gomega v1.14.0
10596
github.com/openshift/api => github.com/openshift/api v0.0.0-20220929131120-2bde012f248a
106-
k8s.io/api => k8s.io/api v0.23.6
107-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.23.6
108-
k8s.io/apimachinery => k8s.io/apimachinery v0.23.7-rc.0
109-
k8s.io/apiserver => k8s.io/apiserver v0.23.6
110-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.23.6
111-
k8s.io/client-go => k8s.io/client-go v0.23.6 // Required by prometheus-operator
112-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.23.6
113-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.23.6
114-
k8s.io/code-generator => k8s.io/code-generator v0.23.7-rc.0
115-
k8s.io/component-base => k8s.io/component-base v0.23.6
116-
k8s.io/component-helpers => k8s.io/component-helpers v0.23.6
117-
k8s.io/controller-manager => k8s.io/controller-manager v0.23.6
118-
k8s.io/cri-api => k8s.io/cri-api v0.23.0-alpha.0
119-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.23.6
120-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.23.6
121-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.23.6
122-
k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20210323165736-1a6458611d18
123-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.23.6
124-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.23.6
125-
k8s.io/kubectl => k8s.io/kubectl v0.23.6
126-
k8s.io/kubelet => k8s.io/kubelet v0.23.6
127-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.23.6
128-
k8s.io/metrics => k8s.io/metrics v0.23.6
129-
k8s.io/mount-utils => k8s.io/mount-utils v0.23.7-rc.0
130-
k8s.io/node-api => k8s.io/node-api v0.23.6
131-
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.23.6
132-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.23.6
133-
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.23.6
134-
k8s.io/sample-controller => k8s.io/sample-controller v0.23.6
135-
sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.11.0
97+
k8s.io/api => k8s.io/api v0.28.3
98+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.28.3
99+
k8s.io/apimachinery => k8s.io/apimachinery v0.28.3
100+
k8s.io/apiserver => k8s.io/apiserver v0.28.3
101+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.28.3
102+
k8s.io/client-go => k8s.io/client-go v0.28.3 // Required by prometheus-operator
103+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.28.3
104+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.28.3
105+
k8s.io/code-generator => k8s.io/code-generator v0.28.3
106+
k8s.io/component-base => k8s.io/component-base v0.28.3
107+
k8s.io/component-helpers => k8s.io/component-helpers v0.28.3
108+
k8s.io/controller-manager => k8s.io/controller-manager v0.28.3
109+
k8s.io/cri-api => k8s.io/cri-api v0.28.3
110+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.28.3
111+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.28.3
112+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.28.3
113+
k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9
114+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.28.3
115+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.28.3
116+
k8s.io/kubectl => k8s.io/kubectl v0.28.3
117+
k8s.io/kubelet => k8s.io/kubelet v0.28.3
118+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.28.3
119+
k8s.io/metrics => k8s.io/metrics v0.28.3
120+
k8s.io/mount-utils => k8s.io/mount-utils v0.28.3
121+
k8s.io/node-api => k8s.io/node-api v0.28.3
122+
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.28.3
123+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.28.3
124+
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.28.3
125+
k8s.io/sample-controller => k8s.io/sample-controller v0.28.3
136126
)

0 commit comments

Comments
 (0)