Merge branch 'master' into v1.15.0

Author: ihorman

addons/api-ingress.yaml

@@ -1,7 +1,7 @@
 apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
-  name: kubernetes-dashboard
+  name: kubernetes-api
   namespace: default
   annotations:
     kubernetes.io/ingress.class: traefik

addons/kubernetes-dashboard.yaml

@@ -167,6 +167,7 @@ spec:
     - name: https
       port: 443
       targetPort: 8443
+      nodePort: 30777
     - name: http
       port: 80
       targetPort: 9090

addons/traefik-ui.yaml

@@ -17,12 +17,15 @@ kind: Ingress
 metadata:
   name: traefik-web-ui
   namespace: kube-system
+  annotations:
+    kubernetes.io/ingress.class: traefik
+    ingress.kubernetes.io/secure-backends: "true"
+    traefik.frontend.rule.type: PathPrefixStrip
 spec:
   rules:
-  - host: traefik-ui.minikube
-    http:
+  - http:
       paths:
-      - path: /
+      - path: /traefik-web-ui
         backend:
           serviceName: traefik-web-ui
-          servicePort: web
+          servicePort: "web"

manifest.jps

@@ -22,6 +22,9 @@ nodes: definedInOnBeforeInstall
 
 skipNodeEmails: true
 
+globals:
+    dashboardUrl:  https://${env.domain}/kubernetes-dashboard/
+
 onInstall:
   - block-masters-scaling
   - init-main-master
@@ -42,6 +45,14 @@ onInstall:
   - deploy
   - install-conf-addon
   - remove-attr
+  - if ('${env.protocol}' == 'http'):
+      - api: env.control.AddEndpoint
+        nodeId: ${nodes.cp.master.id}
+        privatePort: 30777
+        protocol: TCP
+        name: Dashboard Self-Sighed HTTPS
+      - setGlobals: 
+          dashboardUrl: https://node${nodes.cp.master.id}-${env.domain}:${response.object.publicPort}/
 
 onAfterScaleOut[cp]:
   forEach(event.response.nodes):
@@ -118,7 +129,10 @@ actions:
 
   connect-workers:
     cmd[${this}]: |-
+      rm -f /etc/machine-id
+      systemd-machine-id-setup
       systemctl daemon-reload > /dev/null 2>&1
+      systemctl restart kubelet.service
       $(cat /var/lib/connect/settings) --ignore-preflight-errors=swap > /dev/null 2>&1
       sleep 5
       iptables -I INPUT -m conntrack --ctstate ESTABLISHED,RELATED -j ACCEPT
@@ -268,5 +282,4 @@ actions:
               action=$([ "${settings.remote}" == "true" ] && echo "apply" || echo "delete")
               kubectl $action -f ${baseUrl}/addons/api-ingress.yaml
 
-
 success: /text/success.md

text/success.md

@@ -1,4 +1,4 @@
-Enter [Kubernetes dashboard](https://${env.domain}/kubernetes-dashboard/) or [Remote API Endpoint](https://${env.domain}/api/) using the Access Token:
+Enter [Kubernetes dashboard](${globals.dashboardUrl}) or [Remote API Endpoint](${env.protocol}://${env.domain}/api/) using the Access Token:
 
    ```${globals.token}```