github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update hack/test-cmd.sh to use tagged, gcr.io images

Browse Source
This commit is contained in:
Erick Fejta
2016-04-06 17:14:48 -07:00
parent 16d9df180e
commit 5fd47873dd
14 changed files with 54 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
hack/test-cmd.sh
View File

@@ -136,6 +136,11 @@ KUBELET_HEALTHZ_PORT=${KUBELET_HEALTHZ_PORT:-10248}
CTLRMGR_PORT=${CTLRMGR_PORT:-10252} CTLRMGR_PORT=${CTLRMGR_PORT:-10252}
PROXY_HOST=127.0.0.1 # kubectl only serves on localhost. PROXY_HOST=127.0.0.1 # kubectl only serves on localhost.
IMAGE_NGINX="gcr.io/google-containers/nginx:1.7.9"
IMAGE_DEPLOYMENT_R1="gcr.io/google-containers/nginx:test-cmd" # deployment-revision1.yaml
IMAGE_DEPLOYMENT_R2="$IMAGE_NGINX" # deployment-revision2.yaml
IMAGE_PERL="gcr.io/google-containers/perl"
# ensure ~/.kube/config isn't loaded by tests # ensure ~/.kube/config isn't loaded by tests
HOME="${KUBE_TEMP}" HOME="${KUBE_TEMP}"
@@ -708,7 +713,7 @@ __EOF__
# Pre-Condition: no RC exists # Pre-Condition: no RC exists
kube::test::get_object_assert rc "{{range.items}}{{$id_field}}:{{end}}" '' kube::test::get_object_assert rc "{{range.items}}{{$id_field}}:{{end}}" ''
# Command: create the rc "nginx" with image nginx # Command: create the rc "nginx" with image nginx
kubectl run nginx --image=nginx --save-config --generator=run/v1 "${kube_flags[@]}" kubectl run nginx "--image=$IMAGE_NGINX" --save-config --generator=run/v1 "${kube_flags[@]}"
# Post-Condition: rc "nginx" has configuration annotation # Post-Condition: rc "nginx" has configuration annotation
[[ "$(kubectl get rc nginx -o yaml "${kube_flags[@]}" | grep kubectl.kubernetes.io/last-applied-configuration)" ]] [[ "$(kubectl get rc nginx -o yaml "${kube_flags[@]}" | grep kubectl.kubernetes.io/last-applied-configuration)" ]]
## 5. kubectl expose --save-config should generate configuration annotation ## 5. kubectl expose --save-config should generate configuration annotation
@@ -757,13 +762,13 @@ __EOF__
# Pre-Condition: no Job exists # Pre-Condition: no Job exists
kube::test::get_object_assert jobs "{{range.items}}{{$id_field}}:{{end}}" '' kube::test::get_object_assert jobs "{{range.items}}{{$id_field}}:{{end}}" ''
# Command # Command
kubectl run pi --generator=job/v1beta1 --image=perl --restart=OnFailure -- perl -Mbignum=bpi -wle 'print bpi(20)' "${kube_flags[@]}" kubectl run pi --generator=job/v1beta1 "--image=$IMAGE_PERL" --restart=OnFailure -- perl -Mbignum=bpi -wle 'print bpi(20)' "${kube_flags[@]}"
# Post-Condition: Job "pi" is created # Post-Condition: Job "pi" is created
kube::test::get_object_assert jobs "{{range.items}}{{$id_field}}:{{end}}" 'pi:' kube::test::get_object_assert jobs "{{range.items}}{{$id_field}}:{{end}}" 'pi:'
# Clean up # Clean up
kubectl delete jobs pi "${kube_flags[@]}" kubectl delete jobs pi "${kube_flags[@]}"
# Command # Command
kubectl run pi --generator=job/v1 --image=perl --restart=OnFailure -- perl -Mbignum=bpi -wle 'print bpi(20)' "${kube_flags[@]}" kubectl run pi --generator=job/v1 "--image=$IMAGE_PERL" --restart=OnFailure -- perl -Mbignum=bpi -wle 'print bpi(20)' "${kube_flags[@]}"
# Post-Condition: Job "pi" is created # Post-Condition: Job "pi" is created
kube::test::get_object_assert jobs "{{range.items}}{{$id_field}}:{{end}}" 'pi:' kube::test::get_object_assert jobs "{{range.items}}{{$id_field}}:{{end}}" 'pi:'
# Clean up # Clean up
@@ -773,7 +778,7 @@ __EOF__
# Pre-Condition: no Deployment exists # Pre-Condition: no Deployment exists
kube::test::get_object_assert deployment "{{range.items}}{{$id_field}}:{{end}}" '' kube::test::get_object_assert deployment "{{range.items}}{{$id_field}}:{{end}}" ''
# Command # Command
kubectl run nginx --image=nginx --generator=deployment/v1beta1 "${kube_flags[@]}" kubectl run nginx "--image=$IMAGE_NGINX" --generator=deployment/v1beta1 "${kube_flags[@]}"
# Post-Condition: Deployment "nginx" is created # Post-Condition: Deployment "nginx" is created
kube::test::get_object_assert deployment "{{range.items}}{{$id_field}}:{{end}}" 'nginx:' kube::test::get_object_assert deployment "{{range.items}}{{$id_field}}:{{end}}" 'nginx:'
# Clean up # Clean up
@@ -1267,26 +1272,26 @@ __EOF__
kube::test::get_object_assert deployment "{{range.items}}{{$id_field}}:{{end}}" '' kube::test::get_object_assert deployment "{{range.items}}{{$id_field}}:{{end}}" ''
# Command # Command
# Create a deployment (revision 1) # Create a deployment (revision 1)
kubectl create -f docs/user-guide/deployment.yaml "${kube_flags[@]}" kubectl create -f hack/testdata/deployment-revision1.yaml "${kube_flags[@]}"
kube::test::get_object_assert deployment "{{range.items}}{{$id_field}}:{{end}}" 'nginx-deployment:' kube::test::get_object_assert deployment "{{range.items}}{{$id_field}}:{{end}}" 'nginx-deployment:'
kube::test::get_object_assert deployment "{{range.items}}{{$deployment_image_field}}:{{end}}" 'nginx:' kube::test::get_object_assert deployment "{{range.items}}{{$deployment_image_field}}:{{end}}" "${IMAGE_DEPLOYMENT_R1}:"
# Rollback to revision 1 - should be no-op # Rollback to revision 1 - should be no-op
kubectl rollout undo deployment nginx-deployment --to-revision=1 "${kube_flags[@]}" kubectl rollout undo deployment nginx-deployment --to-revision=1 "${kube_flags[@]}"
kube::test::get_object_assert deployment "{{range.items}}{{$deployment_image_field}}:{{end}}" 'nginx:' kube::test::get_object_assert deployment "{{range.items}}{{$deployment_image_field}}:{{end}}" "${IMAGE_DEPLOYMENT_R1}:"
# Update the deployment (revision 2) # Update the deployment (revision 2)
kubectl apply -f hack/testdata/deployment-revision2.yaml "${kube_flags[@]}" kubectl apply -f hack/testdata/deployment-revision2.yaml "${kube_flags[@]}"
kube::test::get_object_assert deployment.extensions "{{range.items}}{{$deployment_image_field}}:{{end}}" 'nginx:latest:' kube::test::get_object_assert deployment.extensions "{{range.items}}{{$deployment_image_field}}:{{end}}" "${IMAGE_DEPLOYMENT_R2}:"
# Rollback to revision 1 # Rollback to revision 1
kubectl rollout undo deployment nginx-deployment --to-revision=1 "${kube_flags[@]}" kubectl rollout undo deployment nginx-deployment --to-revision=1 "${kube_flags[@]}"
sleep 1 sleep 1
kube::test::get_object_assert deployment "{{range.items}}{{$deployment_image_field}}:{{end}}" 'nginx:' kube::test::get_object_assert deployment "{{range.items}}{{$deployment_image_field}}:{{end}}" "${IMAGE_DEPLOYMENT_R1}:"
# Rollback to revision 1000000 - should be no-op # Rollback to revision 1000000 - should be no-op
kubectl rollout undo deployment nginx-deployment --to-revision=1000000 "${kube_flags[@]}" kubectl rollout undo deployment nginx-deployment --to-revision=1000000 "${kube_flags[@]}"
kube::test::get_object_assert deployment "{{range.items}}{{$deployment_image_field}}:{{end}}" 'nginx:' kube::test::get_object_assert deployment "{{range.items}}{{$deployment_image_field}}:{{end}}" "${IMAGE_DEPLOYMENT_R1}:"
# Rollback to last revision # Rollback to last revision
kubectl rollout undo deployment nginx-deployment "${kube_flags[@]}" kubectl rollout undo deployment nginx-deployment "${kube_flags[@]}"
sleep 1 sleep 1
kube::test::get_object_assert deployment "{{range.items}}{{$deployment_image_field}}:{{end}}" 'nginx:latest:' kube::test::get_object_assert deployment "{{range.items}}{{$deployment_image_field}}:{{end}}" "${IMAGE_DEPLOYMENT_R2}:"
# Pause the deployment # Pause the deployment
kubectl-with-retry rollout pause deployment nginx-deployment "${kube_flags[@]}" kubectl-with-retry rollout pause deployment nginx-deployment "${kube_flags[@]}"
# A paused deployment cannot be rolled back # A paused deployment cannot be rolled back

21
hack/testdata/deployment-revision1.yaml vendored Normal file
View File

@@ -0,0 +1,21 @@
apiVersion: extensions/v1beta1
kind: Deployment
metadata:
name: nginx-deployment
labels:
name: nginx-deployment
spec:
replicas: 3
selector:
matchLabels:
name: nginx
template:
metadata:
labels:
name: nginx
spec:
containers:
- name: nginx
image: gcr.io/google-containers/nginx:test-cmd
ports:
- containerPort: 80

4
hack/testdata/deployment-revision2.yaml vendored
View File

@@ -1,4 +1,4 @@
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: Deployment kind: Deployment
metadata: metadata:
name: nginx-deployment name: nginx-deployment
@@ -16,6 +16,6 @@ spec:
spec: spec:
containers: containers:
- name: nginx - name: nginx
image: nginx:latest image: gcr.io/google-containers/nginx:1.7.9
ports: ports:
- containerPort: 80 - containerPort: 80

2
hack/testdata/multi-resource-json-modify.json vendored
View File

@@ -43,7 +43,7 @@
"spec":{ "spec":{
"containers":[{ "containers":[{
"name": "mock-container", "name": "mock-container",
"image": "kubernetes/pause", "image": "gcr.io/google-containers/pause:2.0",
"ports":[{ "ports":[{
"containerPort":9949, "containerPort":9949,
"protocol":"TCP" "protocol":"TCP"

2
hack/testdata/multi-resource-json.json vendored
View File

@@ -41,7 +41,7 @@
"spec":{ "spec":{
"containers":[{ "containers":[{
"name": "mock-container", "name": "mock-container",
"image": "kubernetes/pause", "image": "gcr.io/google-containers/pause:2.0",
"ports":[{ "ports":[{
"containerPort":9949, "containerPort":9949,
"protocol":"TCP" "protocol":"TCP"

2
hack/testdata/multi-resource-list-modify.json vendored
View File

@@ -47,7 +47,7 @@
"spec":{ "spec":{
"containers":[{ "containers":[{
"name": "mock-container", "name": "mock-container",
"image": "kubernetes/pause", "image": "gcr.io/google-containers/pause:2.0",
"ports":[{ "ports":[{
"containerPort":9949, "containerPort":9949,
"protocol":"TCP" "protocol":"TCP"

2
hack/testdata/multi-resource-list.json vendored
View File

@@ -45,7 +45,7 @@
"spec":{ "spec":{
"containers":[{ "containers":[{
"name": "mock-container", "name": "mock-container",
"image": "kubernetes/pause", "image": "gcr.io/google-containers/pause:2.0",
"ports":[{ "ports":[{
"containerPort":9949, "containerPort":9949,
"protocol":"TCP" "protocol":"TCP"

4
hack/testdata/multi-resource-rclist-modify.json vendored
View File

@@ -26,7 +26,7 @@
"spec":{ "spec":{
"containers":[{ "containers":[{
"name": "mock-container", "name": "mock-container",
"image": "kubernetes/pause", "image": "gcr.io/google-containers/pause:2.0",
"ports":[{ "ports":[{
"containerPort":9949, "containerPort":9949,
"protocol":"TCP" "protocol":"TCP"
@@ -60,7 +60,7 @@
"spec":{ "spec":{
"containers":[{ "containers":[{
"name": "mock-container", "name": "mock-container",
"image": "kubernetes/pause", "image": "gcr.io/google-containers/pause:2.0",
"ports":[{ "ports":[{
"containerPort":9949, "containerPort":9949,
"protocol":"TCP" "protocol":"TCP"

4
hack/testdata/multi-resource-rclist.json vendored
View File

@@ -26,7 +26,7 @@
"spec":{ "spec":{
"containers":[{ "containers":[{
"name": "mock-container", "name": "mock-container",
"image": "kubernetes/pause", "image": "gcr.io/google-containers/pause:2.0",
"ports":[{ "ports":[{
"containerPort":9949, "containerPort":9949,
"protocol":"TCP" "protocol":"TCP"
@@ -60,7 +60,7 @@
"spec":{ "spec":{
"containers":[{ "containers":[{
"name": "mock-container", "name": "mock-container",
"image": "kubernetes/pause", "image": "gcr.io/google-containers/pause:2.0",
"ports":[{ "ports":[{
"containerPort":9949, "containerPort":9949,
"protocol":"TCP" "protocol":"TCP"

4
hack/testdata/multi-resource-yaml-modify.yaml vendored
View File

@@ -27,7 +27,7 @@ spec:
spec: spec:
containers: containers:
- name: mock-container - name: mock-container
image: kubernetes/pause image: gcr.io/google-containers/pause:2.0
ports: ports:
- containerPort: 9949 - containerPort: 9949
protocol: TCP protocol: TCP

4
hack/testdata/multi-resource-yaml.yaml vendored
View File

@@ -25,7 +25,7 @@ spec:
spec: spec:
containers: containers:
- name: mock-container - name: mock-container
image: kubernetes/pause image: gcr.io/google-containers/pause:2.0
ports: ports:
- containerPort: 9949 - containerPort: 9949
protocol: TCP protocol: TCP

2
hack/testdata/pod-apply.yaml vendored
View File

@@ -7,4 +7,4 @@ metadata:
spec: spec:
containers: containers:
- name: kubernetes-pause - name: kubernetes-pause
image: kubernetes/pause image: gcr.io/google-containers/pause:2.0

2
hack/testdata/pod-with-large-name.yaml vendored
View File

@@ -8,4 +8,4 @@ metadata:
spec: spec:
containers: containers:
- name: kubernetes-serve-hostname - name: kubernetes-serve-hostname
image: gcr.io/google_containers/serve_hostname image: gcr.io/google_containers/serve_hostname:v1.4

2
hack/testdata/pod.yaml vendored
View File

@@ -7,4 +7,4 @@ metadata:
spec: spec:
containers: containers:
- name: kubernetes-pause - name: kubernetes-pause
image: kubernetes/pause image: gcr.io/google-containers/pause:2.0