From e7c5d7a4993e8b2ebf120a3b3da7c70140802d31 Mon Sep 17 00:00:00 2001
From: Daishan Peng <StrongMonkey@users.noreply.github.com>
Date: Thu, 17 Sep 2020 20:28:45 -0700
Subject: [PATCH] (dev-v2.6-archive) Merge pull request #660 from
 StrongMonkey/add-rio-annotations

Add istio dependency to rio chart

(partially cherry picked from commit 4cd7a24bd8ee6667a5ae1a648368e125a8ea30d7)
---
 .../rancher-monitoring.patch                  |  2 +-
 packages/rancher-pushprox/charts/values.yaml  |  2 +-
 packages/rio/charts/Chart.yaml                |  3 ++-
 packages/rio/charts/README.md                 |  7 +------
 .../charts/helm/tiller-serviceaccount.yaml    | 20 -------------------
 5 files changed, 5 insertions(+), 29 deletions(-)
 delete mode 100644 packages/rio/charts/helm/tiller-serviceaccount.yaml

diff --git a/packages/rancher-monitoring/rancher-monitoring.patch b/packages/rancher-monitoring/rancher-monitoring.patch
index 23f7ef118..7f40dcd7a 100644
--- a/packages/rancher-monitoring/rancher-monitoring.patch
+++ b/packages/rancher-monitoring/rancher-monitoring.patch
@@ -228,7 +228,7 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-monitoring/charts-original/cha
    ##
    image:
 -    repository: busybox
-+    repository: rancher/library-busybox
++    repository: rancher/busybox
      tag: "1.31.1"
      sha: ""
      pullPolicy: IfNotPresent
diff --git a/packages/rancher-pushprox/charts/values.yaml b/packages/rancher-pushprox/charts/values.yaml
index 1cd5fa7ff..7dc8fb80d 100644
--- a/packages/rancher-pushprox/charts/values.yaml
+++ b/packages/rancher-pushprox/charts/values.yaml
@@ -65,7 +65,7 @@ clients:
   command: ["pushprox-client"]
 
   copyCertsImage:
-    repository: rancher/library-busybox
+    repository: rancher/busybox
     tag: 1.31.1
 
 proxy:
diff --git a/packages/rio/charts/Chart.yaml b/packages/rio/charts/Chart.yaml
index fc517e85c..53724a654 100644
--- a/packages/rio/charts/Chart.yaml
+++ b/packages/rio/charts/Chart.yaml
@@ -9,4 +9,5 @@ annotations:
   catalog.cattle.io/certified: rancher
   catalog.cattle.io/namespace: rio-system
   catalog.cattle.io/release-name: rio
-  catalog.cattle.io/experimental: true
\ No newline at end of file
+  catalog.cattle.io/experimental: true
+  catalog.cattle.io/requires-gvr: networking.istio.io.virtualservice/v1beta1
\ No newline at end of file
diff --git a/packages/rio/charts/README.md b/packages/rio/charts/README.md
index 9d742bd15..376e91a7b 100644
--- a/packages/rio/charts/README.md
+++ b/packages/rio/charts/README.md
@@ -12,12 +12,7 @@ See values.yaml for installation options.
 
 ## Prerequisites
 
-1. Rio requires Kubernetes 1.15 or newer cluster.
-1. Helm installed in the cluster. If Tiller and its service account are not already installed run the following:
-    ```bash
-    $ kubectl apply -f helm/tiller-serviceaccount.yaml
-    $ helm init --service-account tiller
-    ```
+Rio requires Kubernetes 1.15 or newer cluster.
 
 ## Installation
 
diff --git a/packages/rio/charts/helm/tiller-serviceaccount.yaml b/packages/rio/charts/helm/tiller-serviceaccount.yaml
deleted file mode 100644
index 325d36a9b..000000000
--- a/packages/rio/charts/helm/tiller-serviceaccount.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-# This grants Helm/tiller the cluster admin role.
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: tiller
-  namespace: kube-system
----
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  name: tiller-cluster-rule
-roleRef:
-  apiGroup: rbac.authorization.k8s.io
-  kind: ClusterRole
-  name: cluster-admin
-subjects:
-- kind: ServiceAccount
-  name: tiller
-  namespace: kube-system
-