Update containers to golang-1.22 and ocp-4.17

Signed-off-by: Todd Short <[email protected]>

Author: tmshort

.ci-operator.yaml

@@ -1,4 +1,4 @@
 build_root_image:
   name: release
   namespace: openshift
-  tag: rhel-9-release-golang-1.21-openshift-4.16
+  tag: rhel-9-release-golang-1.22-openshift-4.17

base.Dockerfile

@@ -1,6 +1,6 @@
 # Dockerfile to bootstrap build and test in openshift-ci
 
-FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.20-openshift-4.14
+FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17
 
 ARG KUBEBUILDER_RELEASE=2.3.1
 # Install test dependencies

codegen.Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.13-alpine
+FROM golang:1.22-alpine
 
 RUN apk update && \
     apk add make git protobuf

manifests/0000_50_olm_00-clusterserviceversions.crd.yaml

@@ -98,7 +98,7 @@ spec:
                                 path:
                                   type: string
                                 value:
-                                  description: RawMessage is a raw encoded JSON value. It implements Marshaler and Unmarshaler and can be used to delay JSON decoding or precompute a JSON encoding.
+                                  description: RawMessage is a raw encoded JSON value. It implements [Marshaler] and [Unmarshaler] and can be used to delay JSON decoding or precompute a JSON encoding.
                                   type: string
                                   format: byte
                                 x-descriptors:
@@ -154,7 +154,7 @@ spec:
                                 path:
                                   type: string
                                 value:
-                                  description: RawMessage is a raw encoded JSON value. It implements Marshaler and Unmarshaler and can be used to delay JSON decoding or precompute a JSON encoding.
+                                  description: RawMessage is a raw encoded JSON value. It implements [Marshaler] and [Unmarshaler] and can be used to delay JSON decoding or precompute a JSON encoding.
                                   type: string
                                   format: byte
                                 x-descriptors:
@@ -176,7 +176,7 @@ spec:
                                 path:
                                   type: string
                                 value:
-                                  description: RawMessage is a raw encoded JSON value. It implements Marshaler and Unmarshaler and can be used to delay JSON decoding or precompute a JSON encoding.
+                                  description: RawMessage is a raw encoded JSON value. It implements [Marshaler] and [Unmarshaler] and can be used to delay JSON decoding or precompute a JSON encoding.
                                   type: string
                                   format: byte
                                 x-descriptors:
@@ -211,7 +211,7 @@ spec:
                                 path:
                                   type: string
                                 value:
-                                  description: RawMessage is a raw encoded JSON value. It implements Marshaler and Unmarshaler and can be used to delay JSON decoding or precompute a JSON encoding.
+                                  description: RawMessage is a raw encoded JSON value. It implements [Marshaler] and [Unmarshaler] and can be used to delay JSON decoding or precompute a JSON encoding.
                                   type: string
                                   format: byte
                                 x-descriptors:
@@ -267,7 +267,7 @@ spec:
                                 path:
                                   type: string
                                 value:
-                                  description: RawMessage is a raw encoded JSON value. It implements Marshaler and Unmarshaler and can be used to delay JSON decoding or precompute a JSON encoding.
+                                  description: RawMessage is a raw encoded JSON value. It implements [Marshaler] and [Unmarshaler] and can be used to delay JSON decoding or precompute a JSON encoding.
                                   type: string
                                   format: byte
                                 x-descriptors:
@@ -289,7 +289,7 @@ spec:
                                 path:
                                   type: string
                                 value:
-                                  description: RawMessage is a raw encoded JSON value. It implements Marshaler and Unmarshaler and can be used to delay JSON decoding or precompute a JSON encoding.
+                                  description: RawMessage is a raw encoded JSON value. It implements [Marshaler] and [Unmarshaler] and can be used to delay JSON decoding or precompute a JSON encoding.
                                   type: string
                                   format: byte
                                 x-descriptors:
@@ -335,7 +335,7 @@ spec:
                                 path:
                                   type: string
                                 value:
-                                  description: RawMessage is a raw encoded JSON value. It implements Marshaler and Unmarshaler and can be used to delay JSON decoding or precompute a JSON encoding.
+                                  description: RawMessage is a raw encoded JSON value. It implements [Marshaler] and [Unmarshaler] and can be used to delay JSON decoding or precompute a JSON encoding.
                                   type: string
                                   format: byte
                                 x-descriptors:
@@ -384,7 +384,7 @@ spec:
                                 path:
                                   type: string
                                 value:
-                                  description: RawMessage is a raw encoded JSON value. It implements Marshaler and Unmarshaler and can be used to delay JSON decoding or precompute a JSON encoding.
+                                  description: RawMessage is a raw encoded JSON value. It implements [Marshaler] and [Unmarshaler] and can be used to delay JSON decoding or precompute a JSON encoding.
                                   type: string
                                   format: byte
                                 x-descriptors:
@@ -406,7 +406,7 @@ spec:
                                 path:
                                   type: string
                                 value:
-                                  description: RawMessage is a raw encoded JSON value. It implements Marshaler and Unmarshaler and can be used to delay JSON decoding or precompute a JSON encoding.
+                                  description: RawMessage is a raw encoded JSON value. It implements [Marshaler] and [Unmarshaler] and can be used to delay JSON decoding or precompute a JSON encoding.
                                   type: string
                                   format: byte
                                 x-descriptors:
@@ -440,7 +440,7 @@ spec:
                                 path:
                                   type: string
                                 value:
-                                  description: RawMessage is a raw encoded JSON value. It implements Marshaler and Unmarshaler and can be used to delay JSON decoding or precompute a JSON encoding.
+                                  description: RawMessage is a raw encoded JSON value. It implements [Marshaler] and [Unmarshaler] and can be used to delay JSON decoding or precompute a JSON encoding.
                                   type: string
                                   format: byte
                                 x-descriptors:
@@ -489,7 +489,7 @@ spec:
                                 path:
                                   type: string
                                 value:
-                                  description: RawMessage is a raw encoded JSON value. It implements Marshaler and Unmarshaler and can be used to delay JSON decoding or precompute a JSON encoding.
+                                  description: RawMessage is a raw encoded JSON value. It implements [Marshaler] and [Unmarshaler] and can be used to delay JSON decoding or precompute a JSON encoding.
                                   type: string
                                   format: byte
                                 x-descriptors:
@@ -511,7 +511,7 @@ spec:
                                 path:
                                   type: string
                                 value:
-                                  description: RawMessage is a raw encoded JSON value. It implements Marshaler and Unmarshaler and can be used to delay JSON decoding or precompute a JSON encoding.
+                                  description: RawMessage is a raw encoded JSON value. It implements [Marshaler] and [Unmarshaler] and can be used to delay JSON decoding or precompute a JSON encoding.
                                   type: string
                                   format: byte
                                 x-descriptors:

microshift-manifests/0000_50_olm_00-clusterserviceversions.crd.yaml

@@ -98,7 +98,7 @@ spec:
                                 path:
                                   type: string
                                 value:
-                                  description: RawMessage is a raw encoded JSON value. It implements Marshaler and Unmarshaler and can be used to delay JSON decoding or precompute a JSON encoding.
+                                  description: RawMessage is a raw encoded JSON value. It implements [Marshaler] and [Unmarshaler] and can be used to delay JSON decoding or precompute a JSON encoding.
                                   type: string
                                   format: byte
                                 x-descriptors:
@@ -154,7 +154,7 @@ spec:
                                 path:
                                   type: string
                                 value:
-                                  description: RawMessage is a raw encoded JSON value. It implements Marshaler and Unmarshaler and can be used to delay JSON decoding or precompute a JSON encoding.
+                                  description: RawMessage is a raw encoded JSON value. It implements [Marshaler] and [Unmarshaler] and can be used to delay JSON decoding or precompute a JSON encoding.
                                   type: string
                                   format: byte
                                 x-descriptors:
@@ -176,7 +176,7 @@ spec:
                                 path:
                                   type: string
                                 value:
-                                  description: RawMessage is a raw encoded JSON value. It implements Marshaler and Unmarshaler and can be used to delay JSON decoding or precompute a JSON encoding.
+                                  description: RawMessage is a raw encoded JSON value. It implements [Marshaler] and [Unmarshaler] and can be used to delay JSON decoding or precompute a JSON encoding.
                                   type: string
                                   format: byte
                                 x-descriptors:
@@ -211,7 +211,7 @@ spec:
                                 path:
                                   type: string
                                 value:
-                                  description: RawMessage is a raw encoded JSON value. It implements Marshaler and Unmarshaler and can be used to delay JSON decoding or precompute a JSON encoding.
+                                  description: RawMessage is a raw encoded JSON value. It implements [Marshaler] and [Unmarshaler] and can be used to delay JSON decoding or precompute a JSON encoding.
                                   type: string
                                   format: byte
                                 x-descriptors:
@@ -267,7 +267,7 @@ spec:
                                 path:
                                   type: string
                                 value:
-                                  description: RawMessage is a raw encoded JSON value. It implements Marshaler and Unmarshaler and can be used to delay JSON decoding or precompute a JSON encoding.
+                                  description: RawMessage is a raw encoded JSON value. It implements [Marshaler] and [Unmarshaler] and can be used to delay JSON decoding or precompute a JSON encoding.
                                   type: string
                                   format: byte
                                 x-descriptors:
@@ -289,7 +289,7 @@ spec:
                                 path:
                                   type: string
                                 value:
-                                  description: RawMessage is a raw encoded JSON value. It implements Marshaler and Unmarshaler and can be used to delay JSON decoding or precompute a JSON encoding.
+                                  description: RawMessage is a raw encoded JSON value. It implements [Marshaler] and [Unmarshaler] and can be used to delay JSON decoding or precompute a JSON encoding.
                                   type: string
                                   format: byte
                                 x-descriptors:
@@ -335,7 +335,7 @@ spec:
                                 path:
                                   type: string
                                 value:
-                                  description: RawMessage is a raw encoded JSON value. It implements Marshaler and Unmarshaler and can be used to delay JSON decoding or precompute a JSON encoding.
+                                  description: RawMessage is a raw encoded JSON value. It implements [Marshaler] and [Unmarshaler] and can be used to delay JSON decoding or precompute a JSON encoding.
                                   type: string
                                   format: byte
                                 x-descriptors:
@@ -384,7 +384,7 @@ spec:
                                 path:
                                   type: string
                                 value:
-                                  description: RawMessage is a raw encoded JSON value. It implements Marshaler and Unmarshaler and can be used to delay JSON decoding or precompute a JSON encoding.
+                                  description: RawMessage is a raw encoded JSON value. It implements [Marshaler] and [Unmarshaler] and can be used to delay JSON decoding or precompute a JSON encoding.
                                   type: string
                                   format: byte
                                 x-descriptors:
@@ -406,7 +406,7 @@ spec:
                                 path:
                                   type: string
                                 value:
-                                  description: RawMessage is a raw encoded JSON value. It implements Marshaler and Unmarshaler and can be used to delay JSON decoding or precompute a JSON encoding.
+                                  description: RawMessage is a raw encoded JSON value. It implements [Marshaler] and [Unmarshaler] and can be used to delay JSON decoding or precompute a JSON encoding.
                                   type: string
                                   format: byte
                                 x-descriptors:
@@ -440,7 +440,7 @@ spec:
                                 path:
                                   type: string
                                 value:
-                                  description: RawMessage is a raw encoded JSON value. It implements Marshaler and Unmarshaler and can be used to delay JSON decoding or precompute a JSON encoding.
+                                  description: RawMessage is a raw encoded JSON value. It implements [Marshaler] and [Unmarshaler] and can be used to delay JSON decoding or precompute a JSON encoding.
                                   type: string
                                   format: byte
                                 x-descriptors:
@@ -489,7 +489,7 @@ spec:
                                 path:
                                   type: string
                                 value:
-                                  description: RawMessage is a raw encoded JSON value. It implements Marshaler and Unmarshaler and can be used to delay JSON decoding or precompute a JSON encoding.
+                                  description: RawMessage is a raw encoded JSON value. It implements [Marshaler] and [Unmarshaler] and can be used to delay JSON decoding or precompute a JSON encoding.
                                   type: string
                                   format: byte
                                 x-descriptors:
@@ -511,7 +511,7 @@ spec:
                                 path:
                                   type: string
                                 value:
-                                  description: RawMessage is a raw encoded JSON value. It implements Marshaler and Unmarshaler and can be used to delay JSON decoding or precompute a JSON encoding.
+                                  description: RawMessage is a raw encoded JSON value. It implements [Marshaler] and [Unmarshaler] and can be used to delay JSON decoding or precompute a JSON encoding.
                                   type: string
                                   format: byte
                                 x-descriptors:

operator-framework-tools.Dockerfile

@@ -1,11 +1,18 @@
-FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.21-openshift-4.16 AS builder-rhel8
+# Update when available: registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.22-openshift-4.17
+FROM registry.ci.openshift.org/ocp/builder:rhel-8-golang-1.21-openshift-4.17 AS builder-rhel8
 ENV GOPATH /go
 ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH
 WORKDIR /src
 COPY . .
+# Remove after updating to rhel-8-golang-1.22-openshift-4.17
+# Install golang 1.22.2
+RUN go install -mod=mod golang.org/dl/go1.22.2@latest
+RUN go1.22.2 download
+RUN ln -s /go/bin/go1.22.2 /go/bin/go
+# Now we can make registry
 RUN make build/registry cross
 
-FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16 AS builder
+FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 AS builder
 ENV GOPATH /go
 ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH
 WORKDIR /src

operator-lifecycle-manager.Dockerfile

@@ -1,4 +1,4 @@
-FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16 AS builder
+FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 AS builder
 
 ENV GO111MODULE auto
 ENV GOPATH /go
@@ -18,7 +18,7 @@ RUN mkdir -p .git/objects
 COPY . .
 RUN make build/olm bin/cpb
 
-FROM registry.ci.openshift.org/ocp/4.16:base-rhel9
+FROM registry.ci.openshift.org/ocp/4.17:base-rhel9
 
 ADD manifests/ /manifests
 LABEL io.openshift.release.operator=true

operator-registry.Dockerfile

@@ -1,4 +1,4 @@
-FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.21-openshift-4.16 AS builder
+FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.17 AS builder
 
 ENV GOPATH /go
 ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH
@@ -11,7 +11,7 @@ RUN make build/registry cross
 # copy and build vendored grpc_health_probe
 RUN CGO_ENABLED=0 go build -mod=vendor -tags netgo -ldflags "-w" ./vendor/github.com/grpc-ecosystem/grpc-health-probe/...
 
-FROM registry.ci.openshift.org/ocp/4.16:base-rhel9
+FROM registry.ci.openshift.org/ocp/4.17:base-rhel9
 
 COPY --from=builder /src/bin/* /bin/registry/
 COPY --from=builder /src/grpc-health-probe /bin/grpc_health_probe