From 9c011c6e0f76226beb28d65ba81bb2760b2c4003 Mon Sep 17 00:00:00 2001 From: "Madhusudan.C.S" Date: Thu, 10 Mar 2016 10:42:43 -0800 Subject: [PATCH] Copy replicaset example yamls to hack/testdata directory. --- hack/test-cmd.sh | 12 +++---- hack/testdata/frontend-replicaset.yaml | 42 ++++++++++++++++++++++ hack/testdata/redis-slave-replicaset.yaml | 44 +++++++++++++++++++++++ 3 files changed, 91 insertions(+), 7 deletions(-) create mode 100644 hack/testdata/frontend-replicaset.yaml create mode 100644 hack/testdata/redis-slave-replicaset.yaml diff --git a/hack/test-cmd.sh b/hack/test-cmd.sh index 0ae6a16c6af4f..b54d96211c433 100755 --- a/hack/test-cmd.sh +++ b/hack/test-cmd.sh @@ -1289,7 +1289,7 @@ __EOF__ # Pre-condition: no replica set exists kube::test::get_object_assert rs "{{range.items}}{{$id_field}}:{{end}}" '' # Command - kubectl create -f docs/user-guide/replicaset/frontend.yaml "${kube_flags[@]}" + kubectl create -f hack/testdata/frontend-replicaset.yaml "${kube_flags[@]}" kubectl delete rs frontend "${kube_flags[@]}" # Post-condition: no pods from frontend replica set kube::test::get_object_assert 'pods -l "tier=frontend"' "{{range.items}}{{$id_field}}:{{end}}" '' @@ -1298,7 +1298,7 @@ __EOF__ # Pre-condition: no replica set exists kube::test::get_object_assert rs "{{range.items}}{{$id_field}}:{{end}}" '' # Command - kubectl create -f docs/user-guide/replicaset/frontend.yaml "${kube_flags[@]}" + kubectl create -f hack/testdata/frontend-replicaset.yaml "${kube_flags[@]}" # Post-condition: frontend replica set is created kube::test::get_object_assert rs "{{range.items}}{{$id_field}}:{{end}}" 'frontend:' @@ -1314,10 +1314,8 @@ __EOF__ # Clean-up kubectl delete rs frontend "${kube_flags[@]}" - # TODO(madhusudancs): Fix this when Scale group issues are resolved (see issue #18528). - ### Expose replica set as service - kubectl create -f docs/user-guide/replicaset/frontend.yaml "${kube_flags[@]}" + kubectl create -f hack/testdata/frontend-replicaset.yaml "${kube_flags[@]}" # Pre-condition: 3 replicas kube::test::get_object_assert 'rs frontend' "{{$rs_replicas_field}}" '3' # Command @@ -1343,8 +1341,8 @@ __EOF__ # Pre-condition: no replica set exists kube::test::get_object_assert rs "{{range.items}}{{$id_field}}:{{end}}" '' # Command - kubectl create -f docs/user-guide/replicaset/frontend.yaml "${kube_flags[@]}" - kubectl create -f docs/user-guide/replicaset/redis-slave.yaml "${kube_flags[@]}" + kubectl create -f hack/testdata/frontend-replicaset.yaml "${kube_flags[@]}" + kubectl create -f hack/testdata/redis-slave-replicaset.yaml "${kube_flags[@]}" # Post-condition: frontend and redis-slave kube::test::get_object_assert rs "{{range.items}}{{$id_field}}:{{end}}" 'frontend:redis-slave:' diff --git a/hack/testdata/frontend-replicaset.yaml b/hack/testdata/frontend-replicaset.yaml new file mode 100644 index 0000000000000..878e10181ecdb --- /dev/null +++ b/hack/testdata/frontend-replicaset.yaml @@ -0,0 +1,42 @@ +apiVersion: extensions/v1beta1 +kind: ReplicaSet +metadata: + name: frontend + # these labels can be applied automatically + # from the labels in the pod template if not set + # labels: + # app: guestbook + # tier: frontend +spec: + # this replicas value is default + # modify it according to your case + replicas: 3 + # selector can be applied automatically + # from the labels in the pod template if not set + # selector: + # matchLabels: + # app: guestbook + # tier: frontend + template: + metadata: + labels: + app: guestbook + tier: frontend + spec: + containers: + - name: php-redis + image: gcr.io/google_samples/gb-frontend:v3 + resources: + requests: + cpu: 100m + memory: 100Mi + env: + - name: GET_HOSTS_FROM + value: dns + # If your cluster config does not include a dns service, then to + # instead access environment variables to find service host + # info, comment out the 'value: dns' line above, and uncomment the + # line below. + # value: env + ports: + - containerPort: 80 diff --git a/hack/testdata/redis-slave-replicaset.yaml b/hack/testdata/redis-slave-replicaset.yaml new file mode 100644 index 0000000000000..0948371e18285 --- /dev/null +++ b/hack/testdata/redis-slave-replicaset.yaml @@ -0,0 +1,44 @@ +apiVersion: extensions/v1beta1 +kind: ReplicaSet +metadata: + name: redis-slave + # these labels can be applied automatically + # from the labels in the pod template if not set + # labels: + # app: redis + # role: slave + # tier: backend +spec: + # this replicas value is default + # modify it according to your case + replicas: 2 + # selector can be applied automatically + # from the labels in the pod template if not set + # selector: + # app: guestbook + # role: slave + # tier: backend + template: + metadata: + labels: + app: redis + role: slave + tier: backend + spec: + containers: + - name: slave + image: gcr.io/google_samples/gb-redisslave:v1 + resources: + requests: + cpu: 100m + memory: 100Mi + env: + - name: GET_HOSTS_FROM + value: dns + # If your cluster config does not include a dns service, then to + # instead access an environment variable to find the master + # service's host, comment out the 'value: dns' line above, and + # uncomment the line below. + # value: env + ports: + - containerPort: 6379