[v1.16.6] sync components

Author: dfateyev

README.md

@@ -1,25 +1,34 @@
-# Managed Kubernetes Hosting
+# Kubernetes Clusters
 
-Managed Kubernetes clusters are highly available and multi-tenant deployments across availability regions in public or private cloud. 
+The clusters can be automatically installed on top of Jelastic PaaS in two ways:
 
-The clusters can be automatically installed on top of the Jelastic PaaS in two ways:
+* **Clean** cluster with pre-deployed HelloWorld example
+* **Custom** helm or stack deployment via shell command
 
-* **Clean Kubernetes** cluster with two workers and one master node. The number of worker and master nodes can be changed while installation steps or afterwards. All the newly added nodes are automatically connected.
+Also, there are different topologies available out-of-box:
+* **Development** - one master (1) and one scalable worker (1+)
+* **Production** - multi master (3) with API balancers (2+) and scalable workers (2+)
+ 
+The number of worker nodes can be changed after the initial installation is completed. All the newly added nodes are automatically connected to the cluster.
 
-* **Pre-packaged application** within Kubernetes cluster. While installation, there can be provided the URL to a YAML stack manifest. As a result, the cluster will be created already with the needed custom application deployed.
-
-<img src="/images/Managed-Kubernetes-Hosting.png" width="500" alt="Managed Kubernetes Hosting Multi-Cloud" />
+<img src="https://jelastic.com/wp-content/themes/salient/img/templates/kubernetes-cloud-services/kube.webp" width="400" alt="Managed Kubernetes Hosting Multi-Cloud" />
 
 ## Cloud Native Applications
 
 Easily containerize and migrate existing applications, run hyper scalable microservices and keep them resilient to failures, get extra savings due to more efficient resource utilization, implement CI/CD automation and develop at a higher level of speed in shorter release cycles. 
 
 Jelastic PaaS functionality allows to provision the clusters across multiple clouds and on-premises with no vendor lock-in, automatically scale them vertically and horizontally, start from one instance and grow up to thousands, manage the workloads via intuitive UI, as well as automate the DevOps processes with open API and Cloud Scripting. 
 
-## Demo and Trial 
-[Send us request](https://jelastic.com/managed-auto-scalable-clusters-for-business/) to get early access and receive a Kubernetes cluster free trial for a month.
+## Related Articles and Materials 
+* [Managed Kubernetes Hosting with Multi-Cloud Availability](https://jelastic.com/kubernetes-hosting/)
+* [Kubernetes Cluster Setup with Automated Scaling and Pay-per-Use Pricing](https://jelastic.com/blog/kubernetes-cluster-scaling-pay-per-use-hosting/)
+* [Scaling Kubernetes on Application and Infrastructure Levels](https://jelastic.com/blog/scaling-kubernetes/)
+* [Kubernetes Cluster Overview](https://docs.jelastic.com/kubernetes-cluster)
+* [Kubernetes Cluster: Package Installation](https://docs.jelastic.com/kubernetes-cluster-installation)
+* [Kubernetes Cluster: Versions & Change Logs](https://docs.jelastic.com/kubernetes-cluster-versions)
 
-For large scale projects interested in scalable Kubernetes hosting, Jelastic provides professional services to [assist while migration](https://jelastic.com/managed-auto-scalable-clusters-for-business/).
+## Demo and Trial 
+For testing in public cloud please sign up at one of [Jelastic Cloud Providers with Kubernetes support](https://jelastic.cloud/?featuresSupport=K8S). For testing in multi-cloud, hybrid cloud or private cloud setups please [send us request](https://jelastic.com/managed-auto-scalable-clusters-for-business/).
 
 ## Managed Hosting Business 
 

addons/nginx/mandatory.yaml

@@ -218,7 +218,7 @@ spec:
         kubernetes.io/os: linux
       containers:
         - name: nginx-ingress-controller
-          image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.28.0
+          image: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.30.0
           args:
             - /nginx-ingress-controller
             - --configmap=$(POD_NAMESPACE)/nginx-configuration
@@ -288,8 +288,7 @@ metadata:
     app.kubernetes.io/part-of: ingress-nginx
 spec:
   limits:
-  - default:
-    min:
+  - min:
       memory: 90Mi
       cpu: 100m
     type: Container

addons/upgrade.jps

@@ -147,12 +147,12 @@ actions:
     - cmd[${this}]: |-
         service kubelet restart
         helm repo update
-        wget -qO- https://github.com/derailed/k9s/releases/download/v0.13.8/k9s_0.13.8_Linux_x86_64.tar.gz | tar xz -C /usr/bin k9s
-        wget -qO- https://github.com/derailed/popeye/releases/download/v0.6.2/popeye_0.6.2_Linux_x86_64.tar.gz | tar xz -C /usr/bin popeye
+        wget -qO- https://github.com/derailed/k9s/releases/download/v0.17.6/k9s_Linux_x86_64.tar.gz | tar xz -C /usr/bin k9s
+        wget -qO- https://github.com/derailed/popeye/releases/download/v0.7.1/popeye_Linux_x86_64.tar.gz | tar xz -C /usr/bin popeye
         wget -nv https://github.com/wercker/stern/releases/download/1.11.0/stern_linux_amd64 -O /usr/bin/stern
         chmod +x /usr/bin/stern
         /usr/bin/stern --completion=bash > /etc/bash_completion.d/stern.bash
-        kubectx_version=0.7.1
+        kubectx_version=0.8.0
         wget -qO- https://github.com/ahmetb/kubectx/archive/v${kubectx_version}.tar.gz | tar xz --strip-components=1 -C /usr/bin kubectx-${kubectx_version}/kubectx kubectx-${kubectx_version}/kubens
         wget -qO- https://github.com/ahmetb/kubectx/archive/v${kubectx_version}.tar.gz | tar xz --strip-components=2 -C /etc/bash_completion.d kubectx-${kubectx_version}/completion/kubens.bash kubectx-${kubectx_version}/completion/kubectx.bash
         kubectl get daemonset weave-net -n kube-system && {

manifest.jps

@@ -154,7 +154,7 @@ actions:
       mkdir -p $HOME/.kube
       cp -i /etc/kubernetes/admin.conf $HOME/.kube/config
       chown root:root $HOME/.kube/config
-      wget -qO- https://github.com/derailed/k9s/releases/download/v0.17.5/k9s_Linux_x86_64.tar.gz | tar xz -C /usr/bin k9s
+      wget -qO- https://github.com/derailed/k9s/releases/download/v0.17.6/k9s_Linux_x86_64.tar.gz | tar xz -C /usr/bin k9s
       wget -qO- https://github.com/derailed/popeye/releases/download/v0.7.1/popeye_Linux_x86_64.tar.gz | tar xz -C /usr/bin popeye
       wget -nv https://github.com/wercker/stern/releases/download/1.11.0/stern_linux_amd64 -O /usr/bin/stern
       chmod +x /usr/bin/stern
@@ -278,7 +278,7 @@ actions:
 
   connect-storage:
     if (${settings.storage:false}):
-      cmd[${nodes.k8sm.master.id}]: helm install stable/nfs-client-provisioner --set nfs.server=${nodes.storage.master.address} --set nfs.path=/data --set nfs.mountOptions='{soft,proto=tcp}' --set replicaCount=3 --set storageClass.defaultClass=true --set storageClass.allowVolumeExpansion=true --set storageClass.name=jelastic-dynamic-volume
+      cmd[${nodes.k8sm.master.id}]: helm install stable/nfs-client-provisioner --name nfs-client-provisioner --set nfs.server=${nodes.storage.master.address} --set nfs.path=/data --set nfs.mountOptions='{soft,proto=tcp}' --set replicaCount=3 --set storageClass.defaultClass=true --set storageClass.allowVolumeExpansion=true --set storageClass.name=jelastic-dynamic-volume
 
   removeWorker:
     cmd[${nodes.k8sm.master.id}]: |-
@@ -418,7 +418,7 @@ actions:
       sep: ','
 
   install-node-problem-detector:
-     - cmd[${nodes.k8sm.master.id}]: helm install stable/node-problem-detector --name node-problem-detector --set image.tag=v0.7.0
+     - cmd[${nodes.k8sm.master.id}]: helm install stable/node-problem-detector --name node-problem-detector
 
   install-metallb:
      - cmd[${nodes.k8sm.master.id}]: |-
@@ -565,7 +565,7 @@ addons:
       fields:
         - type: displayfield
           hideLabel: true
-          markup: This addon provides Kubernetes and GitLab integration. Please select the GitLab environment from the list:
+          markup: This addon provides Kubernetes and GitLab integration. Please select the GitLab environment from the list.
         - type: displayfield
           hideLabel: true
         - type: envlist

scripts/beforeinit.js

@@ -10,7 +10,7 @@ var envsCount = jelastic.env.control.GetEnvs({lazy: true}).infos.length,
     nodesPerDevEnvWOStorage = 2,
     nodesPerMasterNG = 3,
     nodesPerWorkerNG = 2,
-    maxCloudlets = 6,
+    maxCloudlets = 16,
     markup = "", cur = null, text = "used", prod = true, dev = true, prodStorage = true, devStorage = true, storage = false;
 
 var quotas = jelastic.billing.account.GetQuotas(perEnv + ";"+maxEnvs+";" + perNodeGroup + ";" + maxCloudletsPerRec).array;

scripts/beforeinstall.js

@@ -11,7 +11,7 @@ var resp = {
     tag: tag,
     scalingMode: "stateless",
     nodeGroup: "k8sm",
-    addons: ["conf-k8s-addon", "upgrade-k8s-addon", "gitlab-k8s-addon"],
+    addons: ["conf-k8s-addon", "upgrade-k8s-addon"],
     displayName: "Master",
     extip: false,
     env: {

scripts/check-install.sh

@@ -247,32 +247,33 @@ fi
 }
 
 checkNginxIngressController() {
-  readyReplicas=$(kubectl get deployment/"${NGINX_DEPLOYMENT_NAME}" -o=jsonpath='{.status.readyReplicas}' -n ingress-nginx 2> /dev/null)
+
+  PODNAME=$(kubectl get pods -l=app.kubernetes.io/name=ingress-nginx -n ingress-nginx -o jsonpath='{.items[0].metadata.name}' 2> /dev/null)
   if [ $? -ne 0 ]; then
-    printError "${INGRESS_CONTROLLER} deployment not found. Check installation logs (CS) and K8s events in ${K8S_EVENTS_LOG_FILE} on a master node"
-    INGRESS_STATUS="FAIL"
-    WITH_ERROR="true"
+    DAEMON_SET=$(kubectl get ds/nginx-ingress-controller -n ingress-nginx > /dev/null)
+    if [ $? -ne 0 ]; then
+      printError "Failed to find NGINX pod because of a missing daemon set"
+      INGRESS_STATUS="FAIL"
+      WITH_ERROR="true"
+    else
+      printError "Failed to find NGINX pod, though NGINX daemon set was found"
+      INGRESS_STATUS="FAIL"
+      WITH_ERROR="true"
+    fi
+    printError "Check K8s events in ${K8S_EVENTS_LOG_FILE} on a master node"
   else
-    if [ "${readyReplicas}" -lt 1 ]; then
-      printInfo "${NGINX_DEPLOYMENT_NAME} deployment isn't scaled to 1. Checking pods logs..."
-      NGINX_POD=$(kubectl get pods -l=app.kubernetes.io/name=ingress-nginx -n ingress-nginx --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}')
-      if [ -z $NGINX_POD ]; then
-        printError "Failed to find ${NGINX_POD} pod"
-        INGRESS_STATUS="FAIL"
-        WITH_ERROR="true"
-      else
-        printError "${NGINX_DEPLOYMENT_NAME} is not running"
-        printError "${NGINX_DEPLOYMENT_NAME} pod logs are available in ${K8S_LOG_DIR}/${NGINX_POD}.log"
-        printError "Inspect K8s events in ${K8S_EVENTS_LOG_FILE}"
-        kubectl logs ${NGINX_POD} -n ingress-nginx > ${K8S_LOG_DIR}/${NGINX_POD}.log
-        INGRESS_STATUS="FAIL"
-        WITH_ERROR="true"
-      fi
+    NGINX_POD_STATUS=$(kubectl get pods -l=app.kubernetes.io/name=ingress-nginx -n ingress-nginx -o jsonpath='{.items[0].status.phase}' 2> /dev/null)
+    if [ "$NGINX_POD_STATUS" != "Running" ]; then
+      printError "NGINX pod isn't in running state. Current status: $NGINX_POD_STATUS"
+      kubectl logs ${PODNAME} -n ingress-nginx > ${K8S_LOG_DIR}/${PODNAME}.log
+      printError "Check logs in ${K8S_LOG_DIR}/${PODNAME}.log"
+      INGRESS_STATUS="FAIL"
+      WITH_ERROR="true"
     else
-      printInfo "Ingress controller ${INGRESS_CONTROLLER} is running"
+      printInfo "NGINX pod ${PODNAME} successfully started"
       INGRESS_STATUS="OK"
     fi
-  fi
+ fi
 }
 
 checkHaproxyIngressController() {
@@ -569,7 +570,7 @@ echo -e "
 Cluster Health Check Report
 
 [Weave CNI Plugin]      : ${WEAVE_STATUS:-"FAIL"}
-[Ingres Controller]     : ${INGRESS_STATUS:-"FAIL"}
+[Ingress Controller]    : ${INGRESS_STATUS:-"FAIL"}
 [Metrics Server]        : ${METRICS_STATUS:-"FAIL"}
 [Kubernetes Dashboard]  : ${DASHBOARD_STATUS:-"FAIL"}
 [Node Problem Detector] : ${NODE_PROBLEM_DETECTOR_STATUS:-"FAIL"}