diff --git a/hack/make-rules/test-cmd-util.sh b/hack/make-rules/test-cmd-util.sh index 82cab8a7ba3..732bdb64d65 100755 --- a/hack/make-rules/test-cmd-util.sh +++ b/hack/make-rules/test-cmd-util.sh @@ -3209,18 +3209,6 @@ run_deployment_tests() { kubectl delete configmap test-set-env-config "${kube_flags[@]}" kubectl delete secret test-set-env-secret "${kube_flags[@]}" - ### Delete a deployment with initializer - # Pre-condition: no deployment exists - kube::test::get_object_assert deployment "{{range.items}}{{$id_field}}:{{end}}" '' - # Create a deployment - kubectl create --request-timeout=1 -f hack/testdata/deployment-with-initializer.yaml 2>&1 "${kube_flags[@]}" || true - kube::test::get_object_assert 'deployment web' "{{$id_field}}" 'web' - # Delete a deployment - kubectl delete deployment web "${kube_flags[@]}" - # Check Deployment web doesn't exist - output_message=$(! kubectl get deployment web 2>&1 "${kube_flags[@]}") - kube::test::if_has_string "${output_message}" '"web" not found' - set +o nounset set +o errexit } @@ -3362,18 +3350,6 @@ run_rs_tests() { # Post-condition: no replica set exists kube::test::get_object_assert rs "{{range.items}}{{$id_field}}:{{end}}" '' - ### Delete a rs with initializer - # Pre-condition: no rs exists - kube::test::get_object_assert rs "{{range.items}}{{$id_field}}:{{end}}" '' - # Create a rs - kubectl create --request-timeout=1 -f hack/testdata/replicaset-with-initializer.yaml 2>&1 "${kube_flags[@]}" || true - kube::test::get_object_assert 'rs nginx' "{{$id_field}}" 'nginx' - # Delete a rs - kubectl delete rs nginx "${kube_flags[@]}" - # check rs nginx doesn't exist - output_message=$(! kubectl get rs nginx 2>&1 "${kube_flags[@]}") - kube::test::if_has_string "${output_message}" '"nginx" not found' - if kube::test::if_supports_resource "${horizontalpodautoscalers}" ; then ### Auto scale replica set # Pre-condition: no replica set exists diff --git a/hack/testdata/deployment-with-initializer.yaml b/hack/testdata/deployment-with-initializer.yaml deleted file mode 100644 index 2fb81498cc5..00000000000 --- a/hack/testdata/deployment-with-initializer.yaml +++ /dev/null @@ -1,25 +0,0 @@ -apiVersion: extensions/v1beta1 -kind: Deployment -metadata: - name: web - labels: - run: web - initializers: - pending: - - name: podimage.initializer.com -spec: - replicas: 5 - selector: - matchLabels: - run: web - template: - metadata: - labels: - run: web - spec: - containers: - - image: nginx:1.10 - name: web - ports: - - containerPort: 80 - protocol: TCP diff --git a/hack/testdata/replicaset-with-initializer.yaml b/hack/testdata/replicaset-with-initializer.yaml deleted file mode 100644 index 8530faf90ff..00000000000 --- a/hack/testdata/replicaset-with-initializer.yaml +++ /dev/null @@ -1,23 +0,0 @@ -apiVersion: extensions/v1beta1 -kind: ReplicaSet -metadata: - name: nginx - initializers: - pending: - - name: podimage.initializer.com -spec: - replicas: 3 - selector: - matchLabels: - app: nginx - template: - metadata: - name: nginx - labels: - app: nginx - spec: - containers: - - name: nginx - image: nginx:1.10 - ports: - - containerPort: 80