From 31d21ffbb42ca23a545cb89a5e094bff04c5ee23 Mon Sep 17 00:00:00 2001
From: Naoki Oketani <okepy.naoki@gmail.com>
Date: Wed, 16 Oct 2019 02:56:21 +0900
Subject: [PATCH] migrate Deployment apiVersion from extensions/v1beta1 to
 apps/v1 to support k8s 1.16 (#5159)

* migrate Deployment apiVersion from extensions/v1beta1 to apps/v1 to support k8s 1.16

* migrate Deployment, PodSecurityPolicy apiVersion to support k8s 1.16
---
 content/en/docs/ops/app-health-check/index.md             | 2 +-
 content/en/docs/ops/troubleshooting/validation/index.md   | 2 +-
 .../config/istio.operator.v1alpha12.pb/index.html         | 2 +-
 .../setup/additional-setup/sidecar-injection/index.md     | 2 +-
 content/en/docs/tasks/observability/logs/fluentd/index.md | 6 +++---
 content/en/docs/tasks/security/auth-sds/index.md          | 8 ++++----
 .../egress/egress-gateway-tls-origination/index.md        | 2 +-
 .../tasks/traffic-management/egress/http-proxy/index.md   | 2 +-
 .../traffic-management/ingress/ingress-certmgr/index.md   | 4 ++--
 .../ingress/secure-ingress-sds/index.md                   | 4 ++--
 .../en/docs/tasks/traffic-management/mirroring/index.md   | 6 +++---
 11 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/content/en/docs/ops/app-health-check/index.md b/content/en/docs/ops/app-health-check/index.md
index 66dc269f7f..5a5c7535e3 100644
--- a/content/en/docs/ops/app-health-check/index.md
+++ b/content/en/docs/ops/app-health-check/index.md
@@ -124,7 +124,7 @@ The configuration changes above (by Helm or by the configuration map) effect all
 Rather than install Istio with different Helm option, you can annotate Pod with `sidecar.istio.io/rewriteAppHTTPProbers: "true"`.
 
 {{< text yaml >}}
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: liveness-http
diff --git a/content/en/docs/ops/troubleshooting/validation/index.md b/content/en/docs/ops/troubleshooting/validation/index.md
index 3be57b16a0..0423cba9d5 100644
--- a/content/en/docs/ops/troubleshooting/validation/index.md
+++ b/content/en/docs/ops/troubleshooting/validation/index.md
@@ -29,7 +29,7 @@ metadata:
     app: istio-galley
   name: istio-galley
   ownerReferences:
-  - apiVersion: extensions/v1beta1
+  - apiVersion: apps/v1
     blockOwnerDeletion: true
     controller: true
     kind: Deployment
diff --git a/content/en/docs/reference/config/istio.operator.v1alpha12.pb/index.html b/content/en/docs/reference/config/istio.operator.v1alpha12.pb/index.html
index e16ae4f74a..521ba17819 100644
--- a/content/en/docs/reference/config/istio.operator.v1alpha12.pb/index.html
+++ b/content/en/docs/reference/config/istio.operator.v1alpha12.pb/index.html
@@ -128,7 +128,7 @@ components:
   galley:
     k8s:
       overlays:
-      - apiVersion: extensions/v1beta1
+      - apiVersion: apps/v1
         kind: Deployment
         name: istio-galley
         patches:
diff --git a/content/en/docs/setup/additional-setup/sidecar-injection/index.md b/content/en/docs/setup/additional-setup/sidecar-injection/index.md
index 9417a8fe3e..3c3f0e3cc4 100644
--- a/content/en/docs/setup/additional-setup/sidecar-injection/index.md
+++ b/content/en/docs/setup/additional-setup/sidecar-injection/index.md
@@ -171,7 +171,7 @@ value `false` to the pod template spec to override the default and disable injec
 The following example uses the `sidecar.istio.io/inject` annotation to disable sidecar injection.
 
 {{< text yaml >}}
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: ignored
diff --git a/content/en/docs/tasks/observability/logs/fluentd/index.md b/content/en/docs/tasks/observability/logs/fluentd/index.md
index ed2b892481..aa0a96d5b1 100644
--- a/content/en/docs/tasks/observability/logs/fluentd/index.md
+++ b/content/en/docs/tasks/observability/logs/fluentd/index.md
@@ -94,7 +94,7 @@ spec:
     app: elasticsearch
 ---
 # Elasticsearch Deployment
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: elasticsearch
@@ -157,7 +157,7 @@ spec:
     app: fluentd-es
 ---
 # Fluentd Deployment
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: fluentd-es
@@ -242,7 +242,7 @@ spec:
     app: kibana
 ---
 # Kibana Deployment
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: kibana
diff --git a/content/en/docs/tasks/security/auth-sds/index.md b/content/en/docs/tasks/security/auth-sds/index.md
index feb043af20..e162b4ad17 100644
--- a/content/en/docs/tasks/security/auth-sds/index.md
+++ b/content/en/docs/tasks/security/auth-sds/index.md
@@ -104,7 +104,7 @@ To enable the pod security policy, perform the following steps:
 
     {{< text bash >}}
     $ cat <<EOF | kubectl apply -f -
-    apiVersion: extensions/v1beta1
+    apiVersion: policy/v1beta1
     kind: PodSecurityPolicy
     metadata:
       name: istio-nodeagent
@@ -164,7 +164,7 @@ To enable the pod security policy, perform the following steps:
 
     {{< text bash >}}
     $ cat <<EOF | kubectl apply -f -
-    apiVersion: extensions/v1beta1
+    apiVersion: policy/v1beta1
     kind: PodSecurityPolicy
     metadata:
       name: istio-sds-uds
@@ -249,7 +249,7 @@ To enable the pod security policy, perform the following steps:
 
     {{< text bash >}}
     $ cat <<EOF | kubectl apply -f -
-    apiVersion: extensions/v1beta1
+    apiVersion: apps/v1
     kind: Deployment
     metadata:
       name: normal
@@ -281,7 +281,7 @@ To enable the pod security policy, perform the following steps:
 
     {{< text bash >}}
     $ cat <<EOF | kubectl apply -f -
-    apiVersion: extensions/v1beta1
+    apiVersion: apps/v1
     kind: Deployment
     metadata:
       name: malicious
diff --git a/content/en/docs/tasks/traffic-management/egress/egress-gateway-tls-origination/index.md b/content/en/docs/tasks/traffic-management/egress/egress-gateway-tls-origination/index.md
index ff77c32de4..d2a0c2e089 100644
--- a/content/en/docs/tasks/traffic-management/egress/egress-gateway-tls-origination/index.md
+++ b/content/en/docs/tasks/traffic-management/egress/egress-gateway-tls-origination/index.md
@@ -537,7 +537,7 @@ to hold the configuration of the NGINX server:
       selector:
         app: sleep
     ---
-    apiVersion: extensions/v1beta1
+    apiVersion: apps/v1
     kind: Deployment
     metadata:
       name: sleep
diff --git a/content/en/docs/tasks/traffic-management/egress/http-proxy/index.md b/content/en/docs/tasks/traffic-management/egress/http-proxy/index.md
index 189b9e1ed4..cb79c41c98 100644
--- a/content/en/docs/tasks/traffic-management/egress/http-proxy/index.md
+++ b/content/en/docs/tasks/traffic-management/egress/http-proxy/index.md
@@ -64,7 +64,7 @@ This example uses [Squid](http://www.squid-cache.org) but you can use any HTTPS
 
     {{< text bash >}}
     $ kubectl apply -f - <<EOF
-    apiVersion: extensions/v1beta1
+    apiVersion: apps/v1
     kind: Deployment
     metadata:
       name: squid
diff --git a/content/en/docs/tasks/traffic-management/ingress/ingress-certmgr/index.md b/content/en/docs/tasks/traffic-management/ingress/ingress-certmgr/index.md
index a4d6ec2b87..c7d907b79e 100644
--- a/content/en/docs/tasks/traffic-management/ingress/ingress-certmgr/index.md
+++ b/content/en/docs/tasks/traffic-management/ingress/ingress-certmgr/index.md
@@ -80,7 +80,7 @@ spec:
   selector:
     app: helloworld
 ---
-apiVersion: extensions/v1beta1
+apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: helloworld
@@ -100,7 +100,7 @@ spec:
         ports:
         - containerPort: 5000
 ---
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1beta1
 kind: Ingress
 metadata:
   annotations:
diff --git a/content/en/docs/tasks/traffic-management/ingress/secure-ingress-sds/index.md b/content/en/docs/tasks/traffic-management/ingress/secure-ingress-sds/index.md
index cacfccb593..2013a2d36c 100644
--- a/content/en/docs/tasks/traffic-management/ingress/secure-ingress-sds/index.md
+++ b/content/en/docs/tasks/traffic-management/ingress/secure-ingress-sds/index.md
@@ -143,7 +143,7 @@ need to create secrets for multiple hosts and update the gateway definitions.
       selector:
         app: httpbin
     ---
-    apiVersion: extensions/v1beta1
+    apiVersion: apps/v1
     kind: Deployment
     metadata:
       name: httpbin
@@ -328,7 +328,7 @@ retrieves unique credentials corresponding to a specific `credentialName`.
       selector:
         app: helloworld-v1
     ---
-    apiVersion: extensions/v1beta1
+    apiVersion: apps/v1
     kind: Deployment
     metadata:
       name: helloworld-v1
diff --git a/content/en/docs/tasks/traffic-management/mirroring/index.md b/content/en/docs/tasks/traffic-management/mirroring/index.md
index 251e41429b..139effb0dd 100644
--- a/content/en/docs/tasks/traffic-management/mirroring/index.md
+++ b/content/en/docs/tasks/traffic-management/mirroring/index.md
@@ -26,7 +26,7 @@ you will apply a rule to mirror a portion of traffic to `v2`.
 
     {{< text bash >}}
     $ cat <<EOF | istioctl kube-inject -f - | kubectl create -f -
-    apiVersion: extensions/v1beta1
+    apiVersion: apps/v1
     kind: Deployment
     metadata:
       name: httpbin-v1
@@ -52,7 +52,7 @@ you will apply a rule to mirror a portion of traffic to `v2`.
 
     {{< text bash >}}
     $ cat <<EOF | istioctl kube-inject -f - | kubectl create -f -
-    apiVersion: extensions/v1beta1
+    apiVersion: apps/v1
     kind: Deployment
     metadata:
       name: httpbin-v2
@@ -100,7 +100,7 @@ you will apply a rule to mirror a portion of traffic to `v2`.
 
     {{< text bash >}}
     $ cat <<EOF | istioctl kube-inject -f - | kubectl create -f -
-    apiVersion: extensions/v1beta1
+    apiVersion: apps/v1
     kind: Deployment
     metadata:
       name: sleep