Add apiserver and egress

oeohomos · Apr 25, 2017 · d68bc7c · d68bc7c
1 parent ebec4ad
commit d68bc7c
Show file tree

Hide file tree

Showing 3 changed files with 101 additions and 2 deletions.
diff --git a/kubernetes/istio-15.yaml b/kubernetes/istio-15.yaml
@@ -200,7 +200,7 @@ spec:
     spec:
       serviceAccountName: istio-manager-service-account
       containers:
-      - name: manager
+      - name: discovery
         image: docker.io/istio/manager:2017-04-24-23.54.11
         imagePullPolicy: Always
         args: ["discovery", "-v", "2"]
@@ -212,6 +212,18 @@ spec:
             fieldRef:
               apiVersion: v1
               fieldPath: metadata.namespace
+      - name: apiserver
+        image: docker.io/istio/manager:2017-04-24-23.54.11
+        imagePullPolicy: Always
+        args: ["apiserver", "-v", "2"]
+        ports:
+        - containerPort: 8081
+        env:
+        - name: POD_NAMESPACE
+          valueFrom:
+            fieldRef:
+              apiVersion: v1
+              fieldPath: metadata.namespace
 ---
 
 ################################
@@ -266,3 +278,39 @@ spec:
               fieldPath: metadata.namespace
 ---
 
+################################
+# Istio egress envoy
+################################
+apiVersion: v1
+kind: Service
+metadata:
+  name: istio-egress
+spec:
+  ports:
+  - port: 80
+  selector:
+    app: istio-egress
+---
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: istio-egress
+spec:
+  replicas: 1
+  template:
+    metadata:
+      labels:
+        app: istio-egress
+    spec:
+      containers:
+      - name: proxy
+        image: docker.io/istio/proxy:2017-04-24-23.54.11
+        imagePullPolicy: Always
+        args: ["proxy", "egress", "-v", "2"]
+        env:
+        - name: POD_NAMESPACE
+          valueFrom:
+            fieldRef:
+              apiVersion: v1
+              fieldPath: metadata.namespace
+---
diff --git a/kubernetes/istio-16.yaml b/kubernetes/istio-16.yaml
@@ -200,7 +200,7 @@ spec:
     spec:
       serviceAccountName: istio-manager-service-account
       containers:
-      - name: manager
+      - name: discovery
         image: docker.io/istio/manager:2017-04-24-23.54.11
         imagePullPolicy: Always
         args: ["discovery", "-v", "2"]
@@ -212,6 +212,18 @@ spec:
             fieldRef:
               apiVersion: v1
               fieldPath: metadata.namespace
+      - name: apiserver
+        image: docker.io/istio/manager:2017-04-24-23.54.11
+        imagePullPolicy: Always
+        args: ["apiserver", "-v", "2"]
+        ports:
+        - containerPort: 8081
+        env:
+        - name: POD_NAMESPACE
+          valueFrom:
+            fieldRef:
+              apiVersion: v1
+              fieldPath: metadata.namespace
 ---
 
 # Permissions and roles for istio
@@ -346,3 +358,39 @@ spec:
               fieldPath: metadata.namespace
 ---
 
+################################
+# Istio egress envoy
+################################
+apiVersion: v1
+kind: Service
+metadata:
+  name: istio-egress
+spec:
+  ports:
+  - port: 80
+  selector:
+    app: istio-egress
+---
+apiVersion: extensions/v1beta1
+kind: Deployment
+metadata:
+  name: istio-egress
+spec:
+  replicas: 1
+  template:
+    metadata:
+      labels:
+        app: istio-egress
+    spec:
+      containers:
+      - name: proxy
+        image: docker.io/istio/proxy:2017-04-24-23.54.11
+        imagePullPolicy: Always
+        args: ["proxy", "egress", "-v", "2"]
+        env:
+        - name: POD_NAMESPACE
+          valueFrom:
+            fieldRef:
+              apiVersion: v1
+              fieldPath: metadata.namespace
+---
diff --git a/tests/updateVersion.sh b/tests/updateVersion.sh
@@ -102,6 +102,7 @@ function merge_files() {
   cat $SRC/istio-mixer.yaml >> $OUT
   cat $SRC/istio-manager.yaml >> $OUT
   cat $SRC/istio-ingress-controller.yaml >> $OUT
+  cat $SRC/istio-egress.yaml >> $OUT
 
   OUT=$ROOT/kubernetes/istio-16.yaml
   echo "# GENERATED FILE. Use with Kubernetes 1.6+" > $OUT
@@ -110,6 +111,7 @@ function merge_files() {
   cat $SRC/istio-manager.yaml >> $OUT
   cat $SRC/../istio-rbac/istio-rbac.yaml >> $OUT
   cat $SRC/istio-ingress-controller.yaml >> $OUT
+  cat $SRC/istio-egress.yaml >> $OUT
 }
 
 function update_version_file() {
@@ -128,6 +130,7 @@ function update_istio_install() {
   pushd $ROOT/kubernetes/istio-install
   sed -i "s|image: .*/\(.*\):.*|image: $MANAGER_HUB/\1:$MANAGER_TAG|" istio-manager.yaml
   sed -i "s|image: .*/\(.*\):.*|image: $MANAGER_HUB/\1:$MANAGER_TAG|" istio-ingress-controller.yaml
+  sed -i "s|image: .*/\(.*\):.*|image: $MANAGER_HUB/\1:$MANAGER_TAG|" istio-egress.yaml
   sed -i "s|image: .*/\(.*\):.*|image: $MIXER_HUB/\1:$MIXER_TAG|" istio-mixer.yaml
   popd
 }