Merge pull request #2533 from machine424/fddrer

OCPBUGS-45389: update image to be consistent with ART for 4.19

Author: openshift-merge-bot[bot]

.ci-operator.yaml

@@ -1,4 +1,4 @@
 build_root_image:
   name: release
   namespace: openshift
-  tag: rhel-9-release-golang-1.22-openshift-4.18
+  tag: rhel-9-release-golang-1.23-openshift-4.19

Dockerfile

@@ -1,12 +1,12 @@
 # When bumping the Go version, don't forget to update the configuration of the
 # CI jobs in openshift/release.
-FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.22-openshift-4.18 AS builder
+FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.23-openshift-4.19 AS builder
 WORKDIR /go/src/github.com/openshift/cluster-monitoring-operator
 COPY . .
 ENV GOFLAGS="-mod=vendor"
 RUN make operator-no-deps
 
-FROM registry.ci.openshift.org/ocp/4.18:base-rhel9
+FROM registry.ci.openshift.org/ocp/4.19:base-rhel9
 LABEL io.k8s.display-name="OpenShift cluster-monitoring-operator" \
       io.k8s.description="This is a component of OpenShift and manages the lifecycle of the Prometheus based cluster monitoring stack." \
       io.openshift.tags="openshift" \
@@ -19,4 +19,3 @@ COPY manifests /manifests
 COPY assets /assets
 USER 1001
 ENTRYPOINT ["/usr/bin/operator"]
-

Makefile

@@ -38,7 +38,7 @@ GOJSONTOYAML_BIN=$(BIN_DIR)/gojsontoyaml
 JSONNET_BIN=$(BIN_DIR)/jsonnet
 JSONNETFMT_BIN=$(BIN_DIR)/jsonnetfmt
 GOLANGCI_LINT_BIN=$(BIN_DIR)/golangci-lint
-GOLANGCI_LINT_VERSION=v1.55.2
+GOLANGCI_LINT_VERSION=v1.62.2
 PROMTOOL_BIN=$(BIN_DIR)/promtool
 DOCGEN_BIN=$(BIN_DIR)/docgen
 MISSPELL_BIN=$(BIN_DIR)/misspell

hack/docgen/model/parser.go

@@ -114,6 +114,7 @@ func astFrom(filePath string) (*doc.Package, error) {
 	}
 
 	m[filePath] = f
+	//nolint:staticcheck // SA1019 ast.NewPackage is deprecated, will migrate later.
 	apkg, _ := ast.NewPackage(fset, m, nil, nil)
 
 	return doc.New(apkg, "", 0), nil