Merge pull request #7675 from chrishenzie/docker-schema-1-images

Update ubuntu-slim with Docker Schema 2 image
kubernetes · Jan 8, 2025 · 3d9f1df · 3d9f1df
2 parents 66d5e4a + 65177a2
commit 3d9f1df
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/vertical-pod-autoscaler/e2e/v1/common.go b/vertical-pod-autoscaler/e2e/v1/common.go
@@ -144,7 +144,7 @@ func NewNHamstersDeployment(f *framework.Framework, n int) *appsv1.Deployment {
 		defaultHamsterReplicas,                     /*replicas*/
 		hamsterLabels,                              /*podLabels*/
 		GetHamsterContainerNameByIndex(0),          /*imageName*/
-		"registry.k8s.io/ubuntu-slim:0.1",          /*image*/
+		"registry.k8s.io/ubuntu-slim:0.14",         /*image*/
 		appsv1.RollingUpdateDeploymentStrategyType, /*strategyType*/
 	)
 	d.ObjectMeta.Namespace = f.Namespace.Name
@@ -278,7 +278,7 @@ func SetupHamsterContainer(cpu, memory string) apiv1.Container {
 
 	return apiv1.Container{
 		Name:  "hamster",
-		Image: "registry.k8s.io/ubuntu-slim:0.1",
+		Image: "registry.k8s.io/ubuntu-slim:0.14",
 		Resources: apiv1.ResourceRequirements{
 			Requests: apiv1.ResourceList{
 				apiv1.ResourceCPU:    cpuQuantity,

diff --git a/vertical-pod-autoscaler/e2e/v1beta2/common.go b/vertical-pod-autoscaler/e2e/v1beta2/common.go
@@ -144,7 +144,7 @@ func NewNHamstersDeployment(f *framework.Framework, n int) *appsv1.Deployment {
 		defaultHamsterReplicas,                     /*replicas*/
 		hamsterLabels,                              /*podLabels*/
 		GetHamsterContainerNameByIndex(0),          /*imageName*/
-		"registry.k8s.io/ubuntu-slim:0.1",          /*image*/
+		"registry.k8s.io/ubuntu-slim:0.14",         /*image*/
 		appsv1.RollingUpdateDeploymentStrategyType, /*strategyType*/
 	)
 	d.ObjectMeta.Namespace = f.Namespace.Name
@@ -279,7 +279,7 @@ func SetupHamsterContainer(cpu, memory string) apiv1.Container {
 
 	return apiv1.Container{
 		Name:  "hamster",
-		Image: "registry.k8s.io/ubuntu-slim:0.1",
+		Image: "registry.k8s.io/ubuntu-slim:0.14",
 		Resources: apiv1.ResourceRequirements{
 			Requests: apiv1.ResourceList{
 				apiv1.ResourceCPU:    cpuQuantity,

diff --git a/vertical-pod-autoscaler/examples/hamster-deprecated.yaml b/vertical-pod-autoscaler/examples/hamster-deprecated.yaml
@@ -31,7 +31,7 @@ spec:
     spec:
       containers:
         - name: hamster
-          image: registry.k8s.io/ubuntu-slim:0.1
+          image: registry.k8s.io/ubuntu-slim:0.14
           resources:
             requests:
               cpu: 100m

diff --git a/vertical-pod-autoscaler/examples/hamster.yaml b/vertical-pod-autoscaler/examples/hamster.yaml
@@ -49,7 +49,7 @@ spec:
         runAsUser: 65534 # nobody
       containers:
         - name: hamster
-          image: registry.k8s.io/ubuntu-slim:0.1
+          image: registry.k8s.io/ubuntu-slim:0.14
           resources:
             requests:
               cpu: 100m