Merge pull request #157 from lookuptable/missing-manager

lookuptable · web-flow · commit 00921bba3daa · 2017-04-25T11:48:02.000-07:00
Add yaml template for manager into istio-16.yaml
diff --git a/kubernetes/istio-16.yaml b/kubernetes/istio-16.yaml
@@ -155,6 +155,65 @@ spec:
             name: mixer-config
 ---
 
+# Manager service for discovery
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: istio
+data:
+  mesh: |-
+    # Uncomment the following line to enable mutual TLS between proxies
+    # authPolicy: MUTUAL_TLS
+    mixerAddress: istio-mixer:9091
+    discoveryAddress: istio-manager:8080
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: istio-manager
+  labels:
+    istio: manager
+spec:
+  ports:
+  - port: 8080
+    name: http-discovery
+  selector:
+    istio: manager
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: istio-manager-service-account
+---
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: istio-manager
+spec:
+  replicas: 1
+  template:
+    metadata:
+      annotations:
+        alpha.istio.io/sidecar: ignore
+      labels:
+        istio: manager
+    spec:
+      serviceAccountName: istio-manager-service-account
+      containers:
+      - name: manager
+        image: docker.io/istio/manager:2017-04-24-23.54.11
+        imagePullPolicy: Always
+        args: ["discovery", "-v", "2"]
+        ports:
+        - containerPort: 8080
+        env:
+        - name: POD_NAMESPACE
+          valueFrom:
+            fieldRef:
+              apiVersion: v1
+              fieldPath: metadata.namespace
+---
+
 # Permissions and roles for istio
 # To debug: start the cluster with -vmodule=rbac,3 to enable verbose logging on RBAC DENY
 # Also helps to enable logging on apiserver 'wrap' to see the URLs.
diff --git a/tests/updateVersion.sh b/tests/updateVersion.sh
@@ -107,6 +107,7 @@ function merge_files() {
   echo "# GENERATED FILE. Use with Kubernetes 1.6+" > $OUT
   echo "# TO UPDATE, modify files in istio-install and run updateVersion.sh" >> $OUT
   cat $SRC/istio-mixer.yaml >> $OUT
+  cat $SRC/istio-manager.yaml >> $OUT
   cat $SRC/../istio-rbac/istio-rbac.yaml >> $OUT
   cat $SRC/istio-ingress-controller.yaml >> $OUT
 }

Original file line number	Diff line number	Diff line change
`@@ -107,6 +107,7 @@ function merge_files() {`
`107`	`107`	`echo "# GENERATED FILE. Use with Kubernetes 1.6+" > $OUT`
`108`	`108`	`echo "# TO UPDATE, modify files in istio-install and run updateVersion.sh" >> $OUT`
`109`	`109`	`cat $SRC/istio-mixer.yaml >> $OUT`
	`110`	`+ cat $SRC/istio-manager.yaml >> $OUT`
`110`	`111`	`cat $SRC/../istio-rbac/istio-rbac.yaml >> $OUT`
`111`	`112`	`cat $SRC/istio-ingress-controller.yaml >> $OUT`
`112`	`113`	`}`