Skip to content

Commit 5553223

Browse files
committed
Move from ranchertest to mirrored-busybox
Signed-off-by: Derek Nola <[email protected]>
1 parent 9fb77c8 commit 5553223

21 files changed

+72
-62
lines changed

tests/docker/resources/clusterip.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ spec:
1414
spec:
1515
containers:
1616
- name: nginx
17-
image: ranchertest/mytestcontainer
17+
image: rancher/mirrored-library-busybox:1.37.0
18+
args: ['sh', '-c', 'echo Welcome to nginx! > index.html; hostname > name.html; httpd -vvf']
1819
ports:
1920
- containerPort: 80
2021
---

tests/docker/resources/dualstack_clusterip.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ spec:
1414
spec:
1515
containers:
1616
- name: nginx
17-
image: ranchertest/mytestcontainer
17+
image: rancher/mirrored-library-busybox:1.37.0
18+
args: ['sh', '-c', 'echo Welcome to nginx! > index.html; hostname > name.html; httpd -vvf']
1819
ports:
1920
- containerPort: 80
2021
---

tests/docker/resources/dualstack_nodeport.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ spec:
1414
spec:
1515
containers:
1616
- name: nginx
17-
image: ranchertest/mytestcontainer
17+
image: rancher/mirrored-library-busybox:1.37.0
18+
args: ['sh', '-c', 'echo Welcome to nginx! > index.html; hostname > name.html; httpd -vvf']
1819
ports:
1920
- containerPort: 80
2021
---

tests/docker/resources/loadbalancer-allTraffic.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ spec:
3333
spec:
3434
containers:
3535
- name: nginx
36-
image: ranchertest/mytestcontainer
36+
image: rancher/mirrored-library-nginx:1.29.1-alpine
3737
ports:
3838
- containerPort: 80
3939
volumeMounts:

tests/docker/resources/loadbalancer-extTrafficPol.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ spec:
3333
spec:
3434
containers:
3535
- name: nginx
36-
image: ranchertest/mytestcontainer
36+
image: rancher/mirrored-library-nginx:1.29.1-alpine
3737
ports:
3838
- containerPort: 80
3939
volumeMounts:

tests/docker/resources/loadbalancer-intTrafficPol.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ spec:
3434
spec:
3535
containers:
3636
- name: nginx
37-
image: ranchertest/mytestcontainer
37+
image: rancher/mirrored-library-nginx:1.29.1-alpine
3838
ports:
3939
- containerPort: 80
4040
volumeMounts:

tests/docker/resources/nodeport.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ spec:
1414
spec:
1515
containers:
1616
- name: nginx
17-
image: ranchertest/mytestcontainer
17+
image: rancher/mirrored-library-busybox:1.37.0
18+
args: ['sh', '-c', 'echo Welcome to nginx! > index.html; hostname > name.html; httpd -vvf']
1819
ports:
1920
- containerPort: 80
2021
---

tests/docker/resources/pod_client.yaml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,10 @@ spec:
1515
app: client
1616
spec:
1717
containers:
18-
- image: ranchertest/mytestcontainer
18+
- image: rancher/mirrored-library-busybox:1.37.0
19+
args: ['sh', '-c', 'echo Welcome to nginx! > index.html; hostname > name.html; httpd -vvf']
1920
imagePullPolicy: Always
20-
name: client-curl
21+
name: client-wget
2122
affinity:
2223
podAntiAffinity:
2324
requiredDuringSchedulingIgnoredDuringExecution:
@@ -32,10 +33,10 @@ spec:
3233
apiVersion: v1
3334
kind: Service
3435
metadata:
35-
name: client-curl
36+
name: client-wget
3637
labels:
3738
app: client
38-
service: client-curl
39+
service: client-wget
3940
spec:
4041
type: ClusterIP
4142
selector:

tests/docker/svcpoliciesandfirewall/svcpoliciesandfirewall_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -176,12 +176,12 @@ var _ = Describe("Verify Services Traffic policies and firewall config", Ordered
176176

177177
var workingCmd, nonWorkingCmd string
178178
if serverNodeName == clientPod1Node {
179-
workingCmd = fmt.Sprintf("kubectl exec --kubeconfig=%s %s -- curl -m 5 -s -f http://nginx-loadbalancer-svc-int:83/ip", tc.KubeconfigFile, clientPod1)
180-
nonWorkingCmd = fmt.Sprintf("kubectl exec --kubeconfig=%s %s -- curl -m 5 -s -f http://nginx-loadbalancer-svc-int:83/ip", tc.KubeconfigFile, clientPod2)
179+
workingCmd = fmt.Sprintf("kubectl exec --kubeconfig=%s %s -- wget -T 5 -q -O - http://nginx-loadbalancer-svc-int:83/ip", tc.KubeconfigFile, clientPod1)
180+
nonWorkingCmd = fmt.Sprintf("kubectl exec --kubeconfig=%s %s -- wget -T 5 -q -O - http://nginx-loadbalancer-svc-int:83/ip", tc.KubeconfigFile, clientPod2)
181181
}
182182
if serverNodeName == clientPod2Node {
183-
workingCmd = fmt.Sprintf("kubectl exec --kubeconfig=%s %s -- curl -m 5 -s -f http://nginx-loadbalancer-svc-int:83/ip", tc.KubeconfigFile, clientPod2)
184-
nonWorkingCmd = fmt.Sprintf("kubectl exec --kubeconfig=%s %s -- curl -m 5 -s -f http://nginx-loadbalancer-svc-int:83/ip", tc.KubeconfigFile, clientPod1)
183+
workingCmd = fmt.Sprintf("kubectl exec --kubeconfig=%s %s -- wget -T 5 -q -O - http://nginx-loadbalancer-svc-int:83/ip", tc.KubeconfigFile, clientPod2)
184+
nonWorkingCmd = fmt.Sprintf("kubectl exec --kubeconfig=%s %s -- wget -T 5 -q -O - http://nginx-loadbalancer-svc-int:83/ip", tc.KubeconfigFile, clientPod1)
185185
}
186186

187187
Eventually(func() (string, error) {
@@ -204,7 +204,7 @@ var _ = Describe("Verify Services Traffic policies and firewall config", Ordered
204204

205205
// curling a service with internal traffic policy=cluster. It should work on both pods
206206
for _, pod := range []string{clientPod1, clientPod2} {
207-
cmd := "kubectl exec " + "--kubeconfig=" + tc.KubeconfigFile + " " + pod + " -- curl -m 5 -s -f http://nginx-loadbalancer-svc:81/ip"
207+
cmd := "kubectl exec " + "--kubeconfig=" + tc.KubeconfigFile + " " + pod + " -- wget -T 5 -q -O - http://nginx-loadbalancer-svc:81/ip"
208208
Eventually(func() (string, error) {
209209
return tests.RunCommand(cmd)
210210
}, "20s", "5s").Should(SatisfyAny(

tests/e2e/amd64_resource_files/clusterip.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ spec:
1414
spec:
1515
containers:
1616
- name: nginx
17-
image: ranchertest/mytestcontainer
17+
image: rancher/mirrored-library-busybox:1.37.0
18+
args: ['sh', '-c', 'echo Welcome to nginx! > index.html; hostname > name.html; httpd -vvf']
1819
ports:
1920
- containerPort: 80
2021
---

0 commit comments

Comments
 (0)