Skip to content

Commit

Permalink
Upgrade to istio 1.11.2
Browse files Browse the repository at this point in the history
  • Loading branch information
GijsvanDulmen committed Sep 21, 2021
1 parent 69f3bd0 commit 883410c
Show file tree
Hide file tree
Showing 6 changed files with 17 additions and 12 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
node_modules
istio-1.8.2
istio-1.11.2
13 changes: 7 additions & 6 deletions cluster/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ minikube -p sample-istio-minikube start --memory=8192 --cpus=4 --vm=true --drive


## Download istio if not already downloaded
export ISTIO_VERSION=1.8.2
export ISTIO_VERSION=1.11.2
./install_istio.sh ${ISTIO_VERSION}
export PATH=$PWD/istio-${ISTIO_VERSION}/bin:$PATH

Expand All @@ -44,24 +44,25 @@ kubectl -n istio-system wait --for=condition=available --timeout=600s deployment

##### PROMETHEUS #####
echo "Installing prometheus"
kubectl apply -f https://raw.githubusercontent.com/istio/istio/release-1.8/samples/addons/prometheus.yaml || :
kubectl apply -f https://raw.githubusercontent.com/istio/istio/release-1.11/samples/addons/prometheus.yaml || :

##### KIALI 1.26 #####

kubectl apply -f https://raw.githubusercontent.com/istio/istio/release-1.11/samples/addons/kiali.yaml || :

# do this twice because of some odd error of missing CRD's
# see: https://github.com/istio/istio/issues/27417
kubectl apply -f https://raw.githubusercontent.com/istio/istio/release-1.8/samples/addons/kiali.yaml || :
kubectl apply -f https://raw.githubusercontent.com/istio/istio/release-1.8/samples/addons/kiali.yaml || :
# kubectl apply -f https://raw.githubusercontent.com/istio/istio/release-1.11/samples/addons/kiali.yaml || :

# Open Kiali on NodePort
kubectl -n istio-system patch svc kiali --patch '{"spec": { "type": "NodePort", "ports": [ { "name": "http", "nodePort": 30123, "port": 20001, "protocol": "TCP", "targetPort": 20001 }, { "name": "http-metrics", "nodePort": 30333, "port": 9090, "protocol": "TCP", "targetPort": 9090 } ] } }'

#### JAEGER #####
kubectl apply -f https://raw.githubusercontent.com/istio/istio/release-1.8/samples/addons/jaeger.yaml
kubectl apply -f https://raw.githubusercontent.com/istio/istio/release-1.11/samples/addons/jaeger.yaml
kubectl -n istio-system patch svc tracing --patch '{"spec": { "type": "NodePort", "ports": [ { "name": "http-query", "nodePort": 30567, "port": 80, "protocol": "TCP", "targetPort": 16686 } ] } }'

##### GRAFANA #####
kubectl apply -f https://raw.githubusercontent.com/istio/istio/release-1.8/samples/addons/grafana.yaml
kubectl apply -f https://raw.githubusercontent.com/istio/istio/release-1.11/samples/addons/grafana.yaml
kubectl -n istio-system patch svc grafana --patch '{"spec": { "type": "NodePort", "ports": [ { "name": "service", "nodePort": 30789, "port": 3000, "protocol": "TCP", "targetPort": 3000 } ] } }'

##### FLAGGER #####
Expand Down
6 changes: 5 additions & 1 deletion cluster/istio.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ spec:
enabled: true
ingressGateways:
- name: istio-ingressgateway
enabled: true
k8s:
hpaSpec:
maxReplicas: 1
Expand All @@ -29,16 +30,19 @@ spec:
value:
- name: http2
port: 8080
targetPort: 80
targetPort: 8080
nodePort: 30000
protocol: TCP
- name: status-port
port: 15021
targetPort: 15021
nodePort: 30002
protocol: TCP
- name: https
port: 8443
targetPort: 8443
nodePort: 30001
protocol: TCP
- apiVersion: policy/v1beta1
kind: PodDisruptionBudget
name: istio-ingressgateway
Expand Down
2 changes: 1 addition & 1 deletion deployments/gateway.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ spec:
istio: ingressgateway
servers:
- port:
number: 80
number: 8080
name: http
protocol: HTTP
hosts:
Expand Down
2 changes: 1 addition & 1 deletion deployments/headers/11-set-headers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ spec:
value:
name: envoy.lua
typed_config:
"@type": "type.googleapis.com/envoy.config.filter.http.lua.v2.Lua"
"@type": "type.googleapis.com/envoy.extensions.filters.http.lua.v3.Lua"
inlineCode: |
function envoy_on_response(response_handle)
response_handle:headers():add("X-Hire", "Go and work for us!");
Expand Down
4 changes: 2 additions & 2 deletions traffic-generator/run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ OS="$(uname)"
if [ "x${OS}" = "xDarwin" ] ; then
open http://${MINIKUBE_IP}:30567
open http://${MINIKUBE_IP}:30789
open http://${MINIKUBE_IP}:30123/kiali/console/graph/namespaces/\?edges\=requestsPerSecond\&graphType\=versionedApp\&namespaces\=default%2Cistio-system\&unusedNodes\=false\&operationNodes\=false\&injectServiceNodes\=true\&duration\=60\&refresh\=15000\&layout\=dagre
open http://${MINIKUBE_IP}:30123/kiali/console/graph/namespaces/?edges=requestsPerSecond%2CresponseTime%2Crt95%2Cthroughput%2CthroughputRequest%2CtrafficDistribution%2CtrafficRate&graphType=versionedApp&namespaces=default%2Cistio-system&unusedNodes=false&operationNodes=true&injectServiceNodes=true&duration=60&refresh=15000&layout=dagre&traffic=grpc%2CgrpcRequest%2Chttp%2ChttpRequest%2Ctcp%2CtcpSent&idleNodes=false&idleEdges=false
else
echo "Please open the following websites manually in your browser:"
echo http://${MINIKUBE_IP}:30567
echo http://${MINIKUBE_IP}:30789
echo http://${MINIKUBE_IP}:30123/kiali/console/graph/namespaces/\?edges\=requestsPerSecond\&graphType\=versionedApp\&namespaces\=default%2Cistio-system\&unusedNodes\=false\&operationNodes\=false\&injectServiceNodes\=true\&duration\=60\&refresh\=15000\&layout\=dagre
echo http://${MINIKUBE_IP}:30123/kiali/console/graph/namespaces/?edges=requestsPerSecond%2CresponseTime%2Crt95%2Cthroughput%2CthroughputRequest%2CtrafficDistribution%2CtrafficRate&graphType=versionedApp&namespaces=default%2Cistio-system&unusedNodes=false&operationNodes=true&injectServiceNodes=true&duration=60&refresh=15000&layout=dagre&traffic=grpc%2CgrpcRequest%2Chttp%2ChttpRequest%2Ctcp%2CtcpSent&idleNodes=false&idleEdges=false
sleep 120
fi
node index.js ${MINIKUBE_IP}

0 comments on commit 883410c

Please sign in to comment.