Merge branch 'master' into correlation-resp-header

northwesternmutual · Jun 4, 2018 · 4669c4e · 4669c4e
2 parents 29cfc02 + 69efa18
commit 4669c4e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 27 deletions.
diff --git a/helm/kanali/templates/rbac-kanali.yaml b/helm/kanali/templates/rbac-kanali.yaml
@@ -33,28 +33,3 @@ subjects:
   namespace: {{default "default" .Values.kanali.namespace}}
 
 
----
-apiVersion: kanali.io/v2
-kind: ApiProxy
-metadata:
-  name: example
-spec:
-  source:
-    path: /foo
-  target:
-    path: /
-    backend:
-      endpoint: https://foo.bar.com:8443
-
----
-apiVersion: kanali.io/v2
-kind: ApiProxy
-metadata:
-  name: foo
-spec:
-  source:
-    path: /foo
-  target:
-    path: /
-    backend:
-      endpoint: https://foo.bar.com:8443
diff --git a/helm/kanali/values.yaml b/helm/kanali/values.yaml
@@ -31,7 +31,7 @@ kanali:
     image:
       pullPolicy: IfNotPresent
       name: northwesternmutual/hyperkanali
-      tag: local
+      tag: v2.0.0-rc1
     scale:
       minReplicas: 1
       maxReplicas: 5
@@ -62,7 +62,7 @@ kanali:
     image:
       pullPolicy: IfNotPresent
       name: northwesternmutual/hyperkanali
-      tag: local
+      tag: v2.0.0-rc1
     tls:
       verifyClient: false
       secretName: kanali-pki