Skip to content

Commit 56015ca

Browse files
committed
K8S-508 move k8dash to separate namespace
1 parent 9f9354c commit 56015ca

File tree

5 files changed

+20
-6
lines changed

5 files changed

+20
-6
lines changed

addons/ingress/haproxy/k8dash-ingress.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: networking.k8s.io/v1
22
kind: Ingress
33
metadata:
44
name: kubernetes-k8dash
5-
namespace: kube-system
5+
namespace: kubernetes-k8dash
66
annotations:
77
kubernetes.io/ingress.class: haproxy
88
haproxy.org/path-rewrite: /kubernetes-dashboard(/|$)(.*) /\2

addons/ingress/nginx/k8dash-ingress.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: networking.k8s.io/v1
22
kind: Ingress
33
metadata:
44
name: kubernetes-k8dash
5-
namespace: kube-system
5+
namespace: kubernetes-k8dash
66
annotations:
77
kubernetes.io/ingress.class: nginx
88
nginx.ingress.kubernetes.io/ssl-passthrough: "true"

addons/ingress/traefik/k8dash-ingress.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: networking.k8s.io/v1
22
kind: Ingress
33
metadata:
44
name: kubernetes-k8dash
5-
namespace: kube-system
5+
namespace: kubernetes-k8dash
66
annotations:
77
kubernetes.io/ingress.class: traefik
88
traefik.frontend.rule.type: PathPrefixStrip

addons/kubernetes-k8dash.yaml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,14 @@
1+
apiVersion: v1
2+
kind: Namespace
3+
metadata:
4+
name: kubernetes-k8dash
5+
6+
---
17
kind: Deployment
28
apiVersion: apps/v1
39
metadata:
410
name: kubernetes-k8dash
5-
namespace: kube-system
11+
namespace: kubernetes-k8dash
612
spec:
713
replicas: 1
814
selector:
@@ -33,7 +39,7 @@ kind: Service
3339
apiVersion: v1
3440
metadata:
3541
name: kubernetes-k8dash
36-
namespace: kube-system
42+
namespace: kubernetes-k8dash
3743
spec:
3844
type: NodePort
3945
ports:

addons/upgrade.jps

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,13 @@ actions:
158158
for i in {1..5}; do sleep 5; echo "Attempt ${i}/5: "; kubectl apply -f ${baseUrl}/addons/kubernetes-dashboard.yaml && break; done;
159159
# k8s-1.19: postpone ingress update
160160
} ||:
161+
- cmd[${nodes.k8sm.master.id}]: |-
162+
kubectl get deployment kubernetes-k8dash -n kube-system && {
163+
kubectl -n kube-system delete deployment kubernetes-k8dash;
164+
kubectl -n kube-system delete service kubernetes-k8dash;
165+
for i in {1..5}; do sleep 5; echo "Attempt ${i}/5: "; kubectl apply -f ${baseUrl}/addons/kubernetes-k8dash.yaml && break; done;
166+
# k8s-1.19: postpone ingress update
167+
} ||:
161168
- cmd[${nodes.k8sm.master.id}]: |-
162169
kubectl get deployment hello-kubernetes && {
163170
kubectl delete -f ${baseUrl}/addons/helloworld.yaml;
@@ -375,7 +382,8 @@ actions:
375382
kubectl apply -f ${baseUrl}/addons/ingress/${globals.ingress-dir}/api-ingress.yaml; } ||:
376383
kubectl get deployment kubernetes-dashboard -n kubernetes-dashboard && {
377384
kubectl apply -f ${baseUrl}/addons/ingress/${globals.ingress-dir}/dashboard-ingress.yaml; } ||:
378-
kubectl get deployment kubernetes-k8dash -n kube-system && {
385+
kubectl get deployment kubernetes-k8dash -n kubernetes-k8dash && {
386+
kubectl -n kube-system delete ingress kubernetes-k8dash;
379387
kubectl apply -f ${baseUrl}/addons/ingress/${globals.ingress-dir}/k8dash-ingress.yaml; } ||:
380388
kubectl get deployment hello-kubernetes && {
381389
kubectl apply -f ${baseUrl}/addons/ingress/${globals.ingress-dir}/helloworld-ingress.yaml; } ||:

0 commit comments

Comments
 (0)