Merge pull request #596 from stlaz/413_art_image

[4.13] OCPBUGS-6189: art image update

Author: openshift-merge-robot

.ci-operator.yaml

@@ -1,4 +1,4 @@
 build_root_image:
   name: release
   namespace: openshift
-  tag: rhel-8-release-golang-1.18-openshift-4.12
+  tag: rhel-8-release-golang-1.19-openshift-4.13

Dockerfile.rhel7

@@ -1,10 +1,10 @@
-FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.18-openshift-4.12 AS builder
+FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.19-openshift-4.13 AS builder
 WORKDIR /go/src/github.com/openshift/cluster-authentication-operator
 COPY . .
 ENV GO_PACKAGE github.com/openshift/cluster-authentication-operator
 RUN go build -ldflags "-X $GO_PACKAGE/pkg/version.versionFromGit=$(git describe --long --tags --abbrev=7 --match 'v[0-9]*')" -tags="ocp" -o authentication-operator ./cmd/authentication-operator
 
-FROM registry.ci.openshift.org/ocp/4.12:base
+FROM registry.ci.openshift.org/ocp/4.13:base
 COPY --from=builder /go/src/github.com/openshift/cluster-authentication-operator/authentication-operator /usr/bin/
 COPY manifests /manifests
 COPY vendor/github.com/openshift/api/operator/v1/0000_50_cluster-authentication-operator_01_config.crd.yaml /manifests/01_config.crd.yaml

go.mod

@@ -1,6 +1,6 @@
 module github.com/openshift/cluster-authentication-operator
 
-go 1.18
+go 1.19
 
 require (
 	github.com/davecgh/go-spew v1.1.1

pkg/controllers/common/conditions.go

@@ -24,8 +24,9 @@ type ControllerProgressingError struct {
 // The error allows configuring `maxAge` which determines for how long can an
 // this error appear in the operator's status before it goes Degraded:
 // maxAge:
-//   <= 0 - never go Degraded
-//   > 0  - go Degraded if the controller was progressing with this error longer than `maxAge`
+//
+//	<= 0 - never go Degraded
+//	> 0  - go Degraded if the controller was progressing with this error longer than `maxAge`
 func NewControllerProgressingError(reason string, err error, maxAge time.Duration) *ControllerProgressingError {
 	return &ControllerProgressingError{
 		reason: reason,

pkg/controllers/metadata/metadata_controller.go

@@ -113,10 +113,10 @@ func (c *metadataController) handleOAuthMetadataConfigMap(ctx context.Context, r
 }
 
 // FIXME: we need to handle Authentication config object properly, namely:
-// - honor Type field being set to none and don't create the OSIN
-//   deployment in that case
-// - the WebhookTokenAuthenticators field is currently not being handled
-//   anywhere
+//   - honor Type field being set to none and don't create the OSIN
+//     deployment in that case
+//   - the WebhookTokenAuthenticators field is currently not being handled
+//     anywhere
 //
 // Note that the configMap from the reference in the OAuthMetadata field is
 // used to fill the data in the /.well-known/oauth-authorization-server