From 7d76a55e2b35967912eab58a8e442a66ad333fdc Mon Sep 17 00:00:00 2001 From: LinWengang Date: Fri, 2 Feb 2018 15:56:45 +0800 Subject: [PATCH 1/3] update workloads API version extensions/v1beta1 to apps/v1 Signed-off-by: LinWengang --- deploy/default-backend.yaml | 2 +- deploy/provider/patch-service-with-rbac.yaml | 2 +- deploy/provider/patch-service-without-rbac.yaml | 2 +- deploy/with-rbac.yaml | 2 +- deploy/without-rbac.yaml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/deploy/default-backend.yaml b/deploy/default-backend.yaml index 64f6f58ad..0f496616b 100644 --- a/deploy/default-backend.yaml +++ b/deploy/default-backend.yaml @@ -1,4 +1,4 @@ -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: default-http-backend diff --git a/deploy/provider/patch-service-with-rbac.yaml b/deploy/provider/patch-service-with-rbac.yaml index f1c4e2967..a208fe425 100644 --- a/deploy/provider/patch-service-with-rbac.yaml +++ b/deploy/provider/patch-service-with-rbac.yaml @@ -1,4 +1,4 @@ -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: nginx-ingress-controller diff --git a/deploy/provider/patch-service-without-rbac.yaml b/deploy/provider/patch-service-without-rbac.yaml index e38d5db9e..0cc6d9c98 100644 --- a/deploy/provider/patch-service-without-rbac.yaml +++ b/deploy/provider/patch-service-without-rbac.yaml @@ -1,4 +1,4 @@ -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: nginx-ingress-controller diff --git a/deploy/with-rbac.yaml b/deploy/with-rbac.yaml index a70a7fa63..cee92def9 100644 --- a/deploy/with-rbac.yaml +++ b/deploy/with-rbac.yaml @@ -1,4 +1,4 @@ -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: nginx-ingress-controller diff --git a/deploy/without-rbac.yaml b/deploy/without-rbac.yaml index 1de84195b..0d5ccea15 100644 --- a/deploy/without-rbac.yaml +++ b/deploy/without-rbac.yaml @@ -1,4 +1,4 @@ -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: nginx-ingress-controller From 9e92c63af280dbb7dadaf8ccfd5fd5df4edc78c6 Mon Sep 17 00:00:00 2001 From: LinWengang Date: Fri, 2 Feb 2018 15:56:45 +0800 Subject: [PATCH 2/3] update workloads API version extensions/v1beta1 to apps/v1 Signed-off-by: LinWengang --- deploy/default-backend.yaml | 2 +- deploy/provider/patch-service-with-rbac.yaml | 2 +- deploy/provider/patch-service-without-rbac.yaml | 2 +- deploy/with-rbac.yaml | 2 +- deploy/without-rbac.yaml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/deploy/default-backend.yaml b/deploy/default-backend.yaml index 64f6f58ad..0f496616b 100644 --- a/deploy/default-backend.yaml +++ b/deploy/default-backend.yaml @@ -1,4 +1,4 @@ -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: default-http-backend diff --git a/deploy/provider/patch-service-with-rbac.yaml b/deploy/provider/patch-service-with-rbac.yaml index f1c4e2967..a208fe425 100644 --- a/deploy/provider/patch-service-with-rbac.yaml +++ b/deploy/provider/patch-service-with-rbac.yaml @@ -1,4 +1,4 @@ -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: nginx-ingress-controller diff --git a/deploy/provider/patch-service-without-rbac.yaml b/deploy/provider/patch-service-without-rbac.yaml index e38d5db9e..0cc6d9c98 100644 --- a/deploy/provider/patch-service-without-rbac.yaml +++ b/deploy/provider/patch-service-without-rbac.yaml @@ -1,4 +1,4 @@ -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: nginx-ingress-controller diff --git a/deploy/with-rbac.yaml b/deploy/with-rbac.yaml index a70a7fa63..cee92def9 100644 --- a/deploy/with-rbac.yaml +++ b/deploy/with-rbac.yaml @@ -1,4 +1,4 @@ -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: nginx-ingress-controller diff --git a/deploy/without-rbac.yaml b/deploy/without-rbac.yaml index 1de84195b..0d5ccea15 100644 --- a/deploy/without-rbac.yaml +++ b/deploy/without-rbac.yaml @@ -1,4 +1,4 @@ -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: nginx-ingress-controller From 333b2bbdec9525e7e02e96496b37610c1fb09e94 Mon Sep 17 00:00:00 2001 From: LinWengang Date: Fri, 2 Feb 2018 21:56:53 +0800 Subject: [PATCH 3/3] required field selector apps.v1.DeploymentSpec,update default-backend.yaml Signed-off-by: LinWengang --- deploy/default-backend.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/deploy/default-backend.yaml b/deploy/default-backend.yaml index 0f496616b..a218c0ae5 100644 --- a/deploy/default-backend.yaml +++ b/deploy/default-backend.yaml @@ -7,6 +7,9 @@ metadata: namespace: ingress-nginx spec: replicas: 1 + selector: + matchLabels: + app: default-http-backend template: metadata: labels: