Merge branch 'openshift:main' into OCM-2994

venkateshsredhat · web-flow · commit 79272bc0e1c5 · 2023-08-08T12:58:41.000+05:30
diff --git a/.ci-operator.yaml b/.ci-operator.yaml
@@ -0,0 +1,4 @@
+build_root_image:
+  name: release
+  namespace: openshift
+  tag: rhel-8-release-golang-1.19-openshift-4.12
diff --git a/MAINTAINING.md b/MAINTAINING.md
diff --git a/apis/go.mod b/apis/go.mod
@@ -1,6 +1,6 @@
 module github.com/openshift/addon-operator/apis
 
-go 1.18
+go 1.19
 
 require (
 	github.com/rhobs/obo-prometheus-operator/pkg/apis/monitoring v0.61.1-rhobs1
diff --git a/config/docker/addon-operator-manager.Dockerfile b/config/docker/addon-operator-manager.Dockerfile
@@ -1,15 +1,14 @@
-FROM registry.access.redhat.com/ubi8/ubi-minimal@sha256:3e1adcc31c6073d010b8043b070bd089d7bf37ee2c397c110211a6273453433f
-# registry.access.redhat.com/ubi8/ubi-minimal:8.7-1107
+FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-1014
 
 # shadow-utils contains adduser and groupadd binaries
 RUN microdnf install shadow-utils \
 	&& groupadd --gid 1000 noroot \
 	&& adduser \
-		--no-create-home \
-		--no-user-group \
-		--uid 1000 \
-		--gid 1000 \
-		noroot
+	--no-create-home \
+	--no-user-group \
+	--uid 1000 \
+	--gid 1000 \
+	noroot
 
 WORKDIR /
 
diff --git a/config/docker/addon-operator-webhook.Dockerfile b/config/docker/addon-operator-webhook.Dockerfile
@@ -1,15 +1,14 @@
-FROM registry.access.redhat.com/ubi8/ubi-minimal@sha256:3e1adcc31c6073d010b8043b070bd089d7bf37ee2c397c110211a6273453433f
-# registry.access.redhat.com/ubi8/ubi-minimal:8.7-1107
+FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-1014
 
 # shadow-utils contains adduser and groupadd binaries
 RUN microdnf install shadow-utils \
 	&& groupadd --gid 1000 noroot \
 	&& adduser \
-		--no-create-home \
-		--no-user-group \
-		--uid 1000 \
-		--gid 1000 \
-		noroot
+	--no-create-home \
+	--no-user-group \
+	--uid 1000 \
+	--gid 1000 \
+	noroot
 
 WORKDIR /
 
diff --git a/config/docker/api-mock.Dockerfile b/config/docker/api-mock.Dockerfile
@@ -1,15 +1,14 @@
-FROM registry.access.redhat.com/ubi8/ubi-minimal@sha256:3e1adcc31c6073d010b8043b070bd089d7bf37ee2c397c110211a6273453433f
-# registry.access.redhat.com/ubi8/ubi-minimal:8.7-1107
+FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-1014
 
 # shadow-utils contains adduser and groupadd binaries
 RUN microdnf install shadow-utils \
 	&& groupadd --gid 1000 noroot \
 	&& adduser \
-		--no-create-home \
-		--no-user-group \
-		--uid 1000 \
-		--gid 1000 \
-		noroot
+	--no-create-home \
+	--no-user-group \
+	--uid 1000 \
+	--gid 1000 \
+	noroot
 
 WORKDIR /
 
diff --git a/config/docker/prometheus-remote-storage-mock.Dockerfile b/config/docker/prometheus-remote-storage-mock.Dockerfile
@@ -1,15 +1,14 @@
-FROM registry.access.redhat.com/ubi8/ubi-minimal@sha256:3e1adcc31c6073d010b8043b070bd089d7bf37ee2c397c110211a6273453433f
-# registry.access.redhat.com/ubi8/ubi-minimal:8.7-1107
+FROM registry.access.redhat.com/ubi8/ubi-minimal:8.8-1014
 
 # shadow-utils contains adduser and groupadd binaries
 RUN microdnf install shadow-utils \
 	&& groupadd --gid 1000 noroot \
 	&& adduser \
-		--no-create-home \
-		--no-user-group \
-		--uid 1000 \
-		--gid 1000 \
-		noroot
+	--no-create-home \
+	--no-user-group \
+	--uid 1000 \
+	--gid 1000 \
+	noroot
 
 WORKDIR /
 
diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/openshift/addon-operator
 
-go 1.18
+go 1.19
 
 require (
 	github.com/blang/semver/v4 v4.0.0
@@ -11,7 +11,7 @@ require (
 	github.com/gorilla/mux v1.8.0
 	github.com/hashicorp/go-multierror v1.1.1
 	github.com/magefile/mage v1.15.0
-	github.com/mt-sre/client v0.2.0
+	github.com/mt-sre/client v0.2.3
 	github.com/mt-sre/devkube v0.6.3
 	github.com/novln/docker-parser v1.0.0
 	github.com/openshift/addon-operator/apis v0.0.0-20230309184833-806514f6132f
@@ -43,7 +43,7 @@ require (
 	github.com/alessio/shellescape v1.4.1 // indirect
 	github.com/aws/aws-sdk-go v1.44.218 // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
-	github.com/cenkalti/backoff/v4 v4.1.3 // indirect
+	github.com/cenkalti/backoff/v4 v4.2.0 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/dennwc/varint v1.0.0 // indirect
 	github.com/emicklei/go-restful/v3 v3.10.2 // indirect
diff --git a/go.sum b/go.sum
@@ -221,8 +221,8 @@ github.com/casbin/casbin/v2 v2.1.2/go.mod h1:YcPU1XXisHhLzuxH9coDNf2FbKpjGlbCg3n
 github.com/cenkalti/backoff v0.0.0-20181003080854-62661b46c409/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM=
 github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM=
 github.com/cenkalti/backoff/v4 v4.1.1/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw=
-github.com/cenkalti/backoff/v4 v4.1.3 h1:cFAlzYUlVYDysBEH2T5hyJZMh3+5+WCBvSnK6Q8UtC4=
-github.com/cenkalti/backoff/v4 v4.1.3/go.mod h1:scbssz8iZGpm3xbr14ovlUdkxfGXNInqkPWOWmG2CLw=
+github.com/cenkalti/backoff/v4 v4.2.0 h1:HN5dHm3WBOgndBH6E8V0q2jIYIR3s9yglV8k/+MN3u4=
+github.com/cenkalti/backoff/v4 v4.2.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
 github.com/cespare/xxhash/v2 v2.1.0/go.mod h1:dgIUBU3pDso/gPgZ1osOZ0iQf77oPR28Tjxl5dIMyVM=
@@ -1037,8 +1037,8 @@ github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJ
 github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc=
 github.com/mrunalp/fileutils v0.5.0/go.mod h1:M1WthSahJixYnrXQl/DFQuteStB1weuxD2QJNHXfbSQ=
 github.com/mschoch/smat v0.0.0-20160514031455-90eadee771ae/go.mod h1:qAyveg+e4CE+eKJXWVjKXM4ck2QobLqTDytGJbLLhJg=
-github.com/mt-sre/client v0.2.0 h1:nF6ei3aZ2BHyi+EB/rQBuCIlR0z1QvaYNjZ7RVNsSak=
-github.com/mt-sre/client v0.2.0/go.mod h1:wiYCEamk92vOM1eKkgQDaxYj7ON+m1R/aceSZ+1UDTI=
+github.com/mt-sre/client v0.2.3 h1:/Z+wfs/RepGJIc8mGHmU8jdhqfWQH/tBHLsf3RTtZ50=
+github.com/mt-sre/client v0.2.3/go.mod h1:MRZr3Dpqwg57BBdTTExm2bHGcs6VjYt32EnecPG5FF8=
 github.com/mt-sre/devkube v0.6.3 h1:T5Lei+Bs6gC4UmeL07q+PAehjpj4K3wXY1StW+qbgyU=
 github.com/mt-sre/devkube v0.6.3/go.mod h1:rQLeA4cxZYa347l25MAZFFnzx7AJ54jByN3PY/b2dfw=
 github.com/munnerz/goautoneg v0.0.0-20120707110453-a547fc61f48d/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
diff --git a/pkg/client/addon_instance.go b/pkg/client/addon_instance.go
@@ -19,9 +19,9 @@ type AddonInstanceClient interface {
 	SendPulse(ctx context.Context, instance av1alpha1.AddonInstance, opts ...SendPulseOption) error
 }
 
-// NewAddonInstanceClient returns a configured AddonInstanceClient implementation
+// NewAddonInstanceClient returns a configured AddonInstanceClient
 // using the given client instance as a base.
-func NewAddonInstanceClient(client client.Client) *AddonInstanceClientImpl {
+func NewAddonInstanceClient(client client.Client) AddonInstanceClient {
 	return &AddonInstanceClientImpl{
 		client: client,
 	}
diff --git a/pkg/client/addon_instance_test.go b/pkg/client/addon_instance_test.go
@@ -71,7 +71,7 @@ func TestAddonInstanceClientImplSendPulse(t *testing.T) {
 				),
 				NewAddonInstanceConditionReadyToBeDeleted(
 					metav1.ConditionTrue,
-					av1alpha1.AddonReasonReadyToBeDeleted,
+					av1alpha1.AddonInstanceReasonReadyToBeDeleted,
 					"Ready to be deleted",
 				),
 			},

Original file line number	Diff line number	Diff line change
`@@ -19,9 +19,9 @@ type AddonInstanceClient interface {`
`19`	`19`	`SendPulse(ctx context.Context, instance av1alpha1.AddonInstance, opts ...SendPulseOption) error`
`20`	`20`	`}`
`21`	`21`
`22`		`-// NewAddonInstanceClient returns a configured AddonInstanceClient implementation`
	`22`	`+// NewAddonInstanceClient returns a configured AddonInstanceClient`
`23`	`23`	`// using the given client instance as a base.`
`24`		`-func NewAddonInstanceClient(client client.Client) *AddonInstanceClientImpl {`
	`24`	`+func NewAddonInstanceClient(client client.Client) AddonInstanceClient {`
`25`	`25`	`return &AddonInstanceClientImpl{`
`26`	`26`	`client: client,`
`27`	`27`	`}`