reafactor(istio): routerule refactor and cleanup

Author: rolandszoke

istio_examples/RouteRule/api/deployment-local.yml

@@ -21,10 +21,6 @@ spec:
         env:
         - name: VERSION
           value: "v1"
-        - name: POD_NAMESPACE
-          valueFrom:
-            fieldRef:
-              fieldPath: metadata.namespace
 ---
 apiVersion: extensions/v1beta1
 kind: Deployment
@@ -49,7 +45,3 @@ spec:
         env:
         - name: VERSION
           value: "v2"
-        - name: POD_NAMESPACE
-          valueFrom:
-            fieldRef:
-              fieldPath: metadata.namespace

istio_examples/RouteRule/api/deployment.yml

@@ -22,10 +22,6 @@ spec:
         env:
         - name: VERSION
           value: "v1"
-        - name: POD_NAMESPACE
-          valueFrom:
-            fieldRef:
-              fieldPath: metadata.namespace
 ---
 apiVersion: extensions/v1beta1
 kind: Deployment
@@ -51,7 +47,3 @@ spec:
         env:
         - name: VERSION
           value: "v2"
-        - name: POD_NAMESPACE
-          valueFrom:
-            fieldRef:
-              fieldPath: metadata.namespace

istio_examples/RouteRule/api/service.yml

@@ -7,7 +7,7 @@ metadata:
 spec:
   selector:
     app: api
-  type: LoadBalancer
+  type: ClusterIP
   ports:
   - protocol: TCP
     port: 5000

istio_examples/RouteRule/api/src/server.js

@@ -13,10 +13,3 @@ app.get('/api', (req, res) => res.json({
 }))
 
 app.listen(PORT, () => console.log(`Example app listening on port ${PORT}!`))
-
-// TODO: remove this part
-setInterval(() => {
-  require('request')(`http://api.default.svc.cluster.local/api`, (error, response, body) => {
-    console.log(error || body)
-  })
-}, 1000)

istio_examples/RouteRule/deploy-local.sh

@@ -3,7 +3,7 @@
 # RUN these command once before deploy
 # minikube start
 # eval $(minikube docker-env)
-# echo "$(minikube ip) risingstack.training.kubernetes.com" | sudo tee -a /etc/hosts
+# echo "$(minikube ip) risingstack.training.example.com" | sudo tee -a /etc/hosts
 
 DIR=$(pwd)
 

istio_examples/RouteRule/deploy.sh

@@ -18,15 +18,6 @@ done
 kubectl delete ingress gateway
 kubectl apply -f <(istioctl kube-inject -f $DIR/ingress.yml)
 
-# INGRESS_IP=""
-# while [ -z $INGRESS_IP ]; do
-#     sleep 10
-#     INGRESS_IP=$(kubectl get ingress gateway -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
-# done
-
-# API_URL="http://$INGRESS_IP"
-# kubectl patch deployment ui --patch '{"spec": {"template": {"spec": {"containers": [{"name": "ui", "env":[{"name": "REACT_APP_API_URL", "value": "'$API_URL'"}]}]}}}}'
-
 kubectl delete routerule -l app=api
 kubectl apply -f <(istioctl kube-inject -f $DIR/api/routerule.yml)
 kubectl apply -f <(istioctl kube-inject -f $DIR/api/routerule2.yml)

istio_examples/RouteRule/ingress-local.yml

@@ -6,7 +6,7 @@ metadata:
     ingress.kubernetes.io/rewrite-target: /
 spec:
   rules:
-  - host: risingstack.training.kubernetes.com
+  - host: risingstack.training.example.com
     http:
       paths:
       - path: /api

istio_examples/RouteRule/ui/deployment-local.yml

@@ -16,6 +16,3 @@ spec:
         image: k8s/ui:v1
         ports:
         - containerPort: 80
-        env:
-        - name: REACT_APP_API_URL
-          value: 'http://risingstack.training.kubernetes.com'

istio_examples/RouteRule/ui/service.yml

@@ -7,7 +7,7 @@ metadata:
 spec:
   selector:
     app: ui
-  type: LoadBalancer
+  type: ClusterIP
   ports:
   - protocol: TCP
     port: 80

istio_examples/RouteRule/ui/src/Dockerfile

@@ -1,17 +1,3 @@
-# FROM node:8.9.4-alpine
-
-# ENV PORT 3000
-
-# COPY package.json package.json
-# RUN npm install
-
-# COPY . .
-
-# EXPOSE $PORT
-# CMD ["npm", "start"]
-
-#########################
-
 FROM node:8.9.4-alpine as build-deps
 
 WORKDIR /usr/src/app