Merge pull request #483 from ricardomaraschini/check-if-image-is-not-nil-before-using

OCPBUGS-45861: validate image property isn't nil before using

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

go.mod

@@ -1,8 +1,8 @@
 module github.com/openshift/openshift-apiserver
 
-go 1.22.0
+go 1.23.0
 
-toolchain go1.22.1
+toolchain go1.23.4
 
 require (
 	github.com/MakeNowJust/heredoc v1.0.0

images/Dockerfile.rhel

@@ -1,9 +1,9 @@
-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/openshift-apiserver
 COPY . .
 RUN make build --warn-undefined-variables
 
-FROM registry.ci.openshift.org/ocp/4.18:base-rhel9
+FROM registry.ci.openshift.org/ocp/4.19:base-rhel9
 COPY --from=builder /go/src/github.com/openshift/openshift-apiserver/openshift-apiserver /usr/bin/
 ENTRYPOINT ["/usr/bin/openshift-apiserver"]
 LABEL io.k8s.display-name="OpenShift API Server Command" \

pkg/image/apis/image/v1/zz_generated.conversion.go

@@ -295,6 +295,22 @@ func (imp *ImageStreamImporter) importImages(ctx context.Context, isi *imageapi.
 				cache[j] = digest.Image
 			}
 			for _, index := range ids[j] {
+				// we have seen the below state in our internal CI clusters. we think
+				// it's caused by outages in the upstream registry, but we're not sure
+				// exactly how we end up in this situation where neither error or image
+				// are set. to protect against that we throw a generic error when it
+				// happens.
+				// See https://issues.redhat.com/browse/OCPBUGS-35036 for details.
+				if digest.Image == nil && digest.Err == nil {
+					errMsg := fmt.Sprintf(
+						"unknown error while importing digest %q from repository %q with import mode %q, please try again.",
+						digest.Name,
+						repo.Name,
+						digest.ImportMode,
+					)
+					digest.Err = errors.New(errMsg)
+					klog.Infof("importImages: both digest image and error are nil! repo=%+v digest=%+v", repo, digest)
+				}
 				if digest.Err != nil {
 					setImageImportStatus(isi, index, "", digest.Err)
 					continue