Skip to content

Pin nginx images to a common version #6563

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 19, 2025
+22 −34
Merged

Pin nginx images to a common version #6563

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a4ef095
Rename nginx to a generic "app" in unit tests
twz123 Oct 29, 2025
c638253
Pin nginx images to a common version
twz123 Oct 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions inttest/containerdimports/containerd_imports_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
},
},
},
Expand All @@ -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",
},
},
},
Expand Down
2 changes: 1 addition & 1 deletion inttest/customdomain/customdomain_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
26 changes: 10 additions & 16 deletions pkg/applier/applier_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ func TestApplierAppliesAllManifestsInADirectory(t *testing.T) {
apiVersion: v1
kind: Namespace
metadata:
name: kube-system
name: kube-system
`
template := `
apiVersion: v1
Expand All @@ -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))
Expand All @@ -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
Expand All @@ -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.")
Expand Down
4 changes: 2 additions & 2 deletions pkg/applier/manager_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"])
Expand Down
4 changes: 2 additions & 2 deletions pkg/applier/testdata/manager_test/stack1/pod.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ metadata:
component: applier
spec:
containers:
- name: nginx
image: nginx:1.15
- name: app
image: registry.example.com/some/app:1
16 changes: 5 additions & 11 deletions pkg/applier/testdata/manager_test/stack2/deploy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Loading