Skip to content

Commit 40b51b4

Browse files
dereknoladereknola
committed
Move away from docker e2e images, use gcr and ghcr
Signed-off-by: Derek Nola <[email protected]>
1 parent 4082cc4 commit 40b51b4

File tree

5 files changed

+36
-36
lines changed

5 files changed

+36
-36
lines changed

‎tests/docker/autoimport/autoimport_test.go

+22-22
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,15 @@ var _ = Describe("Verify Create", Ordered, func() {
4545
})
4646

4747
It("Create file for auto import and search in the image store", func() {
48-
cmd := `echo docker.io/library/redis:latest | tee /var/lib/rancher/k3s/agent/images/testautoimport.txt`
48+
cmd := `echo mirror.gcr.io/redis:latest | tee /var/lib/rancher/k3s/agent/images/testautoimport.txt`
4949
_, err := tc.Servers[0].RunCmdOnNode(cmd)
5050
Expect(err).NotTo(HaveOccurred(), "failed: "+cmd)
5151

5252
Eventually(func(g Gomega) {
53-
cmd := `k3s ctr images list | grep library/redis`
53+
cmd := `k3s ctr images list | grep mirror.gcr.io/redis`
5454
g.Expect(tc.Servers[0].RunCmdOnNode(cmd)).Should(ContainSubstring("io.cattle.k3s.pinned=pinned"))
5555
g.Expect(tc.Servers[0].RunCmdOnNode(cmd)).Should(ContainSubstring("io.cri-containerd.pinned=pinned"))
56-
}, "620s", "5s").Should(Succeed())
56+
}, "300s", "5s").Should(Succeed())
5757
})
5858

5959
It("Change name for the file and see if the label is still pinned", func() {
@@ -62,50 +62,50 @@ var _ = Describe("Verify Create", Ordered, func() {
6262
Expect(err).NotTo(HaveOccurred(), "failed: "+cmd)
6363

6464
Eventually(func(g Gomega) {
65-
cmd := `k3s ctr images list | grep library/redis`
65+
cmd := `k3s ctr images list | grep mirror.gcr.io/redis`
6666
g.Expect(tc.Servers[0].RunCmdOnNode(cmd)).Should(ContainSubstring("io.cattle.k3s.pinned=pinned"))
6767
g.Expect(tc.Servers[0].RunCmdOnNode(cmd)).Should(ContainSubstring("io.cri-containerd.pinned=pinned"))
68-
}, "620s", "5s").Should(Succeed())
68+
}, "300s", "5s").Should(Succeed())
6969
})
7070

7171
It("Create, remove and create again a file", func() {
72-
cmd := `echo docker.io/library/busybox:latest | tee /var/lib/rancher/k3s/agent/images/bb.txt`
72+
cmd := `echo mirror.gcr.io/busybox:latest | tee /var/lib/rancher/k3s/agent/images/bb.txt`
7373
_, err := tc.Servers[0].RunCmdOnNode(cmd)
7474
Expect(err).NotTo(HaveOccurred(), "failed: "+cmd)
7575

7676
Eventually(func(g Gomega) {
77-
cmd := `k3s ctr images list | grep library/busybox`
77+
cmd := `k3s ctr images list | grep mirror.gcr.io/busybox`
7878
g.Expect(tc.Servers[0].RunCmdOnNode(cmd)).Should(ContainSubstring("io.cattle.k3s.pinned=pinned"))
7979
g.Expect(tc.Servers[0].RunCmdOnNode(cmd)).Should(ContainSubstring("io.cri-containerd.pinned=pinned"))
80-
}, "620s", "5s").Should(Succeed())
80+
}, "300s", "5s").Should(Succeed())
8181

8282
cmd = `rm /var/lib/rancher/k3s/agent/images/bb.txt`
8383
_, err = tc.Servers[0].RunCmdOnNode(cmd)
8484
Expect(err).NotTo(HaveOccurred(), "failed: "+cmd)
8585

8686
Eventually(func(g Gomega) {
87-
cmd := `k3s ctr images list | grep library/busybox`
87+
cmd := `k3s ctr images list | grep mirror.gcr.io/busybox`
8888
g.Expect(tc.Servers[0].RunCmdOnNode(cmd)).Should(ContainSubstring("io.cattle.k3s.pinned=pinned"))
8989
g.Expect(tc.Servers[0].RunCmdOnNode(cmd)).Should(ContainSubstring("io.cri-containerd.pinned=pinned"))
90-
}, "620s", "5s").Should(Succeed())
90+
}, "300s", "5s").Should(Succeed())
9191

92-
cmd = `echo docker.io/library/busybox:latest | tee /var/lib/rancher/k3s/agent/images/bb.txt`
92+
cmd = `echo mirror.gcr.io/busybox:latest | tee /var/lib/rancher/k3s/agent/images/bb.txt`
9393
_, err = tc.Servers[0].RunCmdOnNode(cmd)
9494
Expect(err).NotTo(HaveOccurred(), "failed: "+cmd)
9595

9696
Eventually(func(g Gomega) {
97-
cmd := `k3s ctr images list | grep library/busybox`
97+
cmd := `k3s ctr images list | grep mirror.gcr.io/busybox`
9898
g.Expect(tc.Servers[0].RunCmdOnNode(cmd)).Should(ContainSubstring("io.cattle.k3s.pinned=pinned"))
9999
g.Expect(tc.Servers[0].RunCmdOnNode(cmd)).Should(ContainSubstring("io.cri-containerd.pinned=pinned"))
100-
}, "620s", "5s").Should(Succeed())
100+
}, "300s", "5s").Should(Succeed())
101101
})
102102

103103
It("Move the folder, add a image and then see if the image is going to be pinned", func() {
104104
cmd := `mv /var/lib/rancher/k3s/agent/images /var/lib/rancher/k3s/agent/test`
105105
_, err := tc.Servers[0].RunCmdOnNode(cmd)
106106
Expect(err).NotTo(HaveOccurred(), "failed: "+cmd)
107107

108-
cmd = `echo 'docker.io/library/mysql:latest' | sudo tee /var/lib/rancher/k3s/agent/test/mysql.txt`
108+
cmd = `echo 'mirror.gcr.io/mysql:latest' | sudo tee /var/lib/rancher/k3s/agent/test/mysql.txt`
109109
_, err = tc.Servers[0].RunCmdOnNode(cmd)
110110
Expect(err).NotTo(HaveOccurred(), "failed: "+cmd)
111111

@@ -114,10 +114,10 @@ var _ = Describe("Verify Create", Ordered, func() {
114114
Expect(err).NotTo(HaveOccurred(), "failed: "+cmd)
115115

116116
Eventually(func(g Gomega) {
117-
cmd := `k3s ctr images list | grep library/mysql`
117+
cmd := `k3s ctr images list | grep mirror.gcr.io/mysql`
118118
g.Expect(tc.Servers[0].RunCmdOnNode(cmd)).Should(ContainSubstring("io.cattle.k3s.pinned=pinned"))
119119
g.Expect(tc.Servers[0].RunCmdOnNode(cmd)).Should(ContainSubstring("io.cri-containerd.pinned=pinned"))
120-
}, "620s", "5s").Should(Succeed())
120+
}, "300s", "5s").Should(Succeed())
121121
})
122122

123123
It("Restarts normally", func() {
@@ -129,10 +129,10 @@ var _ = Describe("Verify Create", Ordered, func() {
129129

130130
It("Verify bb.txt image and see if are pinned", func() {
131131
Eventually(func(g Gomega) {
132-
cmd := `k3s ctr images list | grep library/busybox`
132+
cmd := `k3s ctr images list | grep mirror.gcr.io/busybox`
133133
g.Expect(tc.Servers[0].RunCmdOnNode(cmd)).Should(ContainSubstring("io.cattle.k3s.pinned=pinned"))
134134
g.Expect(tc.Servers[0].RunCmdOnNode(cmd)).Should(ContainSubstring("io.cri-containerd.pinned=pinned"))
135-
}, "620s", "5s").Should(Succeed())
135+
}, "300s", "5s").Should(Succeed())
136136
})
137137

138138
It("Removes bb.txt file", func() {
@@ -141,10 +141,10 @@ var _ = Describe("Verify Create", Ordered, func() {
141141
Expect(err).NotTo(HaveOccurred(), "failed: "+cmd)
142142

143143
Eventually(func(g Gomega) {
144-
cmd := `k3s ctr images list | grep library/busybox`
144+
cmd := `k3s ctr images list | grep mirror.gcr.io/busybox`
145145
g.Expect(tc.Servers[0].RunCmdOnNode(cmd)).Should(ContainSubstring("io.cattle.k3s.pinned=pinned"))
146146
g.Expect(tc.Servers[0].RunCmdOnNode(cmd)).Should(ContainSubstring("io.cri-containerd.pinned=pinned"))
147-
}, "620s", "5s").Should(Succeed())
147+
}, "300s", "5s").Should(Succeed())
148148
})
149149

150150
It("Restarts normally", func() {
@@ -156,10 +156,10 @@ var _ = Describe("Verify Create", Ordered, func() {
156156

157157
It("Verify if bb.txt image is unpinned", func() {
158158
Eventually(func(g Gomega) {
159-
cmd := `k3s ctr images list | grep library/busybox`
159+
cmd := `k3s ctr images list | grep mirror.gcr.io/busybox`
160160
g.Expect(tc.Servers[0].RunCmdOnNode(cmd)).ShouldNot(ContainSubstring("io.cattle.k3s.pinned=pinned"))
161161
g.Expect(tc.Servers[0].RunCmdOnNode(cmd)).ShouldNot(ContainSubstring("io.cri-containerd.pinned=pinned"))
162-
}, "620s", "5s").Should(Succeed())
162+
}, "300s", "5s").Should(Succeed())
163163
})
164164

165165
})

‎tests/e2e/privateregistry/Vagrantfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ def provision(vm, role, role_num, node_num)
3737
endpoint:
3838
- http://%{net}.100:5000
3939
rewrite:
40-
"^library/(.*)$": "docker-io-library/$1"
40+
"^library/(.*)$": "ghcr-io-library/$1"
4141
' > /etc/rancher/k3s/registries.yaml
4242
SCRIPT
4343

‎tests/e2e/privateregistry/privateregistry_test.go

+8-8
Original file line numberDiff line numberDiff line change
@@ -78,32 +78,32 @@ var _ = Describe("Verify Create", Ordered, func() {
7878
Expect(err).NotTo(HaveOccurred())
7979

8080
})
81-
// Mirror the image as NODEIP:5000/docker-io-library/nginx:1.27.3, but reference it as my-registry.local/library/nginx:1.27.3 -
81+
// Mirror the image as NODEIP:5000/ghcr-io-library/nginx:1.26.2, but reference it as my-registry.local/library/nginx:1.26.2 -
8282
// the rewrite in registries.yaml's entry for my-registry.local should ensure that it is rewritten properly when pulling from
8383
// NODEIP:5000 as a mirror.
84-
It("Should pull and image from dockerhub and send it to private registry", func() {
85-
cmd := "docker pull docker.io/library/nginx:1.27.3"
84+
It("Should pull and image from ghcr and send it to private registry", func() {
85+
cmd := "docker pull ghcr.io/linuxserver/nginx:1.26.2"
8686
_, err := tc.Servers[0].RunCmdOnNode(cmd)
8787
Expect(err).NotTo(HaveOccurred(), "failed: "+cmd)
8888

8989
nodeIP, err := tc.Servers[0].FetchNodeExternalIP()
9090
Expect(err).NotTo(HaveOccurred())
9191

92-
cmd = "docker tag docker.io/library/nginx:1.27.3 " + nodeIP + ":5000/docker-io-library/nginx:1.27.3"
92+
cmd = "docker tag ghcr.io/linuxserver/nginx:1.26.2 " + nodeIP + ":5000/ghcr-io-library/nginx:1.26.2"
9393
_, err = tc.Servers[0].RunCmdOnNode(cmd)
9494
Expect(err).NotTo(HaveOccurred(), "failed: "+cmd)
9595

96-
cmd = "docker push " + nodeIP + ":5000/docker-io-library/nginx:1.27.3"
96+
cmd = "docker push " + nodeIP + ":5000/ghcr-io-library/nginx:1.26.2"
9797
_, err = tc.Servers[0].RunCmdOnNode(cmd)
9898
Expect(err).NotTo(HaveOccurred(), "failed: "+cmd)
9999

100-
cmd = "docker image remove docker.io/library/nginx:1.27.3 " + nodeIP + ":5000/docker-io-library/nginx:1.27.3"
100+
cmd = "docker image remove ghcr.io/linuxserver/nginx:1.26.2 " + nodeIP + ":5000/ghcr-io-library/nginx:1.26.2"
101101
_, err = tc.Servers[0].RunCmdOnNode(cmd)
102102
Expect(err).NotTo(HaveOccurred(), "failed: "+cmd)
103103
})
104104

105105
It("Should create and validate deployment with private registry on", func() {
106-
res, err := tc.Servers[0].RunCmdOnNode("kubectl create deployment my-webpage --image=my-registry.local/library/nginx:1.27.3")
106+
res, err := tc.Servers[0].RunCmdOnNode("kubectl create deployment my-webpage --image=my-registry.local/library/nginx:1.26.2")
107107
fmt.Println(res)
108108
Expect(err).NotTo(HaveOccurred())
109109

@@ -120,7 +120,7 @@ var _ = Describe("Verify Create", Ordered, func() {
120120
}, "60s", "5s").Should(Succeed())
121121

122122
cmd := "curl -m 5 -s -f http://" + pod.Status.PodIP
123-
Expect(tc.Servers[0].RunCmdOnNode(cmd)).To(ContainSubstring("Welcome to nginx!"))
123+
Expect(tc.Servers[0].RunCmdOnNode(cmd)).To(ContainSubstring("Welcome to our server"))
124124
})
125125

126126
})

‎tests/e2e/s3/Vagrantfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ def provision(vm, role, role_num, node_num)
2929

3030

3131
runS3mock = <<~'SCRIPT'
32-
docker run -p 9090:9090 -p 9191:9191 -d -e initialBuckets=test-bucket -e debug=true -t adobe/s3mock
32+
docker run -p 9090:9090 -p 9191:9191 -d -e initialBuckets=test-bucket -e debug=true -t mirror.gcr.io/adobe/s3mock
3333
SCRIPT
3434

3535

‎tests/e2e/startup/startup_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -331,9 +331,9 @@ var _ = Describe("Various Startup Configurations", Ordered, func() {
331331
})
332332
Context("Verify server picks up preloaded images on start", func() {
333333
It("Downloads and preloads images", func() {
334-
_, err := tc.Servers[0].RunCmdOnNode("docker pull ranchertest/mytestcontainer:latest")
334+
_, err := tc.Servers[0].RunCmdOnNode("docker pull rancher/shell:v0.1.28")
335335
Expect(err).NotTo(HaveOccurred())
336-
_, err = tc.Servers[0].RunCmdOnNode("docker save ranchertest/mytestcontainer:latest -o /tmp/mytestcontainer.tar")
336+
_, err = tc.Servers[0].RunCmdOnNode("docker save rancher/shell:v0.1.28 -o /tmp/mytestcontainer.tar")
337337
Expect(err).NotTo(HaveOccurred())
338338
_, err = tc.Servers[0].RunCmdOnNode("mkdir -p /var/lib/rancher/k3s/agent/images/")
339339
Expect(err).NotTo(HaveOccurred())
@@ -352,9 +352,9 @@ var _ = Describe("Various Startup Configurations", Ordered, func() {
352352
})
353353
It("has loaded the test container image", func() {
354354
Eventually(func() (string, error) {
355-
cmd := "k3s crictl images | grep ranchertest/mytestcontainer"
355+
cmd := "k3s crictl images | grep rancher/shell"
356356
return tc.Servers[0].RunCmdOnNode(cmd)
357-
}, "120s", "5s").Should(ContainSubstring("ranchertest/mytestcontainer"))
357+
}, "120s", "5s").Should(ContainSubstring("rancher/shell"))
358358
})
359359
It("Kills the cluster", func() {
360360
err := KillK3sCluster(tc.AllNodes())

0 commit comments

Comments
 (0)