From 447b7a375c096587c9e2786d4357e39186a02b96 Mon Sep 17 00:00:00 2001
From: gitlawr <lawrleegle@gmail.com>
Date: Fri, 6 Sep 2019 10:17:32 +0800
Subject: [PATCH] Update for API group migration

Note:
See https://kubernetes.io/blog/2019/07/18/api-deprecations-in-1-16/
- PSP is introduced in policy apigroup in 1.10, and removed from extensions apigroup in 1.16.
- DaemonSet, Deployment, StatefulSet, and ReplicaSet migrate to apps in 1.9, and no longer be served from extensions in 1.16
- Ingress is migrated to networking.k8s.io in 1.14, and will be removed from extensions in 1.18
---
 .../0.0.2/charts/certmanager/templates/rbac.yaml            | 2 +-
 .../0.0.2/charts/galley/templates/clusterrole.yaml          | 6 +++---
 .../0.0.2/charts/pilot/templates/clusterrole.yaml           | 2 +-
 .../v0.0.4/charts/exporter-kube-state/templates/rbac.yaml   | 1 +
 .../v0.0.4/charts/exporter-node/templates/psp.yaml          | 2 +-
 .../v0.0.4/charts/exporter-node/templates/rbac.yaml         | 1 +
 .../v0.0.4/charts/prometheus/templates/rbac.yaml            | 1 +
 7 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/charts/rancher-istio/0.0.2/charts/certmanager/templates/rbac.yaml b/charts/rancher-istio/0.0.2/charts/certmanager/templates/rbac.yaml
index b3a4ef3..506dd38 100644
--- a/charts/rancher-istio/0.0.2/charts/certmanager/templates/rbac.yaml
+++ b/charts/rancher-istio/0.0.2/charts/certmanager/templates/rbac.yaml
@@ -14,7 +14,7 @@ rules:
   - apiGroups: [""]
     resources: ["configmaps", "secrets", "events", "services", "pods"]
     verbs: ["*"]
-  - apiGroups: ["extensions"]
+  - apiGroups: ["extensions", "networking.k8s.io"]
     resources: ["ingresses"]
     verbs: ["*"]
 ---
diff --git a/charts/rancher-istio/0.0.2/charts/galley/templates/clusterrole.yaml b/charts/rancher-istio/0.0.2/charts/galley/templates/clusterrole.yaml
index 6385c88..60607f2 100644
--- a/charts/rancher-istio/0.0.2/charts/galley/templates/clusterrole.yaml
+++ b/charts/rancher-istio/0.0.2/charts/galley/templates/clusterrole.yaml
@@ -23,17 +23,17 @@ rules:
 - apiGroups: ["rbac.istio.io"]
   resources: ["*"]
   verbs: ["get", "list", "watch"]
-- apiGroups: ["extensions","apps"]
+- apiGroups: ["extensions", "apps"]
   resources: ["deployments"]
   resourceNames: ["istio-galley"]
   verbs: ["get"]
 - apiGroups: [""]
   resources: ["pods", "nodes", "services", "endpoints"]
   verbs: ["get", "list", "watch"]
-- apiGroups: ["extensions"]
+- apiGroups: ["extensions", "networking.k8s.io"]
   resources: ["ingresses"]
   verbs: ["get", "list", "watch"]
-- apiGroups: ["extensions"]
+- apiGroups: ["extensions", "apps"]
   resources: ["deployments/finalizers"]
   resourceNames: ["istio-galley"]
   verbs: ["update"]
diff --git a/charts/rancher-istio/0.0.2/charts/pilot/templates/clusterrole.yaml b/charts/rancher-istio/0.0.2/charts/pilot/templates/clusterrole.yaml
index 0435c3e..cd7464c 100644
--- a/charts/rancher-istio/0.0.2/charts/pilot/templates/clusterrole.yaml
+++ b/charts/rancher-istio/0.0.2/charts/pilot/templates/clusterrole.yaml
@@ -23,7 +23,7 @@ rules:
 - apiGroups: ["apiextensions.k8s.io"]
   resources: ["customresourcedefinitions"]
   verbs: ["*"]
-- apiGroups: ["extensions"]
+- apiGroups: ["extensions", "networking.k8s.io"]
   resources: ["ingresses", "ingresses/status"]
   verbs: ["*"]
 - apiGroups: [""]
diff --git a/charts/rancher-monitoring/v0.0.4/charts/exporter-kube-state/templates/rbac.yaml b/charts/rancher-monitoring/v0.0.4/charts/exporter-kube-state/templates/rbac.yaml
index 2ea88c4..b83fdea 100644
--- a/charts/rancher-monitoring/v0.0.4/charts/exporter-kube-state/templates/rbac.yaml
+++ b/charts/rancher-monitoring/v0.0.4/charts/exporter-kube-state/templates/rbac.yaml
@@ -29,6 +29,7 @@ rules:
   - "watch"
 - apiGroups: 
   - "extensions"
+  - "apps"
   resources:
   - daemonsets
   - deployments
diff --git a/charts/rancher-monitoring/v0.0.4/charts/exporter-node/templates/psp.yaml b/charts/rancher-monitoring/v0.0.4/charts/exporter-node/templates/psp.yaml
index 1c5f1b3..f085044 100644
--- a/charts/rancher-monitoring/v0.0.4/charts/exporter-node/templates/psp.yaml
+++ b/charts/rancher-monitoring/v0.0.4/charts/exporter-node/templates/psp.yaml
@@ -1,5 +1,5 @@
 {{- if .Values.enabledPSP }}
-apiVersion: extensions/v1beta1
+apiVersion: policy/v1beta1
 kind: PodSecurityPolicy
 metadata:
   name: {{ template "app.fullname" . }}
diff --git a/charts/rancher-monitoring/v0.0.4/charts/exporter-node/templates/rbac.yaml b/charts/rancher-monitoring/v0.0.4/charts/exporter-node/templates/rbac.yaml
index d93c037..18372f7 100644
--- a/charts/rancher-monitoring/v0.0.4/charts/exporter-node/templates/rbac.yaml
+++ b/charts/rancher-monitoring/v0.0.4/charts/exporter-node/templates/rbac.yaml
@@ -62,6 +62,7 @@ metadata:
 rules:
 - apiGroups:
   - extensions
+  - policy
   resourceNames:
   - {{ template "app.fullname" . }}
   resources:
diff --git a/charts/rancher-monitoring/v0.0.4/charts/prometheus/templates/rbac.yaml b/charts/rancher-monitoring/v0.0.4/charts/prometheus/templates/rbac.yaml
index 2c3f7b0..d8a879a 100644
--- a/charts/rancher-monitoring/v0.0.4/charts/prometheus/templates/rbac.yaml
+++ b/charts/rancher-monitoring/v0.0.4/charts/prometheus/templates/rbac.yaml
@@ -29,6 +29,7 @@ rules:
   - "get"
 - apiGroups:
   - "extensions"
+  - "networking.k8s.io"
   verbs: 
   - "list"
   - "watch"
-- 
GitLab