Bump Kubernetes to v1.28.0-alpha.4

Getting the latest CRI-API changes into master.

Signed-off-by: Sascha Grunert <[email protected]>

Author: saschagrunert

Diff for: cmd/crictl/container.go

@@ -699,6 +699,11 @@ func CreateContainer(
 		}
 	}
 
+	image := config.GetImage().GetImage()
+	if config.Image.UserSpecifiedImage == "" {
+		config.Image.UserSpecifiedImage = image
+	}
+
 	// When there is a with-pull request or the image default mode is to
 	// pull-image-on-create(true) and no-pull was not set we pull the image when
 	// they ask for a create as a helper on the cli to reduce extra steps. As a
@@ -711,7 +716,6 @@ func CreateContainer(
 		}
 
 		// Try to pull the image before container creation
-		image := config.GetImage().GetImage()
 		ann := config.GetImage().GetAnnotations()
 		if _, err := PullImageWithSandbox(iClient, image, auth, podConfig, ann); err != nil {
 			return "", err

Diff for: go.mod

@@ -105,32 +105,32 @@ require (
 )
 
 replace (
-	k8s.io/api => k8s.io/kubernetes/staging/src/k8s.io/api v0.0.0-20230614094738-25b4e43193bc
-	k8s.io/apiextensions-apiserver => k8s.io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v0.0.0-20230614094738-25b4e43193bc
-	k8s.io/apimachinery => k8s.io/kubernetes/staging/src/k8s.io/apimachinery v0.0.0-20230614094738-25b4e43193bc
-	k8s.io/apiserver => k8s.io/kubernetes/staging/src/k8s.io/apiserver v0.0.0-20230614094738-25b4e43193bc
-	k8s.io/cli-runtime => k8s.io/kubernetes/staging/src/k8s.io/cli-runtime v0.0.0-20230614094738-25b4e43193bc
-	k8s.io/client-go => k8s.io/kubernetes/staging/src/k8s.io/client-go v0.0.0-20230614094738-25b4e43193bc
-	k8s.io/cloud-provider => k8s.io/kubernetes/staging/src/k8s.io/cloud-provider v0.0.0-20230614094738-25b4e43193bc
-	k8s.io/cluster-bootstrap => k8s.io/kubernetes/staging/src/k8s.io/cluster-bootstrap v0.0.0-20230614094738-25b4e43193bc
-	k8s.io/code-generator => k8s.io/kubernetes/staging/src/k8s.io/code-generator v0.0.0-20230614094738-25b4e43193bc
-	k8s.io/component-base => k8s.io/kubernetes/staging/src/k8s.io/component-base v0.0.0-20230614094738-25b4e43193bc
-	k8s.io/component-helpers => k8s.io/kubernetes/staging/src/k8s.io/component-helpers v0.0.0-20230614094738-25b4e43193bc
-	k8s.io/controller-manager => k8s.io/kubernetes/staging/src/k8s.io/controller-manager v0.0.0-20230614094738-25b4e43193bc
-	k8s.io/cri-api => k8s.io/kubernetes/staging/src/k8s.io/cri-api v0.0.0-20230614094738-25b4e43193bc
-	k8s.io/csi-translation-lib => k8s.io/kubernetes/staging/src/k8s.io/csi-translation-lib v0.0.0-20230614094738-25b4e43193bc
-	k8s.io/dynamic-resource-allocation => k8s.io/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v0.0.0-20230614094738-25b4e43193bc
-	k8s.io/kms => k8s.io/kubernetes/staging/src/k8s.io/kms v0.0.0-20230614094738-25b4e43193bc
-	k8s.io/kube-aggregator => k8s.io/kubernetes/staging/src/k8s.io/kube-aggregator v0.0.0-20230614094738-25b4e43193bc
-	k8s.io/kube-controller-manager => k8s.io/kubernetes/staging/src/k8s.io/kube-controller-manager v0.0.0-20230614094738-25b4e43193bc
-	k8s.io/kube-proxy => k8s.io/kubernetes/staging/src/k8s.io/kube-proxy v0.0.0-20230614094738-25b4e43193bc
-	k8s.io/kube-scheduler => k8s.io/kubernetes/staging/src/k8s.io/kube-scheduler v0.0.0-20230614094738-25b4e43193bc
-	k8s.io/kubectl => k8s.io/kubernetes/staging/src/k8s.io/kubectl v0.0.0-20230614094738-25b4e43193bc
-	k8s.io/kubelet => k8s.io/kubernetes/staging/src/k8s.io/kubelet v0.0.0-20230614094738-25b4e43193bc
-	k8s.io/kubernetes => k8s.io/kubernetes v1.27.3
-	k8s.io/legacy-cloud-providers => k8s.io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v0.0.0-20230614094738-25b4e43193bc
-	k8s.io/metrics => k8s.io/kubernetes/staging/src/k8s.io/metrics v0.0.0-20230614094738-25b4e43193bc
-	k8s.io/mount-utils => k8s.io/kubernetes/staging/src/k8s.io/mount-utils v0.0.0-20230614094738-25b4e43193bc
-	k8s.io/pod-security-admission => k8s.io/kubernetes/staging/src/k8s.io/pod-security-admission v0.0.0-20230614094738-25b4e43193bc
-	k8s.io/sample-apiserver => k8s.io/kubernetes/staging/src/k8s.io/sample-apiserver v0.0.0-20230614094738-25b4e43193bc
+	k8s.io/api => k8s.io/kubernetes/staging/src/k8s.io/api d02d8ba635c5cf19ef19a4a4fb2b8d9134ec8b5e
+	k8s.io/apiextensions-apiserver => k8s.io/kubernetes/staging/src/k8s.io/apiextensions-apiserver d02d8ba635c5cf19ef19a4a4fb2b8d9134ec8b5e
+	k8s.io/apimachinery => k8s.io/kubernetes/staging/src/k8s.io/apimachinery d02d8ba635c5cf19ef19a4a4fb2b8d9134ec8b5e
+	k8s.io/apiserver => k8s.io/kubernetes/staging/src/k8s.io/apiserver d02d8ba635c5cf19ef19a4a4fb2b8d9134ec8b5e
+	k8s.io/cli-runtime => k8s.io/kubernetes/staging/src/k8s.io/cli-runtime d02d8ba635c5cf19ef19a4a4fb2b8d9134ec8b5e
+	k8s.io/client-go => k8s.io/kubernetes/staging/src/k8s.io/client-go d02d8ba635c5cf19ef19a4a4fb2b8d9134ec8b5e
+	k8s.io/cloud-provider => k8s.io/kubernetes/staging/src/k8s.io/cloud-provider d02d8ba635c5cf19ef19a4a4fb2b8d9134ec8b5e
+	k8s.io/cluster-bootstrap => k8s.io/kubernetes/staging/src/k8s.io/cluster-bootstrap d02d8ba635c5cf19ef19a4a4fb2b8d9134ec8b5e
+	k8s.io/code-generator => k8s.io/kubernetes/staging/src/k8s.io/code-generator d02d8ba635c5cf19ef19a4a4fb2b8d9134ec8b5e
+	k8s.io/component-base => k8s.io/kubernetes/staging/src/k8s.io/component-base d02d8ba635c5cf19ef19a4a4fb2b8d9134ec8b5e
+	k8s.io/component-helpers => k8s.io/kubernetes/staging/src/k8s.io/component-helpers d02d8ba635c5cf19ef19a4a4fb2b8d9134ec8b5e
+	k8s.io/controller-manager => k8s.io/kubernetes/staging/src/k8s.io/controller-manager d02d8ba635c5cf19ef19a4a4fb2b8d9134ec8b5e
+	k8s.io/cri-api => k8s.io/kubernetes/staging/src/k8s.io/cri-api d02d8ba635c5cf19ef19a4a4fb2b8d9134ec8b5e
+	k8s.io/csi-translation-lib => k8s.io/kubernetes/staging/src/k8s.io/csi-translation-lib d02d8ba635c5cf19ef19a4a4fb2b8d9134ec8b5e
+	k8s.io/dynamic-resource-allocation => k8s.io/kubernetes/staging/src/k8s.io/dynamic-resource-allocation d02d8ba635c5cf19ef19a4a4fb2b8d9134ec8b5e
+	k8s.io/kms => k8s.io/kubernetes/staging/src/k8s.io/kms d02d8ba635c5cf19ef19a4a4fb2b8d9134ec8b5e
+	k8s.io/kube-aggregator => k8s.io/kubernetes/staging/src/k8s.io/kube-aggregator d02d8ba635c5cf19ef19a4a4fb2b8d9134ec8b5e
+	k8s.io/kube-controller-manager => k8s.io/kubernetes/staging/src/k8s.io/kube-controller-manager d02d8ba635c5cf19ef19a4a4fb2b8d9134ec8b5e
+	k8s.io/kube-proxy => k8s.io/kubernetes/staging/src/k8s.io/kube-proxy d02d8ba635c5cf19ef19a4a4fb2b8d9134ec8b5e
+	k8s.io/kube-scheduler => k8s.io/kubernetes/staging/src/k8s.io/kube-scheduler d02d8ba635c5cf19ef19a4a4fb2b8d9134ec8b5e
+	k8s.io/kubectl => k8s.io/kubernetes/staging/src/k8s.io/kubectl d02d8ba635c5cf19ef19a4a4fb2b8d9134ec8b5e
+	k8s.io/kubelet => k8s.io/kubernetes/staging/src/k8s.io/kubelet d02d8ba635c5cf19ef19a4a4fb2b8d9134ec8b5e
+	k8s.io/kubernetes => k8s.io/kubernetes v1.28.0-alpha.4
+	k8s.io/legacy-cloud-providers => k8s.io/kubernetes/staging/src/k8s.io/legacy-cloud-providers d02d8ba635c5cf19ef19a4a4fb2b8d9134ec8b5e
+	k8s.io/metrics => k8s.io/kubernetes/staging/src/k8s.io/metrics d02d8ba635c5cf19ef19a4a4fb2b8d9134ec8b5e
+	k8s.io/mount-utils => k8s.io/kubernetes/staging/src/k8s.io/mount-utils d02d8ba635c5cf19ef19a4a4fb2b8d9134ec8b5e
+	k8s.io/pod-security-admission => k8s.io/kubernetes/staging/src/k8s.io/pod-security-admission d02d8ba635c5cf19ef19a4a4fb2b8d9134ec8b5e
+	k8s.io/sample-apiserver => k8s.io/kubernetes/staging/src/k8s.io/sample-apiserver d02d8ba635c5cf19ef19a4a4fb2b8d9134ec8b5e
 )

Diff for: pkg/framework/util.go

@@ -299,6 +299,10 @@ func CreateContainerWithError(rc internalapi.RuntimeService, ic internalapi.Imag
 		PullPublicImage(ic, imageName, podConfig)
 	}
 
+	if config.Image.UserSpecifiedImage == "" {
+		config.Image.UserSpecifiedImage = imageName
+	}
+
 	By("Create container.")
 	containerID, err := rc.CreateContainer(context.TODO(), podID, config, podConfig)
 	return containerID, err