(dev-v2.6-archive) Merge pull request #660 from StrongMonkey/add-rio-annotations

Add istio dependency to rio chart

(partially cherry picked from commit 4cd7a24bd8)

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

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:

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
+  catalog.cattle.io/experimental: true
+  catalog.cattle.io/requires-gvr: networking.istio.io.virtualservice/v1beta1

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.
+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
-    ```
 
 ## Installation
 

packages/rio/charts/helm/tiller-serviceaccount.yaml

@@ -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
-