sync v0.6 to master head (#213)

* Copy istio to its own package (#205)

* move istio to its own package

* put back gcp/istio*

* make ClusterRbacConfig configurable (#209)

* remove istio from gcp (#212)

gcp/istio/base/kf-istio-resources.yaml → istio/istio/base/kf-istio-resources.yaml

@@ -107,4 +107,4 @@ kind: ClusterRbacConfig
 metadata:
   name: default
 spec:
-  mode: "ON"
+  mode: $(clusterRbacConfig)

istio/istio/base/kustomization.yaml

@@ -0,0 +1,18 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+resources:
+- kf-istio-resources.yaml
+namespace: kubeflow
+configMapGenerator:
+- name: istio-parameters
+  env: params.env
+vars:
+- name: clusterRbacConfig
+  objref:
+    kind: ConfigMap
+    name: istio-parameters
+    apiVersion: v1
+  fieldref:
+    fieldpath: data.clusterRbacConfig
+configurations:
+ - params.yaml

istio/istio/base/params.env

@@ -0,0 +1 @@
+clusterRbacConfig=ON

istio/istio/base/params.yaml

@@ -0,0 +1,3 @@
+varReference:
+- path: spec/mode
+  kind: ClusterRbacConfig

tests/istio-base_test.go

@@ -12,7 +12,7 @@ import (
 )
 
 func writeIstioBase(th *KustTestHarness) {
-	th.writeF("/manifests/gcp/istio/base/kf-istio-resources.yaml", `
+	th.writeF("/manifests/istio/istio/base/kf-istio-resources.yaml", `
 apiVersion: networking.istio.io/v1alpha3
 kind: Gateway
 metadata:
@@ -122,25 +122,46 @@ kind: ClusterRbacConfig
 metadata:
   name: default
 spec:
-  mode: "ON"
+  mode: $(clusterRbacConfig)
 `)
-	th.writeK("/manifests/gcp/istio/base", `
+	th.writeF("/manifests/istio/istio/base/params.env", `
+clusterRbacConfig=ON
+`)
+	th.writeF("/manifests/istio/istio/base/params.yaml", `
+varReference:
+- path: spec/mode
+  kind: ClusterRbacConfig
+`)
+	th.writeK("/manifests/istio/istio/base", `
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
 - kf-istio-resources.yaml
 namespace: kubeflow
+configMapGenerator:
+- name: istio-parameters
+  env: params.env
+vars:
+- name: clusterRbacConfig
+  objref:
+    kind: ConfigMap
+    name: istio-parameters
+    apiVersion: v1
+  fieldref:
+    fieldpath: data.clusterRbacConfig
+configurations:
+ - params.yaml
 `)
 }
 
 func TestIstioBase(t *testing.T) {
-	th := NewKustTestHarness(t, "/manifests/gcp/istio/base")
+	th := NewKustTestHarness(t, "/manifests/istio/istio/base")
 	writeIstioBase(th)
 	m, err := th.makeKustTarget().MakeCustomizedResMap()
 	if err != nil {
 		t.Fatalf("Err: %v", err)
 	}
-	targetPath := "../gcp/istio/base"
+	targetPath := "../istio/istio/base"
 	fsys := fs.MakeRealFS()
 	_loader, loaderErr := loader.NewLoader(targetPath, fsys)
 	if loaderErr != nil {

tests/istio-crds-base_test.go

@@ -12,7 +12,7 @@ import (
 )
 
 func writeIstioCrdsBase(th *KustTestHarness) {
-	th.writeF("/manifests/gcp/istio-crds/base/crds.yaml", `
+	th.writeF("/manifests/istio/istio-crds/base/crds.yaml", `
 ---
 apiVersion: apiextensions.k8s.io/v1beta1
 kind: CustomResourceDefinition
@@ -1549,7 +1549,7 @@ spec:
     plural: challenges
   scope: Namespaced
 `)
-	th.writeK("/manifests/gcp/istio-crds/base", `
+	th.writeK("/manifests/istio/istio-crds/base", `
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 resources:
@@ -1559,13 +1559,13 @@ namespace: kubeflow
 }
 
 func TestIstioCrdsBase(t *testing.T) {
-	th := NewKustTestHarness(t, "/manifests/gcp/istio-crds/base")
+	th := NewKustTestHarness(t, "/manifests/istio/istio-crds/base")
 	writeIstioCrdsBase(th)
 	m, err := th.makeKustTarget().MakeCustomizedResMap()
 	if err != nil {
 		t.Fatalf("Err: %v", err)
 	}
-	targetPath := "../gcp/istio-crds/base"
+	targetPath := "../istio/istio-crds/base"
 	fsys := fs.MakeRealFS()
 	_loader, loaderErr := loader.NewLoader(targetPath, fsys)
 	if loaderErr != nil {

tests/prometheus-base_test.go

@@ -295,7 +295,8 @@ varReference:
 	th.writeF("/manifests/gcp/prometheus/base/params.env", `
 projectId=
 clusterName=
-zone=`)
+zone=
+`)
 	th.writeK("/manifests/gcp/prometheus/base", `
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization