From: khemendra kumar <khemendra.kumar@huawei.com>
Date: Wed, 18 Nov 2020 12:40:04 +0000 (+0000)
Subject: Merge "Hawkbit installation through docker mode"
X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=commitdiff_plain;h=21d76c6999be0e33881c027411500b502139e343;hp=a66889c1b0f2d52101b5960e65be9e888f499b22;p=eliot.git

Merge "Hawkbit installation through docker mode"
---

diff --git a/blueprints/iotgateway/scripts/k8smaster.sh b/blueprints/iotgateway/scripts/k8smaster.sh
index d4ca7b5..00baadf 100644
--- a/blueprints/iotgateway/scripts/k8smaster.sh
+++ b/blueprints/iotgateway/scripts/k8smaster.sh
@@ -8,7 +8,7 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 
-KUBE_VERSION=1.16.0-00
+KUBE_VERSION=1.17.2-00
 POD_NETWORK_CIDR=192.168.0.0/16
 K8S_CNI_VERSION=0.7.5-00
 
diff --git a/blueprints/iotgateway/scripts/k8smaster_centos.sh b/blueprints/iotgateway/scripts/k8smaster_centos.sh
index 69c3ef9..ece9982 100755
--- a/blueprints/iotgateway/scripts/k8smaster_centos.sh
+++ b/blueprints/iotgateway/scripts/k8smaster_centos.sh
@@ -11,7 +11,7 @@
 # constants
 
 POD_NETWORK_CIDR=192.168.0.0/16
-KUBE_VERSION=1.16.0-0
+KUBE_VERSION=1.17.2-0
 KUBERNETES_CNI=0.7.5-0
 
 # start
diff --git a/blueprints/iotgateway/scripts/k8sworker.sh b/blueprints/iotgateway/scripts/k8sworker.sh
index e587f7f..f3af840 100644
--- a/blueprints/iotgateway/scripts/k8sworker.sh
+++ b/blueprints/iotgateway/scripts/k8sworker.sh
@@ -8,7 +8,7 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 
-KUBE_VERSION=1.16.0-00
+KUBE_VERSION=1.17.2-00
 K8S_CNI_VERSION=0.7.5-00
 
 # Install Kubernetes with Kubeadm
diff --git a/blueprints/uCPE/scripts/common_centos.sh b/blueprints/uCPE/scripts/common_centos.sh
index 100525f..7fff044 100755
--- a/blueprints/uCPE/scripts/common_centos.sh
+++ b/blueprints/uCPE/scripts/common_centos.sh
@@ -12,7 +12,7 @@
 # constants
 
 DOCKER_VERSION=18.09.6
-KUBE_VERSION=1.16.0-0
+KUBE_VERSION=1.17.2-0
 MACHINE=$(uname -m)
 
 # start
diff --git a/blueprints/uCPE/scripts/k8smaster.sh b/blueprints/uCPE/scripts/k8smaster.sh
index d4ca7b5..00baadf 100644
--- a/blueprints/uCPE/scripts/k8smaster.sh
+++ b/blueprints/uCPE/scripts/k8smaster.sh
@@ -8,7 +8,7 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 
-KUBE_VERSION=1.16.0-00
+KUBE_VERSION=1.17.2-00
 POD_NETWORK_CIDR=192.168.0.0/16
 K8S_CNI_VERSION=0.7.5-00
 
diff --git a/blueprints/uCPE/scripts/k8smaster_centos.sh b/blueprints/uCPE/scripts/k8smaster_centos.sh
index 69c3ef9..ece9982 100755
--- a/blueprints/uCPE/scripts/k8smaster_centos.sh
+++ b/blueprints/uCPE/scripts/k8smaster_centos.sh
@@ -11,7 +11,7 @@
 # constants
 
 POD_NETWORK_CIDR=192.168.0.0/16
-KUBE_VERSION=1.16.0-0
+KUBE_VERSION=1.17.2-0
 KUBERNETES_CNI=0.7.5-0
 
 # start
diff --git a/blueprints/uCPE/scripts/k8sworker.sh b/blueprints/uCPE/scripts/k8sworker.sh
index e587f7f..f3af840 100644
--- a/blueprints/uCPE/scripts/k8sworker.sh
+++ b/blueprints/uCPE/scripts/k8sworker.sh
@@ -8,7 +8,7 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 
-KUBE_VERSION=1.16.0-00
+KUBE_VERSION=1.17.2-00
 K8S_CNI_VERSION=0.7.5-00
 
 # Install Kubernetes with Kubeadm