Update test manifests to apps/v1

hack/testdata/deployment-multicontainer-resources.yaml

@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: nginx-deployment-resources

hack/testdata/deployment-multicontainer.yaml

@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: nginx-deployment

hack/testdata/deployment-revision1.yaml

@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: nginx

hack/testdata/deployment-revision2.yaml

@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: nginx

hack/testdata/deployment-with-UnixUserID.yaml

@@ -1,9 +1,14 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: deployment-with-unixuserid
+  labels:
+    app: nginx
 spec:
   replicas: 1
+  selector:
+    matchLabels:
+      app: nginx
   template:
     metadata:
       labels:

hack/testdata/frontend-replicaset.yaml

@@ -1,22 +1,18 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: ReplicaSet
 metadata:
   name: frontend
-  # these labels can be applied automatically
+  labels:
-  # from the labels in the pod template if not set
+    app: guestbook
-  # labels:
+    tier: frontend
-    # app: guestbook
-    # tier: frontend
 spec:
   # this replicas value is default
   # modify it according to your case
   replicas: 3
-  # selector can be applied automatically
+  selector:
-  # from the labels in the pod template if not set
+    matchLabels:
-  # selector:
+      app: guestbook
-  #   matchLabels:
+      tier: frontend
-  #     app: guestbook
-  #     tier: frontend
   template:
     metadata:
       labels:

hack/testdata/initializer-deployments.yaml

@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: web

hack/testdata/list.yaml

@@ -11,7 +11,7 @@ items:
       port: 80
     selector:
       app: list-deployment-test
-- apiVersion: extensions/v1beta1
+- apiVersion: apps/v1
   kind: Deployment
   metadata:
     name: list-deployment-test
@@ -19,6 +19,9 @@ items:
       app: list-deployment-test
   spec:
     replicas: 1
+    selector:
+      matchLabels:
+        app: list-deployment-test
     template:
       metadata:
         labels:

hack/testdata/recursive/deployment/deployment/nginx-broken.yaml

@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 ind: Deployment
 metadata:
   name: nginx2-deployment
@@ -6,6 +6,9 @@ metadata:
     app: nginx2-deployment
 spec:
   replicas: 2
+  selector:
+    matchLabels:
+      app: nginx2
   template:
     metadata:
       labels:

hack/testdata/recursive/deployment/deployment/nginx.yaml

@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: nginx1-deployment
@@ -6,6 +6,9 @@ metadata:
     app: nginx1-deployment
 spec:
   replicas: 2
+  selector:
+    matchLabels:
+      app: nginx1
   template:
     metadata:
       labels:

hack/testdata/recursive/deployment/nginx.yaml

@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: nginx0-deployment
@@ -6,6 +6,9 @@ metadata:
     app: nginx0-deployment
 spec:
   replicas: 2
+  selector:
+    matchLabels:
+      app: nginx0
   template:
     metadata:
       labels:

hack/testdata/redis-slave-replicaset.yaml

@@ -1,23 +1,20 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: ReplicaSet
 metadata:
   name: redis-slave
-  # these labels can be applied automatically
+  labels:
-  # from the labels in the pod template if not set
+    app: redis
-  # labels:
+    role: slave
-  #   app: redis
+    tier: backend
-  #   role: slave
-  #   tier: backend
 spec:
   # this replicas value is default
   # modify it according to your case
   replicas: 2
-  # selector can be applied automatically
+  selector:
-  # from the labels in the pod template if not set
+    matchLabels:
-  # selector:
+      app: redis
-  #   app: guestbook
+      role: slave
-  #   role: slave
+      tier: backend
-  #   tier: backend
   template:
     metadata:
       labels:

hack/testdata/retainKeys/deployment/deployment-after.yaml

@@ -1,11 +1,16 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: test-deployment-retainkeys
+  labels:
+    app: nginx
 spec:
   strategy:
     type: Recreate
   replicas: 1
+  selector:
+    matchLabels:
+      app: nginx
   template:
     metadata:
       labels:

hack/testdata/retainKeys/deployment/deployment-before.yaml

@@ -1,9 +1,14 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: test-deployment-retainkeys
+  labels:
+    app: nginx
 spec:
   replicas: 1
+  selector:
+    matchLabels:
+      app: nginx
   template:
     metadata:
       labels:

hack/testdata/rollingupdate-daemonset-rv2.yaml

@@ -1,8 +1,13 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   name: bind
+  labels:
+    service: bind
 spec:
+  selector:
+    matchLabels:
+      service: bind
   updateStrategy:
     type: RollingUpdate
     rollingUpdate:

hack/testdata/rollingupdate-daemonset.yaml

@@ -1,8 +1,13 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   name: bind
+  labels:
+    service: bind
 spec:
+  selector:
+    matchLabels:
+      service: bind
   updateStrategy:
     type: RollingUpdate
     rollingUpdate:

hack/testdata/scale-deploy-1.yaml

@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:

hack/testdata/scale-deploy-2.yaml

@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:

hack/testdata/scale-deploy-3.yaml

@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:

test/e2e/testing-manifests/guestbook/frontend-deployment.yaml.in

@@ -1,9 +1,13 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: frontend
 spec:
   replicas: 3
+  selector:
+    matchLabels:
+      app: guestbook
+      tier: frontend
   template:
     metadata:
       labels:

test/e2e/testing-manifests/guestbook/redis-master-deployment.yaml.in

@@ -1,9 +1,14 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: redis-master
 spec:
   replicas: 1
+  selector:
+    matchLabels:
+      app: redis
+      role: master
+      tier: backend
   template:
     metadata:
       labels:

test/e2e/testing-manifests/guestbook/redis-slave-deployment.yaml.in

@@ -1,9 +1,14 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: redis-slave
 spec:
   replicas: 2
+  selector:
+    matchLabels:
+      app: redis
+      role: slave
+      tier: backend
   template:
     metadata:
       labels:

test/e2e/testing-manifests/ingress/http2/rc.yaml

@@ -1,9 +1,12 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: echoheaders
 spec:
   replicas: 1
+  selector:
+    matchLabels:
+      app: echoheaders
   template:
     metadata:
       labels:

test/e2e/testing-manifests/ingress/neg-clusterip/rc.yaml

@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:
@@ -6,6 +6,9 @@ metadata:
   name: hostname
 spec:
   minReadySeconds: 60
+  selector:
+    matchLabels:
+      run: hostname  
   template:
     metadata:
       labels:

test/e2e/testing-manifests/ingress/neg-exposed/rc.yaml

@@ -1,10 +1,13 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:
     run: hostname
   name: hostname
 spec:
+  selector:
+    matchLabels:
+      run: hostname  
   template:
     metadata:
       labels:

test/e2e/testing-manifests/ingress/neg/rc.yaml

@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   labels:
@@ -6,6 +6,9 @@ metadata:
   name: hostname
 spec:
   minReadySeconds: 60
+  selector:
+    matchLabels:
+      run: hostname  
   template:
     metadata:
       labels:

test/fixtures/doc-yaml/admin/daemon.yaml

@@ -1,8 +1,11 @@
-apiVersion: extensions/v1beta1 
+apiVersion: apps/v1 
 kind: DaemonSet
 metadata:
   name: prometheus-node-exporter
 spec:
+  selector:
+    matchLabels:
+      daemon: prom-node-exp
   template:
     metadata:
       name: prometheus-node-exporter

test/fixtures/doc-yaml/user-guide/deployment.yaml

@@ -1,4 +1,4 @@
-apiVersion: extensions/v1beta1 
+apiVersion: apps/v1 
 kind: Deployment
 metadata:
   name: nginx-deployment

test/fixtures/doc-yaml/user-guide/replicaset/redis-slave.yaml

@@ -1,23 +1,20 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: ReplicaSet
 metadata:
   name: redis-slave
-  # these labels can be applied automatically
+  labels:
-  # from the labels in the pod template if not set
+    app: redis
-  # labels:
+    role: slave
-  #   app: redis
+    tier: backend
-  #   role: slave
-  #   tier: backend
 spec:
   # this replicas value is default
   # modify it according to your case
   replicas: 2
-  # selector can be applied automatically
+  selector:
-  # from the labels in the pod template if not set
+    matchLabels:
-  # selector:
+      app: redis
-  #   app: guestbook
+      role: slave
-  #   role: slave
+      tier: backend
-  #   tier: backend
   template:
     metadata:
       labels:

test/fixtures/pkg/kubectl/cmd/apply/deploy-clientside.yaml

@@ -1,8 +1,13 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: nginx-deployment
+  labels:
+    name: nginx
 spec:
+  selector:
+    matchLabels:
+      name: nginx
   strategy:
     type: Recreate
     rollingUpdate: null

test/fixtures/pkg/kubectl/cmd/apply/deploy-serverside.yaml

@@ -1,9 +1,9 @@
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   annotations:
     deployment.kubernetes.io/revision: "1"
-    kubectl.kubernetes.io/last-applied-configuration: '{"kind":"Deployment","apiVersion":"extensions/v1beta1","metadata":{"name":"nginx-deployment","creationTimestamp":null},"spec":{"template":{"metadata":{"creationTimestamp":null,"labels":{"name":"nginx"}},"spec":{"containers":[{"name":"nginx","image":"nginx","resources":{}}]}},"strategy":{}},"status":{}}'
+    kubectl.kubernetes.io/last-applied-configuration: '{"kind":"Deployment","apiVersion":"apps/v1","metadata":{"name":"nginx-deployment","creationTimestamp":null,"labels":{"name":"nginx"}},"spec":{"selector":{"matchLabels":{"name":"nginx"}},"template":{"metadata":{"creationTimestamp":null,"labels":{"name":"nginx"}},"spec":{"containers":[{"name":"nginx","image":"nginx","resources":{}}]}},"strategy":{}},"status":{}}'
   creationTimestamp: "2016-10-24T22:15:06Z"
   generation: 6
   labels:

test/fixtures/pkg/kubectl/cmd/convert/v1HPA.yaml

@@ -4,7 +4,7 @@ metadata:
   name: php-apache
 spec:
   scaleTargetRef:
-    apiVersion: apps/v1beta1
+    apiVersion: apps/v1
     kind: Deployment
     name: php-apache
   minReplicas: 1

test/fixtures/pkg/kubectl/cmd/convert/v2beta1HPA.yaml

@@ -4,7 +4,7 @@ metadata:
   name: php-apache
 spec:
   scaleTargetRef:
-    apiVersion: apps/v1beta1
+    apiVersion: apps/v1
     kind: Deployment
     name: php-apache
   minReplicas: 1

test/images/apparmor-loader/example-daemon.yaml

@@ -1,13 +1,18 @@
 # The example DaemonSet demonstrating how the profile loader can be deployed onto a cluster to
 # automatically load AppArmor profiles from a ConfigMap.
 
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   name: apparmor-loader
   # Namespace must match that of the ConfigMap.
   namespace: apparmor
+  labels:
+    daemon: apparmor-loader
 spec:
+  selector:
+    matchLabels:
+      daemon: apparmor-loader
   template:
     metadata:
       name: apparmor-loader

test/kubemark/resources/kube_dns_template.yaml

@@ -36,7 +36,7 @@ metadata:
   labels:
     addonmanager.kubernetes.io/mode: EnsureExists
 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: kube-dns