Skip to content

Commit 03ecb7b

Browse files
committed
Merge branch 'feature/istio/addon' into develop
2 parents c434a45 + f9d71d2 commit 03ecb7b

File tree

5 files changed

+27
-18
lines changed

5 files changed

+27
-18
lines changed

istio/addon/install-addon.sh

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,20 @@
11
#!/bin/bash
2-
# trap 'echo "${BASH_SOURCE[0]}: line ${LINENO}: status ${?}: user ${USER}: func ${FUNCNAME[0]}"' ERR
3-
# set -o errexit
4-
# set -o errtrace
2+
trap 'echo "${BASH_SOURCE[0]}: line ${LINENO}: status ${?}: user ${USER}: func ${FUNCNAME[0]}"' ERR
3+
set -o errexit
4+
set -o errtrace
55

6-
cd ../istio-*/
7-
kubectl apply --namespace istio-system --filename samples/addons
6+
kubectl apply -f https://raw.githubusercontent.com/istio/istio/refs/heads/master/samples/addons/grafana.yaml
7+
kubectl apply -f https://raw.githubusercontent.com/istio/istio/refs/heads/master/samples/addons/jaeger.yaml
8+
kubectl apply -f https://raw.githubusercontent.com/istio/istio/refs/heads/master/samples/addons/kiali.yaml
9+
kubectl apply -f https://raw.githubusercontent.com/istio/istio/refs/heads/master/samples/addons/loki.yaml
10+
kubectl apply -f https://raw.githubusercontent.com/istio/istio/refs/heads/master/samples/addons/prometheus.yaml
11+
12+
######################################################################
13+
14+
### install
15+
# cd ../istio-*/
16+
# kubectl apply -f samples/addons
817

918
### delete
1019
# cd ../istio-*/
11-
# kubectl delete --filename samples/addons
20+
# kubectl delete -f samples/addons

istio/addon/istio/grafana-traffic-management.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
apiVersion: networking.istio.io/v1alpha3
2+
apiVersion: networking.istio.io/v1
33
kind: Gateway
44
metadata:
55
name: grafana-gw
@@ -26,7 +26,7 @@ spec:
2626
credentialName: grafana-cert
2727
mode: SIMPLE
2828
---
29-
apiVersion: networking.istio.io/v1alpha3
29+
apiVersion: networking.istio.io/v1
3030
kind: VirtualService
3131
metadata:
3232
name: grafana-vs
@@ -43,7 +43,7 @@ spec:
4343
port:
4444
number: 3000
4545
---
46-
apiVersion: networking.istio.io/v1alpha3
46+
apiVersion: networking.istio.io/v1
4747
kind: DestinationRule
4848
metadata:
4949
name: grafana-dr

istio/addon/istio/jaeger-traffic-management.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
apiVersion: networking.istio.io/v1alpha3
2+
apiVersion: networking.istio.io/v1
33
kind: Gateway
44
metadata:
55
name: jaeger-gw
@@ -26,7 +26,7 @@ spec:
2626
credentialName: jaeger-cert
2727
mode: SIMPLE
2828
---
29-
apiVersion: networking.istio.io/v1alpha3
29+
apiVersion: networking.istio.io/v1
3030
kind: VirtualService
3131
metadata:
3232
name: jaeger-vs
@@ -43,7 +43,7 @@ spec:
4343
port:
4444
number: 80
4545
---
46-
apiVersion: networking.istio.io/v1alpha3
46+
apiVersion: networking.istio.io/v1
4747
kind: DestinationRule
4848
metadata:
4949
name: jaeger-dr

istio/addon/istio/kiali-traffic-management.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
apiVersion: networking.istio.io/v1alpha3
2+
apiVersion: networking.istio.io/v1
33
kind: Gateway
44
metadata:
55
name: kiali-gw
@@ -26,7 +26,7 @@ spec:
2626
credentialName: kiali-cert
2727
mode: SIMPLE
2828
---
29-
apiVersion: networking.istio.io/v1alpha3
29+
apiVersion: networking.istio.io/v1
3030
kind: VirtualService
3131
metadata:
3232
name: kiali-vs
@@ -43,7 +43,7 @@ spec:
4343
port:
4444
number: 20001
4545
---
46-
apiVersion: networking.istio.io/v1alpha3
46+
apiVersion: networking.istio.io/v1
4747
kind: DestinationRule
4848
metadata:
4949
name: kiali-dr

istio/addon/istio/prometheus-traffic-management.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
apiVersion: networking.istio.io/v1alpha3
2+
apiVersion: networking.istio.io/v1
33
kind: Gateway
44
metadata:
55
name: prometheus-gw
@@ -26,7 +26,7 @@ spec:
2626
credentialName: prometheus-cert
2727
mode: SIMPLE
2828
---
29-
apiVersion: networking.istio.io/v1alpha3
29+
apiVersion: networking.istio.io/v1
3030
kind: VirtualService
3131
metadata:
3232
name: prometheus-vs
@@ -43,7 +43,7 @@ spec:
4343
port:
4444
number: 9090
4545
---
46-
apiVersion: networking.istio.io/v1alpha3
46+
apiVersion: networking.istio.io/v1
4747
kind: DestinationRule
4848
metadata:
4949
name: prometheus-dr

0 commit comments

Comments
 (0)