K8S-626 skooner dashboard

Author: dfateyev

addons/ingress/haproxy/k8dash-ingress.yaml renamed to addons/ingress/haproxy/skooner-ingress.yaml

@@ -1,8 +1,8 @@
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
-  name: kubernetes-k8dash
-  namespace: kubernetes-k8dash
+  name: kubernetes-skooner
+  namespace: kubernetes-skooner
   annotations:
     kubernetes.io/ingress.class: haproxy
     haproxy.org/path-rewrite: /kubernetes-dashboard(/|$)(.*) /\2
@@ -14,6 +14,6 @@ spec:
         pathType: Prefix
         backend:
           service:
-            name: kubernetes-k8dash
+            name: kubernetes-skooner
             port:
               number: 80

addons/ingress/nginx/k8dash-ingress.yaml renamed to addons/ingress/nginx/skooner-ingress.yaml

@@ -1,8 +1,8 @@
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
-  name: kubernetes-k8dash
-  namespace: kubernetes-k8dash
+  name: kubernetes-skooner
+  namespace: kubernetes-skooner
   annotations:
     kubernetes.io/ingress.class: nginx
     nginx.ingress.kubernetes.io/ssl-passthrough: "true"
@@ -16,6 +16,6 @@ spec:
         pathType: Prefix
         backend:
           service:
-            name: kubernetes-k8dash
+            name: kubernetes-skooner
             port:
               number: 80

addons/ingress/traefik/k8dash-ingress.yaml renamed to addons/ingress/traefik/skooner-ingress.yaml

@@ -2,11 +2,11 @@
 apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
-  name: kubernetes-k8dash
-  namespace: kubernetes-k8dash
+  name: kubernetes-skooner
+  namespace: kubernetes-skooner
   annotations:
     kubernetes.io/ingress.class: traefik
-    traefik.ingress.kubernetes.io/router.middlewares: kubernetes-k8dash-strip-prefix@kubernetescrd
+    traefik.ingress.kubernetes.io/router.middlewares: kubernetes-skooner-strip-prefix@kubernetescrd
 spec:
   rules:
   - http:
@@ -15,7 +15,7 @@ spec:
         pathType: Prefix
         backend:
           service:
-            name: kubernetes-k8dash
+            name: kubernetes-skooner
             port:
               number: 80
 
@@ -24,7 +24,7 @@ apiVersion: traefik.containo.us/v1alpha1
 kind: Middleware
 metadata:
   name: strip-prefix
-  namespace: kubernetes-k8dash
+  namespace: kubernetes-skooner
 spec:
   stripPrefix:
     prefixes:

addons/kubernetes-k8dash.yaml renamed to addons/kubernetes-skooner.yaml

@@ -1,27 +1,27 @@
 apiVersion: v1
 kind: Namespace
 metadata:
-  name: kubernetes-k8dash
+  name: kubernetes-skooner
 
 ---
 kind: Deployment
 apiVersion: apps/v1
 metadata:
-  name: kubernetes-k8dash
-  namespace: kubernetes-k8dash
+  name: kubernetes-skooner
+  namespace: kubernetes-skooner
 spec:
   replicas: 1
   selector:
     matchLabels:
-      k8s-app: k8dash
+      k8s-app: skooner
   template:
     metadata:
       labels:
-        k8s-app: k8dash
+        k8s-app: skooner
     spec:
       containers:
-      - name: k8dash
-        image: herbrandson/k8dash:latest
+      - name: skooner
+        image: ghcr.io/skooner-k8s/skooner:stable
         ports:
         - containerPort: 4654
         livenessProbe:
@@ -38,13 +38,13 @@ spec:
 kind: Service
 apiVersion: v1
 metadata:
-  name: kubernetes-k8dash
-  namespace: kubernetes-k8dash
+  name: kubernetes-skooner
+  namespace: kubernetes-skooner
 spec:
   type: NodePort
   ports:
     - port: 80
       targetPort: 4654
       nodePort: 30777
   selector:
-    k8s-app: k8dash
+    k8s-app: skooner

addons/upgrade.jps

@@ -165,9 +165,15 @@ actions:
          for i in {1..5}; do sleep 5; echo "Attempt ${i}/5: "; kubectl apply -f ${baseUrl}/addons/kubernetes-dashboard.yaml && break; done;
          [ -n "${this.ingress-dir}" ] && kubectl apply -f ${baseUrl}/addons/ingress/${this.ingress-dir}/dashboard-ingress.yaml; } ||:
     - cmd[${nodes.k8sm.master.id}]: |-
+        # drop in k8s-1.22+
         kubectl get deployment kubernetes-k8dash -n kubernetes-k8dash && {
-         for i in {1..5}; do sleep 5; echo "Attempt ${i}/5: "; kubectl apply -f ${baseUrl}/addons/kubernetes-k8dash.yaml && break; done;
-         [ -n "${this.ingress-dir}" ] && kubectl apply -f ${baseUrl}/addons/ingress/${this.ingress-dir}/k8dash-ingress.yaml; } ||:
+         kubectl delete ns kubernetes-k8dash;
+         skooner_dashboard_upgrade="true"; } ||:
+        kubectl get deployment kubernetes-skooner -n kubernetes-skooner && skooner_dashboard_upgrade="true";
+        [ -n "${skooner_dashboard_upgrade}" ] && {
+         kubectl delete ns kubernetes-skooner;
+         for i in {1..5}; do sleep 5; echo "Attempt ${i}/5: "; kubectl apply -f ${baseUrl}/addons/kubernetes-skooner.yaml && break; done;
+         [ -n "${this.ingress-dir}" ] && kubectl apply -f ${baseUrl}/addons/ingress/${this.ingress-dir}/skooner-ingress.yaml; } ||:
     - cmd[${nodes.k8sm.master.id}]: |-
         kubectl get ingress kubernetes-api -n default && {
          [ -n "${this.ingress-dir}" ] && kubectl apply -f ${baseUrl}/addons/ingress/${this.ingress-dir}/api-ingress.yaml; } ||:

configs/settings.yaml

@@ -57,7 +57,7 @@ fields:
     caption: Kubernetes Dashboard
     values:
       general: Kubernetes Dashboard v2
-      k8dash: Kubernetes K8Dash
+      skooner: Kubernetes Skooner
     default: general
     hideLabel: false
     editable: false

scripts/check-install.sh

@@ -94,9 +94,9 @@ case "${DASHBOARD_NAME}" in
       DASHBOARD_DEPLOYMENT_NAME="kubernetes-dashboard"
       DASHBOARD_NAMESPACE="kubernetes-dashboard"
       ;;
-    k8dash)
-      DASHBOARD_DEPLOYMENT_NAME="kubernetes-k8dash"
-      DASHBOARD_NAMESPACE="kube-system"
+    skooner|k8dash)
+      DASHBOARD_DEPLOYMENT_NAME="kubernetes-skooner"
+      DASHBOARD_NAMESPACE="kubernetes-skooner"
       ;;
     *)
       echo "Invalid dashboard name ${DASHBOARD_NAME} specified!"

scripts/install-components.sh

@@ -5,7 +5,7 @@
 METALLB_VER="0.10.2"
 
 HELP="Usage:
-	$0 --base-url=<base64-encoded-url> --admin-account=(true|false) --metallb=(true|false) --metrics-server=(true|false) --dashboard=version(1|2) --ingress-name=<ingress-controller>
+	$0 --base-url=<base64-encoded-url> --admin-account=(true|false) --metallb=(true|false) --metrics-server=(true|false) --dashboard=(general|skooner) --ingress-name=<ingress-controller>
 Options:
 	--base-url=         manifest baseUrl
 	--admin-account=    setup admin account
@@ -98,11 +98,11 @@ fi
 		case "${DASHBOARD}" in
 		general)
 			kubectl create -f "${BASE_URL}/addons/kubernetes-dashboard.yaml";
-			kubectl create -f "${BASE_URL}/addons/ingress/${INGRESS_NAME}/dashboard-ingress.yaml";
+			while true; do kubectl create -f "${BASE_URL}/addons/ingress/${INGRESS_NAME}/dashboard-ingress.yaml" && break; sleep 5; done;
 		;;
-		k8dash)
-			kubectl apply -f "${BASE_URL}/addons/kubernetes-k8dash.yaml";
-			kubectl apply -f "${BASE_URL}/addons/ingress/${INGRESS_NAME}/k8dash-ingress.yaml";
+		skooner|k8dash)
+			kubectl apply -f "${BASE_URL}/addons/kubernetes-skooner.yaml";
+			while true; do kubectl apply -f "${BASE_URL}/addons/ingress/${INGRESS_NAME}/skooner-ingress.yaml" && break; sleep 5; done;
 		;;
 		*)
 			echo "$(date): unknown kubernetes-dashboard version '${DASHBOARD}', skipped"