Skip to content

Commit eb882a3

Browse files
committed
Remove redis-proxy example
The docker image is nowhere to be found, so lets remove it. There have been a request for the Dockerfile here [1], but nobody seems to care. redis-proxy is replaced with redis-master in test-cmd-util.sh, to ensure that the tests still works. The redis-proxy pod in test/fixtures/doc-yaml/user-guide/multi-pod.yaml is replaced with valid-pod from test/fixtures/doc-yaml/admin/limitrange/valid-pod.yaml, so redis-proxy is removed every where. [1] kubernetes#4914 (comment)
1 parent e0ba40b commit eb882a3

File tree

4 files changed

+21
-36
lines changed

4 files changed

+21
-36
lines changed

examples/examples_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,6 @@ func TestExampleObjectSchemas(t *testing.T) {
284284
"../examples/storage/redis": {
285285
"redis-controller": &api.ReplicationController{},
286286
"redis-master": &api.Pod{},
287-
"redis-proxy": &api.Pod{},
288287
"redis-sentinel-controller": &api.ReplicationController{},
289288
"redis-sentinel-service": &api.Service{},
290289
},

examples/storage/redis/redis-proxy.yaml

Lines changed: 0 additions & 14 deletions
This file was deleted.

hack/make-rules/test-cmd-util.sh

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -460,15 +460,15 @@ run_pod_tests() {
460460
kube::test::get_object_assert pods "{{range.items}}{{$id_field}}:{{end}}" ''
461461
# Command
462462
kubectl create -f test/fixtures/doc-yaml/admin/limitrange/valid-pod.yaml "${kube_flags[@]}"
463-
kubectl create -f examples/storage/redis/redis-proxy.yaml "${kube_flags[@]}"
464-
# Post-condition: valid-pod and redis-proxy PODs are created
465-
kube::test::get_object_assert pods "{{range.items}}{{$id_field}}:{{end}}" 'redis-proxy:valid-pod:'
463+
kubectl create -f examples/storage/redis/redis-master.yaml "${kube_flags[@]}"
464+
# Post-condition: valid-pod and redis-master PODs are created
465+
kube::test::get_object_assert pods "{{range.items}}{{$id_field}}:{{end}}" 'redis-master:valid-pod:'
466466

467467
### Delete multiple PODs at once
468-
# Pre-condition: valid-pod and redis-proxy PODs exist
469-
kube::test::get_object_assert pods "{{range.items}}{{$id_field}}:{{end}}" 'redis-proxy:valid-pod:'
468+
# Pre-condition: valid-pod and redis-master PODs exist
469+
kube::test::get_object_assert pods "{{range.items}}{{$id_field}}:{{end}}" 'redis-master:valid-pod:'
470470
# Command
471-
kubectl delete pods valid-pod redis-proxy "${kube_flags[@]}" --grace-period=0 --force # delete multiple pods at once
471+
kubectl delete pods valid-pod redis-master "${kube_flags[@]}" --grace-period=0 --force # delete multiple pods at once
472472
# Post-condition: no POD exists
473473
kube::test::get_object_assert pods "{{range.items}}{{$id_field}}:{{end}}" ''
474474

@@ -783,12 +783,12 @@ __EOF__
783783
kube::test::get_object_assert pods "{{range.items}}{{$id_field}}:{{end}}" ''
784784
# Command
785785
kubectl create -f test/fixtures/doc-yaml/user-guide/multi-pod.yaml "${kube_flags[@]}"
786-
# Post-condition: valid-pod and redis-proxy PODs exist
787-
kube::test::get_object_assert pods "{{range.items}}{{$id_field}}:{{end}}" 'redis-master:redis-proxy:'
786+
# Post-condition: redis-master and valid-pod PODs exist
787+
kube::test::get_object_assert pods "{{range.items}}{{$id_field}}:{{end}}" 'redis-master:valid-pod:'
788788

789789
### Delete two PODs from 1 yaml file
790-
# Pre-condition: redis-master and redis-proxy PODs exist
791-
kube::test::get_object_assert pods "{{range.items}}{{$id_field}}:{{end}}" 'redis-master:redis-proxy:'
790+
# Pre-condition: redis-master and valid-pod PODs exist
791+
kube::test::get_object_assert pods "{{range.items}}{{$id_field}}:{{end}}" 'redis-master:valid-pod:'
792792
# Command
793793
kubectl delete -f test/fixtures/doc-yaml/user-guide/multi-pod.yaml "${kube_flags[@]}"
794794
# Post-condition: no PODs exist
@@ -1244,14 +1244,14 @@ run_kubectl_get_tests() {
12441244
kube::test::get_object_assert pods "{{range.items}}{{$id_field}}:{{end}}" ''
12451245
# Command
12461246
kubectl create -f test/fixtures/doc-yaml/user-guide/multi-pod.yaml "${kube_flags[@]}"
1247-
# Post-condition: PODs redis-master and redis-proxy exist
1247+
# Post-condition: PODs redis-master and valid-pod exist
12481248

12491249
# Check that all items in the list are printed
12501250
output_message=$(kubectl get -f test/fixtures/doc-yaml/user-guide/multi-pod.yaml -o jsonpath="{..metadata.name}" "${kube_flags[@]}")
1251-
kube::test::if_has_string "${output_message}" "redis-master redis-proxy"
1251+
kube::test::if_has_string "${output_message}" "redis-master valid-pod"
12521252

12531253
# cleanup
1254-
kubectl delete pods redis-master redis-proxy "${kube_flags[@]}"
1254+
kubectl delete pods redis-master valid-pod "${kube_flags[@]}"
12551255
}
12561256

12571257
run_kubectl_request_timeout_tests() {

test/fixtures/doc-yaml/user-guide/multi-pod.yaml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@ spec:
3636
apiVersion: v1
3737
kind: Pod
3838
metadata:
39+
name: valid-pod
3940
labels:
40-
name: redis-proxy
41-
role: proxy
42-
name: redis-proxy
41+
name: valid-pod
4342
spec:
4443
containers:
45-
- name: proxy
46-
image: kubernetes/redis-proxy:v1
47-
ports:
48-
- containerPort: 6379
49-
name: api
44+
- name: kubernetes-serve-hostname
45+
image: gcr.io/google_containers/serve_hostname
46+
resources:
47+
limits:
48+
cpu: "1"
49+
memory: 512Mi

0 commit comments

Comments
 (0)