mirror of https://github.com/k3s-io/k3s
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] https://github.com/kubernetes/kubernetes/issues/4914#issuecomment-77209779pull/6/head
parent
e0ba40b67c
commit
eb882a3d1a
|
@ -284,7 +284,6 @@ func TestExampleObjectSchemas(t *testing.T) {
|
|||
"../examples/storage/redis": {
|
||||
"redis-controller": &api.ReplicationController{},
|
||||
"redis-master": &api.Pod{},
|
||||
"redis-proxy": &api.Pod{},
|
||||
"redis-sentinel-controller": &api.ReplicationController{},
|
||||
"redis-sentinel-service": &api.Service{},
|
||||
},
|
||||
|
|
|
@ -1,14 +0,0 @@
|
|||
apiVersion: v1
|
||||
kind: Pod
|
||||
metadata:
|
||||
labels:
|
||||
name: redis-proxy
|
||||
role: proxy
|
||||
name: redis-proxy
|
||||
spec:
|
||||
containers:
|
||||
- name: proxy
|
||||
image: kubernetes/redis-proxy:v2
|
||||
ports:
|
||||
- containerPort: 6379
|
||||
name: api
|
|
@ -460,15 +460,15 @@ run_pod_tests() {
|
|||
kube::test::get_object_assert pods "{{range.items}}{{$id_field}}:{{end}}" ''
|
||||
# Command
|
||||
kubectl create -f test/fixtures/doc-yaml/admin/limitrange/valid-pod.yaml "${kube_flags[@]}"
|
||||
kubectl create -f examples/storage/redis/redis-proxy.yaml "${kube_flags[@]}"
|
||||
# Post-condition: valid-pod and redis-proxy PODs are created
|
||||
kube::test::get_object_assert pods "{{range.items}}{{$id_field}}:{{end}}" 'redis-proxy:valid-pod:'
|
||||
kubectl create -f examples/storage/redis/redis-master.yaml "${kube_flags[@]}"
|
||||
# Post-condition: valid-pod and redis-master PODs are created
|
||||
kube::test::get_object_assert pods "{{range.items}}{{$id_field}}:{{end}}" 'redis-master:valid-pod:'
|
||||
|
||||
### Delete multiple PODs at once
|
||||
# Pre-condition: valid-pod and redis-proxy PODs exist
|
||||
kube::test::get_object_assert pods "{{range.items}}{{$id_field}}:{{end}}" 'redis-proxy:valid-pod:'
|
||||
# Pre-condition: valid-pod and redis-master PODs exist
|
||||
kube::test::get_object_assert pods "{{range.items}}{{$id_field}}:{{end}}" 'redis-master:valid-pod:'
|
||||
# Command
|
||||
kubectl delete pods valid-pod redis-proxy "${kube_flags[@]}" --grace-period=0 --force # delete multiple pods at once
|
||||
kubectl delete pods valid-pod redis-master "${kube_flags[@]}" --grace-period=0 --force # delete multiple pods at once
|
||||
# Post-condition: no POD exists
|
||||
kube::test::get_object_assert pods "{{range.items}}{{$id_field}}:{{end}}" ''
|
||||
|
||||
|
@ -783,12 +783,12 @@ __EOF__
|
|||
kube::test::get_object_assert pods "{{range.items}}{{$id_field}}:{{end}}" ''
|
||||
# Command
|
||||
kubectl create -f test/fixtures/doc-yaml/user-guide/multi-pod.yaml "${kube_flags[@]}"
|
||||
# Post-condition: valid-pod and redis-proxy PODs exist
|
||||
kube::test::get_object_assert pods "{{range.items}}{{$id_field}}:{{end}}" 'redis-master:redis-proxy:'
|
||||
# Post-condition: redis-master and valid-pod PODs exist
|
||||
kube::test::get_object_assert pods "{{range.items}}{{$id_field}}:{{end}}" 'redis-master:valid-pod:'
|
||||
|
||||
### Delete two PODs from 1 yaml file
|
||||
# Pre-condition: redis-master and redis-proxy PODs exist
|
||||
kube::test::get_object_assert pods "{{range.items}}{{$id_field}}:{{end}}" 'redis-master:redis-proxy:'
|
||||
# Pre-condition: redis-master and valid-pod PODs exist
|
||||
kube::test::get_object_assert pods "{{range.items}}{{$id_field}}:{{end}}" 'redis-master:valid-pod:'
|
||||
# Command
|
||||
kubectl delete -f test/fixtures/doc-yaml/user-guide/multi-pod.yaml "${kube_flags[@]}"
|
||||
# Post-condition: no PODs exist
|
||||
|
@ -1244,14 +1244,14 @@ run_kubectl_get_tests() {
|
|||
kube::test::get_object_assert pods "{{range.items}}{{$id_field}}:{{end}}" ''
|
||||
# Command
|
||||
kubectl create -f test/fixtures/doc-yaml/user-guide/multi-pod.yaml "${kube_flags[@]}"
|
||||
# Post-condition: PODs redis-master and redis-proxy exist
|
||||
# Post-condition: PODs redis-master and valid-pod exist
|
||||
|
||||
# Check that all items in the list are printed
|
||||
output_message=$(kubectl get -f test/fixtures/doc-yaml/user-guide/multi-pod.yaml -o jsonpath="{..metadata.name}" "${kube_flags[@]}")
|
||||
kube::test::if_has_string "${output_message}" "redis-master redis-proxy"
|
||||
kube::test::if_has_string "${output_message}" "redis-master valid-pod"
|
||||
|
||||
# cleanup
|
||||
kubectl delete pods redis-master redis-proxy "${kube_flags[@]}"
|
||||
kubectl delete pods redis-master valid-pod "${kube_flags[@]}"
|
||||
}
|
||||
|
||||
run_kubectl_request_timeout_tests() {
|
||||
|
|
|
@ -36,14 +36,14 @@ spec:
|
|||
apiVersion: v1
|
||||
kind: Pod
|
||||
metadata:
|
||||
name: valid-pod
|
||||
labels:
|
||||
name: redis-proxy
|
||||
role: proxy
|
||||
name: redis-proxy
|
||||
name: valid-pod
|
||||
spec:
|
||||
containers:
|
||||
- name: proxy
|
||||
image: kubernetes/redis-proxy:v1
|
||||
ports:
|
||||
- containerPort: 6379
|
||||
name: api
|
||||
- name: kubernetes-serve-hostname
|
||||
image: gcr.io/google_containers/serve_hostname
|
||||
resources:
|
||||
limits:
|
||||
cpu: "1"
|
||||
memory: 512Mi
|
||||
|
|
Loading…
Reference in New Issue