diff --git a/hack/testdata/deployment-multicontainer-resources.yaml b/hack/testdata/deployment-multicontainer-resources.yaml index b36ace094b3..f574bcac000 100644 --- a/hack/testdata/deployment-multicontainer-resources.yaml +++ b/hack/testdata/deployment-multicontainer-resources.yaml @@ -1,4 +1,4 @@ -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: nginx-deployment-resources diff --git a/hack/testdata/deployment-multicontainer.yaml b/hack/testdata/deployment-multicontainer.yaml index 117483957fd..47f0ceeb270 100644 --- a/hack/testdata/deployment-multicontainer.yaml +++ b/hack/testdata/deployment-multicontainer.yaml @@ -1,4 +1,4 @@ -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: nginx-deployment diff --git a/hack/testdata/deployment-revision1.yaml b/hack/testdata/deployment-revision1.yaml index 2bcb8edea73..d60e08de2b0 100644 --- a/hack/testdata/deployment-revision1.yaml +++ b/hack/testdata/deployment-revision1.yaml @@ -1,4 +1,4 @@ -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: nginx diff --git a/hack/testdata/deployment-revision2.yaml b/hack/testdata/deployment-revision2.yaml index 1ed91c1375a..935e0e146d3 100644 --- a/hack/testdata/deployment-revision2.yaml +++ b/hack/testdata/deployment-revision2.yaml @@ -1,4 +1,4 @@ -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: nginx diff --git a/hack/testdata/deployment-with-UnixUserID.yaml b/hack/testdata/deployment-with-UnixUserID.yaml index ef69b33558c..cbfa76855a2 100644 --- a/hack/testdata/deployment-with-UnixUserID.yaml +++ b/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: diff --git a/hack/testdata/frontend-replicaset.yaml b/hack/testdata/frontend-replicaset.yaml index 878e10181ec..3dfeb9cb0a2 100644 --- a/hack/testdata/frontend-replicaset.yaml +++ b/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 - # from the labels in the pod template if not set - # labels: - # app: guestbook - # tier: frontend + 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 + selector: + matchLabels: + app: guestbook + tier: frontend template: metadata: labels: diff --git a/hack/testdata/initializer-deployments.yaml b/hack/testdata/initializer-deployments.yaml index 8564a874a3e..973a0a27636 100644 --- a/hack/testdata/initializer-deployments.yaml +++ b/hack/testdata/initializer-deployments.yaml @@ -1,4 +1,4 @@ -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: web diff --git a/hack/testdata/list.yaml b/hack/testdata/list.yaml index 1864e54e161..8e3bd5f3dfe 100644 --- a/hack/testdata/list.yaml +++ b/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: diff --git a/hack/testdata/recursive/deployment/deployment/nginx-broken.yaml b/hack/testdata/recursive/deployment/deployment/nginx-broken.yaml index 18c0d4ea7a2..c516dfdc8f4 100644 --- a/hack/testdata/recursive/deployment/deployment/nginx-broken.yaml +++ b/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: diff --git a/hack/testdata/recursive/deployment/deployment/nginx.yaml b/hack/testdata/recursive/deployment/deployment/nginx.yaml index f416d6c25cd..f4dde6d609d 100644 --- a/hack/testdata/recursive/deployment/deployment/nginx.yaml +++ b/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: diff --git a/hack/testdata/recursive/deployment/nginx.yaml b/hack/testdata/recursive/deployment/nginx.yaml index 7988317f466..7c83f9654a6 100644 --- a/hack/testdata/recursive/deployment/nginx.yaml +++ b/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: diff --git a/hack/testdata/redis-slave-replicaset.yaml b/hack/testdata/redis-slave-replicaset.yaml index 0948371e182..daa1507c556 100644 --- a/hack/testdata/redis-slave-replicaset.yaml +++ b/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 - # from the labels in the pod template if not set - # labels: - # app: redis - # role: slave - # tier: backend + 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 + selector: + matchLabels: + app: redis + role: slave + tier: backend template: metadata: labels: diff --git a/hack/testdata/retainKeys/deployment/deployment-after.yaml b/hack/testdata/retainKeys/deployment/deployment-after.yaml index 15689a59959..656e4602d84 100644 --- a/hack/testdata/retainKeys/deployment/deployment-after.yaml +++ b/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: diff --git a/hack/testdata/retainKeys/deployment/deployment-before.yaml b/hack/testdata/retainKeys/deployment/deployment-before.yaml index e58a0c34a14..80e9f66224c 100644 --- a/hack/testdata/retainKeys/deployment/deployment-before.yaml +++ b/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: diff --git a/hack/testdata/rollingupdate-daemonset-rv2.yaml b/hack/testdata/rollingupdate-daemonset-rv2.yaml index b807e958dd2..f3023834c6a 100644 --- a/hack/testdata/rollingupdate-daemonset-rv2.yaml +++ b/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: diff --git a/hack/testdata/rollingupdate-daemonset.yaml b/hack/testdata/rollingupdate-daemonset.yaml index 4bc77ed5bfe..d4ced8044a0 100644 --- a/hack/testdata/rollingupdate-daemonset.yaml +++ b/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: diff --git a/hack/testdata/scale-deploy-1.yaml b/hack/testdata/scale-deploy-1.yaml index b1e6ee5a01e..91f1fa0d875 100644 --- a/hack/testdata/scale-deploy-1.yaml +++ b/hack/testdata/scale-deploy-1.yaml @@ -1,4 +1,4 @@ -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: labels: diff --git a/hack/testdata/scale-deploy-2.yaml b/hack/testdata/scale-deploy-2.yaml index dc954b5b5cd..e69847bf74b 100644 --- a/hack/testdata/scale-deploy-2.yaml +++ b/hack/testdata/scale-deploy-2.yaml @@ -1,4 +1,4 @@ -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: labels: diff --git a/hack/testdata/scale-deploy-3.yaml b/hack/testdata/scale-deploy-3.yaml index 63a7d759335..0eec827015e 100644 --- a/hack/testdata/scale-deploy-3.yaml +++ b/hack/testdata/scale-deploy-3.yaml @@ -1,4 +1,4 @@ -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: labels: diff --git a/test/e2e/testing-manifests/guestbook/frontend-deployment.yaml.in b/test/e2e/testing-manifests/guestbook/frontend-deployment.yaml.in index 6cbd92fe717..de9ceccedea 100644 --- a/test/e2e/testing-manifests/guestbook/frontend-deployment.yaml.in +++ b/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: diff --git a/test/e2e/testing-manifests/guestbook/redis-master-deployment.yaml.in b/test/e2e/testing-manifests/guestbook/redis-master-deployment.yaml.in index 6de8c5590ff..1f6a674ab57 100644 --- a/test/e2e/testing-manifests/guestbook/redis-master-deployment.yaml.in +++ b/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: diff --git a/test/e2e/testing-manifests/guestbook/redis-slave-deployment.yaml.in b/test/e2e/testing-manifests/guestbook/redis-slave-deployment.yaml.in index 38210542007..46775a82306 100644 --- a/test/e2e/testing-manifests/guestbook/redis-slave-deployment.yaml.in +++ b/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: diff --git a/test/e2e/testing-manifests/ingress/http2/rc.yaml b/test/e2e/testing-manifests/ingress/http2/rc.yaml index d60c984ed4d..c6d411ed32f 100644 --- a/test/e2e/testing-manifests/ingress/http2/rc.yaml +++ b/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: diff --git a/test/e2e/testing-manifests/ingress/neg-clusterip/rc.yaml b/test/e2e/testing-manifests/ingress/neg-clusterip/rc.yaml index 32938b628ba..8d4ceefed47 100644 --- a/test/e2e/testing-manifests/ingress/neg-clusterip/rc.yaml +++ b/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: diff --git a/test/e2e/testing-manifests/ingress/neg-exposed/rc.yaml b/test/e2e/testing-manifests/ingress/neg-exposed/rc.yaml index 6ee21b2add4..a98f398b7e7 100644 --- a/test/e2e/testing-manifests/ingress/neg-exposed/rc.yaml +++ b/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: diff --git a/test/e2e/testing-manifests/ingress/neg/rc.yaml b/test/e2e/testing-manifests/ingress/neg/rc.yaml index 32938b628ba..8d4ceefed47 100644 --- a/test/e2e/testing-manifests/ingress/neg/rc.yaml +++ b/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: diff --git a/test/fixtures/doc-yaml/admin/daemon.yaml b/test/fixtures/doc-yaml/admin/daemon.yaml index c5cd14a5921..c7a5547c761 100644 --- a/test/fixtures/doc-yaml/admin/daemon.yaml +++ b/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 diff --git a/test/fixtures/doc-yaml/user-guide/deployment.yaml b/test/fixtures/doc-yaml/user-guide/deployment.yaml index 98e614ceb2e..f6a90428b61 100644 --- a/test/fixtures/doc-yaml/user-guide/deployment.yaml +++ b/test/fixtures/doc-yaml/user-guide/deployment.yaml @@ -1,4 +1,4 @@ -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: nginx-deployment diff --git a/test/fixtures/doc-yaml/user-guide/replicaset/redis-slave.yaml b/test/fixtures/doc-yaml/user-guide/replicaset/redis-slave.yaml index 5c470d2ef6a..ca2f826f86d 100644 --- a/test/fixtures/doc-yaml/user-guide/replicaset/redis-slave.yaml +++ b/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 - # from the labels in the pod template if not set - # labels: - # app: redis - # role: slave - # tier: backend + 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 + selector: + matchLabels: + app: redis + role: slave + tier: backend template: metadata: labels: diff --git a/test/fixtures/pkg/kubectl/cmd/apply/deploy-clientside.yaml b/test/fixtures/pkg/kubectl/cmd/apply/deploy-clientside.yaml index b3aa9071c4b..4261fb09b96 100644 --- a/test/fixtures/pkg/kubectl/cmd/apply/deploy-clientside.yaml +++ b/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 diff --git a/test/fixtures/pkg/kubectl/cmd/apply/deploy-serverside.yaml b/test/fixtures/pkg/kubectl/cmd/apply/deploy-serverside.yaml index 566b18ab2c8..664b87fd770 100644 --- a/test/fixtures/pkg/kubectl/cmd/apply/deploy-serverside.yaml +++ b/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: diff --git a/test/fixtures/pkg/kubectl/cmd/convert/v1HPA.yaml b/test/fixtures/pkg/kubectl/cmd/convert/v1HPA.yaml index de7efbde371..f3f1ef5d4f9 100644 --- a/test/fixtures/pkg/kubectl/cmd/convert/v1HPA.yaml +++ b/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 diff --git a/test/fixtures/pkg/kubectl/cmd/convert/v2beta1HPA.yaml b/test/fixtures/pkg/kubectl/cmd/convert/v2beta1HPA.yaml index 8247b24dcd2..88a5dc7001a 100644 --- a/test/fixtures/pkg/kubectl/cmd/convert/v2beta1HPA.yaml +++ b/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 diff --git a/test/images/apparmor-loader/example-daemon.yaml b/test/images/apparmor-loader/example-daemon.yaml index f7df03804b4..7a558a480f2 100644 --- a/test/images/apparmor-loader/example-daemon.yaml +++ b/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 diff --git a/test/kubemark/resources/kube_dns_template.yaml b/test/kubemark/resources/kube_dns_template.yaml index 8d812023f09..02c2a68a2e5 100644 --- a/test/kubemark/resources/kube_dns_template.yaml +++ b/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