Rename file istio-auth-with-cluster-ca.

Former-commit-id: 104ba22
jieme198902 · May 12, 2017 · 0c89701 · 0c89701
1 parent 7b9e676
commit 0c89701
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/...istio-auth/istio-auth-per-cluster-ca.yaml → ...stio-auth/istio-auth-with-cluster-ca.yaml b/...istio-auth/istio-auth-per-cluster-ca.yaml → ...stio-auth/istio-auth-with-cluster-ca.yaml
@@ -33,7 +33,7 @@ spec:
     spec:
       containers:
       - name: mixer
-        image: docker.io/istio/mixer:0.1.0
+        image: docker.io/istio/mixer:0.1.1
         imagePullPolicy: Always
         ports:
         - containerPort: 9091
@@ -94,7 +94,7 @@ spec:
       serviceAccountName: istio-manager-service-account
       containers:
       - name: discovery
-        image: docker.io/istio/manager:2017-05-10-07.01.02
+        image: docker.io/istio/manager:0.1.1
         imagePullPolicy: Always
         args: ["discovery", "-v", "2"]
         ports:
@@ -106,7 +106,7 @@ spec:
               apiVersion: v1
               fieldPath: metadata.namespace
       - name: apiserver
-        image: docker.io/istio/manager:2017-05-10-07.01.02
+        image: docker.io/istio/manager:0.1.1
         imagePullPolicy: Always
         args: ["apiserver", "-v", "2"]
         ports:
@@ -159,7 +159,7 @@ spec:
       serviceAccountName: istio-ingress-service-account
       containers:
       - name: istio-ingress
-        image: docker.io/istio/proxy_debug:2017-05-10-07.01.02
+        image: docker.io/istio/proxy_debug:0.1.1
         args: ["proxy", "ingress", "-v", "2"]
         imagePullPolicy: Always
         ports:
@@ -207,7 +207,7 @@ spec:
     spec:
       containers:
       - name: proxy
-        image: docker.io/istio/proxy_debug:2017-05-10-07.01.02
+        image: docker.io/istio/proxy_debug:0.1.1
         imagePullPolicy: Always
         args: ["proxy", "egress", "-v", "2"]
         env:

diff --git a/updateVersion.sh b/updateVersion.sh
@@ -105,7 +105,7 @@ function merge_files() {
   AUTH_SRC=$SRC/istio-auth
   ISTIO=$ROOT/install/kubernetes/istio.yaml
   ISTIO_AUTH=$ROOT/install/kubernetes/istio-auth.yaml
-  ISTIO_AUTH_PER_CLUSTER_CA=$ROOT/install/kubernetes/templates/istio-auth/isio-auth-per-cluster-ca.yaml
+  ISTIO_AUTH_WITH_CLUSTER_CA=$ROOT/install/kubernetes/templates/istio-auth/istio-auth-with-cluster-ca.yaml
 
   echo "# GENERATED FILE. Use with Kubernetes 1.5+" > $ISTIO
   echo "# TO UPDATE, modify files in install/kubernetes/templates and run updateVersion.sh" >> $ISTIO
@@ -118,7 +118,7 @@ function merge_files() {
   sed -i "s/# authPolicy: MUTUAL_TLS/authPolicy: MUTUAL_TLS/" $ISTIO_AUTH
   cat $AUTH_SRC/istio-ingress-auth.yaml >> $ISTIO_AUTH
   cat $AUTH_SRC/istio-egress-auth.yaml >> $ISTIO_AUTH
-  cp $ISTIO_AUTH $ISTIO_AUTH_PER_CLUSTER_CA
+  cp $ISTIO_AUTH $ISTIO_AUTH_WITH_CLUSTER_CA
   cat $AUTH_SRC/istio-namespace-ca.yaml >> $ISTIO_AUTH
 }