Cp062 (#262)

* fix routing under basic auth (#257) * fix tests
kubeflow · Aug 8, 2019 · d47b383 · d47b383
1 parent dce9aeb
commit d47b383
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 3 deletions.
diff --git a/gcp/basic-auth-ingress/base/kustomization.yaml b/gcp/basic-auth-ingress/base/kustomization.yaml
@@ -8,6 +8,7 @@ resources:
 - config-map.yaml
 - deployment.yaml
 - ingress.yaml
+- istio-mapping-svc.yaml
 - job.yaml
 - service-account.yaml
 - service.yaml

diff --git a/tests/basic-auth-ingress-base_test.go b/tests/basic-auth-ingress-base_test.go
@@ -238,6 +238,34 @@ spec:
           serviceName: ambassador
           servicePort: 80
         path: /*
+`)
+	th.writeF("/manifests/gcp/basic-auth-ingress/base/istio-mapping-svc.yaml", `
+apiVersion: v1
+kind: Service
+metadata:
+  annotations:
+    getambassador.io/config: |-
+      ---
+      apiVersion: ambassador/v0
+      kind:  Mapping
+      name: istio-mapping
+      prefix_regex: true
+      prefix: /(?!whoami|kflogin).*
+      rewrite: ""
+      service: istio-ingressgateway.istio-system
+      precedence: 1
+  labels:
+    app: istioMappingSvc
+    ksonnet.io/component: basic-auth-ingress
+  name: istio-mapping-service
+  namespace: istio-system
+spec:
+  ports:
+    - port: 80
+      targetPort: 8081
+  selector:
+    app: istioMappingSvc
+  type: ClusterIP
 `)
 	th.writeF("/manifests/gcp/basic-auth-ingress/base/job.yaml", `
 apiVersion: batch/v1
@@ -409,6 +437,7 @@ resources:
 - config-map.yaml
 - deployment.yaml
 - ingress.yaml
+- istio-mapping-svc.yaml
 - job.yaml
 - service-account.yaml
 - service.yaml

diff --git a/tests/metadata-base_test.go b/tests/metadata-base_test.go
@@ -1,15 +1,14 @@
 package tests_test
 
 import (
-	"testing"
-
 	"sigs.k8s.io/kustomize/k8sdeps/kunstruct"
 	"sigs.k8s.io/kustomize/k8sdeps/transformer"
 	"sigs.k8s.io/kustomize/pkg/fs"
 	"sigs.k8s.io/kustomize/pkg/loader"
 	"sigs.k8s.io/kustomize/pkg/resmap"
 	"sigs.k8s.io/kustomize/pkg/resource"
 	"sigs.k8s.io/kustomize/pkg/target"
+	"testing"
 )
 
 func writeMetadataBase(th *KustTestHarness) {

diff --git a/tests/metadata-overlays-istio_test.go b/tests/metadata-overlays-istio_test.go
@@ -154,7 +154,7 @@ spec:
     spec:
       containers:
       - name: container
-        image: gcr.io/kubeflow-images-public/metadata:v0.1.7
+        image: gcr.io/kubeflow-images-public/metadata:v0.1.8
         env:
           - name: MYSQL_ROOT_PASSWORD
             valueFrom: