From 0f261411879b0c39593e692aff58da903d157a8c Mon Sep 17 00:00:00 2001 From: Edward Viaene Date: Sun, 29 Sep 2019 14:56:01 +0200 Subject: [PATCH] deployment api version change - istio --- istio/helloworld-jwt.yaml | 10 ++++++++-- istio/helloworld-rbac.yaml | 15 ++++++++++++--- istio/helloworld-tls-legacy.yaml | 10 ++++++++-- istio/helloworld-tls.yaml | 20 ++++++++++++++++---- istio/helloworld-v2.yaml | 5 ++++- istio/helloworld-v3.yaml | 10 ++++++++-- istio/helloworld.yaml | 15 ++++++++++++--- 7 files changed, 68 insertions(+), 17 deletions(-) diff --git a/istio/helloworld-jwt.yaml b/istio/helloworld-jwt.yaml index d43f6bc..9068ed7 100644 --- a/istio/helloworld-jwt.yaml +++ b/istio/helloworld-jwt.yaml @@ -45,12 +45,15 @@ spec: port: number: 8080 --- -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: auth spec: replicas: 1 + selector: + matchLabels: + app: auth template: metadata: labels: @@ -81,12 +84,15 @@ spec: port: 8080 targetPort: 8080 --- -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: hello spec: replicas: 1 + selector: + matchLabels: + app: hello template: metadata: labels: diff --git a/istio/helloworld-rbac.yaml b/istio/helloworld-rbac.yaml index b126342..63d585e 100644 --- a/istio/helloworld-rbac.yaml +++ b/istio/helloworld-rbac.yaml @@ -82,12 +82,15 @@ metadata: ### helloworld.yaml deployments, including a serviceaccount ### for the hello deployment and the world deployment ### -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: hello spec: replicas: 1 + selector: + matchLabels: + app: hello template: metadata: labels: @@ -121,12 +124,15 @@ spec: port: 8080 targetPort: 8080 --- -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: world spec: replicas: 1 + selector: + matchLabels: + app: world template: metadata: labels: @@ -160,12 +166,15 @@ spec: port: 8080 targetPort: 8080 --- -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: world-2 spec: replicas: 1 + selector: + matchLabels: + app: world-2 template: metadata: labels: diff --git a/istio/helloworld-tls-legacy.yaml b/istio/helloworld-tls-legacy.yaml index 6180843..ca1e28a 100644 --- a/istio/helloworld-tls-legacy.yaml +++ b/istio/helloworld-tls-legacy.yaml @@ -3,13 +3,16 @@ kind: Namespace metadata: name: legacy --- -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: end-tls namespace: legacy spec: replicas: 1 + selector: + matchLabels: + app: end template: metadata: labels: @@ -26,13 +29,16 @@ spec: - name: http containerPort: 8080 --- -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: hello-reverse-tls namespace: legacy spec: replicas: 1 + selector: + matchLabels: + app: hello-reverse template: metadata: labels: diff --git a/istio/helloworld-tls.yaml b/istio/helloworld-tls.yaml index c115774..4e0508f 100644 --- a/istio/helloworld-tls.yaml +++ b/istio/helloworld-tls.yaml @@ -8,13 +8,16 @@ kind: Namespace metadata: name: ns2 --- -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: hello-tls namespace: ns1 spec: replicas: 1 + selector: + matchLabels: + app: hello template: metadata: labels: @@ -33,13 +36,16 @@ spec: - name: http containerPort: 8080 --- -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: world-tls namespace: ns2 spec: replicas: 1 + selector: + matchLabels: + app: world template: metadata: labels: @@ -58,13 +64,16 @@ spec: - name: http containerPort: 8080 --- -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: world-reverse-tls namespace: ns2 spec: replicas: 1 + selector: + matchLabels: + app: world-reverse template: metadata: labels: @@ -83,13 +92,16 @@ spec: - name: http containerPort: 8080 --- -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: end-reverse-tls namespace: ns1 spec: replicas: 1 + selector: + matchLabels: + app: end-reverse template: metadata: labels: diff --git a/istio/helloworld-v2.yaml b/istio/helloworld-v2.yaml index 7eaa3fa..bbc509e 100644 --- a/istio/helloworld-v2.yaml +++ b/istio/helloworld-v2.yaml @@ -1,9 +1,12 @@ -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: hello-v2 spec: replicas: 3 + selector: + matchLabels: + app: hello template: metadata: labels: diff --git a/istio/helloworld-v3.yaml b/istio/helloworld-v3.yaml index 6c2002c..9d692f8 100644 --- a/istio/helloworld-v3.yaml +++ b/istio/helloworld-v3.yaml @@ -1,9 +1,12 @@ -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: hello-v3 spec: replicas: 2 + selector: + matchLabels: + app: hello template: metadata: labels: @@ -24,12 +27,15 @@ spec: - name: http containerPort: 8080 --- -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: hello-v3-latency spec: replicas: 1 + selector: + matchLabels: + app: hello template: metadata: labels: diff --git a/istio/helloworld.yaml b/istio/helloworld.yaml index 7a10167..8a129e4 100644 --- a/istio/helloworld.yaml +++ b/istio/helloworld.yaml @@ -1,9 +1,12 @@ -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: hello spec: replicas: 3 + selector: + matchLabels: + app: hello template: metadata: labels: @@ -36,12 +39,15 @@ spec: port: 8080 targetPort: 8080 --- -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: world spec: replicas: 3 + selector: + matchLabels: + app: world template: metadata: labels: @@ -74,12 +80,15 @@ spec: port: 8080 targetPort: 8080 --- -apiVersion: extensions/v1beta1 +apiVersion: apps/v1 kind: Deployment metadata: name: world-2 spec: replicas: 3 + selector: + matchLabels: + app: world-2 template: metadata: labels: