diff --git a/inttest/containerdimports/containerd_imports_test.go b/inttest/containerdimports/containerd_imports_test.go index ede1fd621734..4d8ed2b0d6f6 100644 --- a/inttest/containerdimports/containerd_imports_test.go +++ b/inttest/containerdimports/containerd_imports_test.go @@ -64,7 +64,7 @@ func (s *ContainerdImportsSuite) TestK0sGetsUp() { Containers: []corev1.Container{ { Name: "foo", - Image: "docker.io/nginx:1-alpine", + Image: "docker.io/library/nginx:1.29.3-alpine", }, }, }, @@ -82,7 +82,7 @@ func (s *ContainerdImportsSuite) TestK0sGetsUp() { Containers: []corev1.Container{ { Name: "nginx", - Image: "docker.io/nginx:1-alpine", + Image: "docker.io/library/nginx:1.29.3-alpine", }, }, }, diff --git a/inttest/customdomain/customdomain_test.go b/inttest/customdomain/customdomain_test.go index 7b9cbfbf99a5..2e98c1c215ca 100644 --- a/inttest/customdomain/customdomain_test.go +++ b/inttest/customdomain/customdomain_test.go @@ -42,7 +42,7 @@ func (s *CustomDomainSuite) TestK0sGetsUpWithCustomDomain() { ssh, err := s.SSH(s.Context(), s.ControllerNode(0)) s.Require().NoError(err) defer ssh.Disconnect() - _, err = ssh.ExecWithOutput(s.Context(), "/usr/local/bin/k0s kc run nginx --image docker.io/nginx:1-alpine") + _, err = ssh.ExecWithOutput(s.Context(), "/usr/local/bin/k0s kc run nginx --image docker.io/library/nginx:1.29.3-alpine") s.Require().NoError(err) s.NoError(common.WaitForPod(s.Context(), kc, "nginx", metav1.NamespaceDefault)) s.NoError(common.WaitForPodLogs(s.Context(), kc, metav1.NamespaceDefault)) diff --git a/pkg/applier/applier_test.go b/pkg/applier/applier_test.go index 0b0962593aaf..063d875dfd2d 100644 --- a/pkg/applier/applier_test.go +++ b/pkg/applier/applier_test.go @@ -24,7 +24,7 @@ func TestApplierAppliesAllManifestsInADirectory(t *testing.T) { apiVersion: v1 kind: Namespace metadata: - name: kube-system + name: kube-system ` template := ` apiVersion: v1 @@ -48,34 +48,28 @@ items: component: applier spec: containers: - - name: nginx - image: nginx:1.15 + - name: app + image: registry.example.com/some/app:1 ` templateDeployment := ` apiVersion: apps/v1 kind: Deployment metadata: - name: nginx + name: app namespace: kube-system spec: selector: matchLabels: - app: nginx + app: app template: metadata: labels: - app: nginx + app: app spec: containers: - - name: nginx - image: docker.io/nginx:1-alpine - resources: - limits: - memory: "64Mi" - cpu: "100m" - ports: - - containerPort: 80 + - name: app + image: registry.example.com/some/app:1 ` require.NoError(t, os.WriteFile(filepath.Join(dir, "test-ns.yaml"), []byte(templateNS), 0400)) require.NoError(t, os.WriteFile(filepath.Join(dir, "test-list.yaml"), []byte(template), 0400)) @@ -99,7 +93,7 @@ spec: assert.Equal(t, "applier", r.GetLabels()["component"]) } deployGV, _ := schema.ParseResourceArg("deployments.v1.apps") - _, err = fakes.DynamicClient.Resource(*deployGV).Namespace(metav1.NamespaceSystem).Get(ctx, "nginx", metav1.GetOptions{}) + _, err = fakes.DynamicClient.Resource(*deployGV).Namespace(metav1.NamespaceSystem).Get(ctx, "app", metav1.GetOptions{}) assert.NoError(t, err) // Attempt to delete the stack with a different applier @@ -112,7 +106,7 @@ spec: _, err = fakes.DynamicClient.Resource(*podgv).Namespace(metav1.NamespaceSystem).Get(ctx, "applier-test", metav1.GetOptions{}) assert.True(t, errors.IsNotFound(err)) - _, err = fakes.DynamicClient.Resource(*deployGV).Namespace(metav1.NamespaceSystem).Get(ctx, "nginx", metav1.GetOptions{}) + _, err = fakes.DynamicClient.Resource(*deployGV).Namespace(metav1.NamespaceSystem).Get(ctx, "app", metav1.GetOptions{}) assert.True(t, errors.IsNotFound(err)) gvNS, _ := schema.ParseResourceArg("namespaces.v1.") diff --git a/pkg/applier/manager_test.go b/pkg/applier/manager_test.go index 6f5edbd93b11..dcbf11d3c592 100644 --- a/pkg/applier/manager_test.go +++ b/pkg/applier/manager_test.go @@ -220,9 +220,9 @@ func TestManager(t *testing.T) { deployGV, _ := schema.ParseResourceArg("deployments.v1.apps") - waitForResource(t, fakes, *deployGV, metav1.NamespaceSystem, "nginx") + waitForResource(t, fakes, *deployGV, metav1.NamespaceSystem, "app") - r, err = getResource(fakes, *deployGV, metav1.NamespaceSystem, "nginx") + r, err = getResource(fakes, *deployGV, metav1.NamespaceSystem, "app") if assert.NoError(t, err) { assert.Equal(t, "Deployment", r.GetKind()) assert.Equal(t, "applier", r.GetLabels()["component"]) diff --git a/pkg/applier/testdata/manager_test/stack1/pod.yaml b/pkg/applier/testdata/manager_test/stack1/pod.yaml index 08957e15baf2..07e150b33120 100644 --- a/pkg/applier/testdata/manager_test/stack1/pod.yaml +++ b/pkg/applier/testdata/manager_test/stack1/pod.yaml @@ -7,5 +7,5 @@ metadata: component: applier spec: containers: - - name: nginx - image: nginx:1.15 + - name: app + image: registry.example.com/some/app:1 diff --git a/pkg/applier/testdata/manager_test/stack2/deploy.yaml b/pkg/applier/testdata/manager_test/stack2/deploy.yaml index 48eabe53140f..3f413da9ce57 100644 --- a/pkg/applier/testdata/manager_test/stack2/deploy.yaml +++ b/pkg/applier/testdata/manager_test/stack2/deploy.yaml @@ -1,25 +1,19 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: nginx + name: app namespace: kube-system labels: component: applier spec: selector: matchLabels: - app: nginx + app: app template: metadata: labels: - app: nginx + app: app spec: containers: - - name: nginx - image: docker.io/nginx:1-alpine - resources: - limits: - memory: "64Mi" - cpu: "100m" - ports: - - containerPort: 80 + - name: app + image: registry.example.com/some/app:1