k8s version 1.19.11

change k8s verion 1.19.11
supporting kubespray verion 2.16
k8s 1.19.11 is required by onap istanbul
update helm to 3.5.4

Depends-On: If212fba441ed53f7a95185a6103f2f1c48cbcd74
Change-Id: Id59f5e83cdc6efb8b8795122e599af772ca659ae

diff --git a/playbooks/roles/package/defaults/main.yaml b/playbooks/roles/package/defaults/main.yaml
index b1270d0b4600013fbd0ebc3213dd2f8a117e6699..de7cea7bb4f54188b5d71d39240cf65651e3eea7 100644 (file)
--- a/playbooks/roles/package/defaults/main.yaml
+++ b/playbooks/roles/package/defaults/main.yaml
@@ -41,6 +41,7 @@ k8s_binaries:
   - kubeadm
   - kubectl
   - kubelet
   - kubeadm
   - kubectl
   - kubelet

+  - calico_crds

 
 k8s_misc_images:
   - addon_resizer
 
 k8s_misc_images:
   - addon_resizer

diff --git a/scenarios/k8-calico-dualstack.yaml b/scenarios/k8-calico-dualstack.yaml
index 6bd00bb99030e2869737a0c7c9190658049cb795..a6abdf73983b5e9fa18b9cb8e261ac191416e6ea 100644 (file)
--- a/scenarios/k8-calico-dualstack.yaml
+++ b/scenarios/k8-calico-dualstack.yaml
@@ -83,7 +83,7 @@
 
     - name: Set network plugin to Calico
       lineinfile:
 
     - name: Set network plugin to Calico
       lineinfile:

-        path: "{{ engine_cache }}/repos/kubespray/inventory/engine/group_vars/k8s-cluster/k8s-cluster.yml"
+        path: "{{ engine_cache }}/repos/kubespray/inventory/engine/group_vars/k8s_cluster/k8s-cluster.yml"

         regexp: "^kube_network_plugin:.*"
         line: "kube_network_plugin: calico"
 
         regexp: "^kube_network_plugin:.*"
         line: "kube_network_plugin: calico"
 

diff --git a/scenarios/k8-calico-istio.yaml b/scenarios/k8-calico-istio.yaml
index ca09ba836411ed7d971fc67fe7b595be12d3d22e..1c8e21fbe2539381dda1b2c440ae7cb5b7a9a7a5 100644 (file)
--- a/scenarios/k8-calico-istio.yaml
+++ b/scenarios/k8-calico-istio.yaml
@@ -29,7 +29,7 @@
     # set networking plugin to calico
     - name: Set network plugin to Calico
       lineinfile:
     # set networking plugin to calico
     - name: Set network plugin to Calico
       lineinfile:

-        path: "{{ engine_cache }}/repos/kubespray/inventory/engine/group_vars/k8s-cluster/k8s-cluster.yml"
+        path: "{{ engine_cache }}/repos/kubespray/inventory/engine/group_vars/k8s_cluster/k8s-cluster.yml"

         regexp: "^kube_network_plugin:.*"
         line: "kube_network_plugin: calico"
 
         regexp: "^kube_network_plugin:.*"
         line: "kube_network_plugin: calico"
 

diff --git a/scenarios/k8-calico-nofeature.yaml b/scenarios/k8-calico-nofeature.yaml
index 896888abb1dc9e2f0a7b0916999260c97545e7c1..97d88a3be0271ecc7b5d42c1d471d1d9d603d94f 100644 (file)
--- a/scenarios/k8-calico-nofeature.yaml
+++ b/scenarios/k8-calico-nofeature.yaml
@@ -29,7 +29,7 @@
     # set networking plugin to calico
     - name: Set network plugin to Calico
       lineinfile:
     # set networking plugin to calico
     - name: Set network plugin to Calico
       lineinfile:

-        path: "{{ engine_cache }}/repos/kubespray/inventory/engine/group_vars/k8s-cluster/k8s-cluster.yml"
+        path: "{{ engine_cache }}/repos/kubespray/inventory/engine/group_vars/k8s_cluster/k8s-cluster.yml"

         regexp: "^kube_network_plugin:.*"
         line: "kube_network_plugin: calico"
 
         regexp: "^kube_network_plugin:.*"
         line: "kube_network_plugin: calico"
 

diff --git a/scenarios/k8-calico-spinnaker.yaml b/scenarios/k8-calico-spinnaker.yaml
index 9d5cb2f61ed5f4b3c7bacfe92ca4bd3f591adaae..a52a61d7d7832ee890dc7b99aa8589d053f6615b 100644 (file)
--- a/scenarios/k8-calico-spinnaker.yaml
+++ b/scenarios/k8-calico-spinnaker.yaml
@@ -29,7 +29,7 @@
     # set networking plugin to calico
     - name: Set network plugin to calico
       lineinfile:
     # set networking plugin to calico
     - name: Set network plugin to calico
       lineinfile:

-        path: "{{ engine_cache }}/repos/kubespray/inventory/engine/group_vars/k8s-cluster/k8s-cluster.yml"
+        path: "{{ engine_cache }}/repos/kubespray/inventory/engine/group_vars/k8s_cluster/k8s-cluster.yml"

         regexp: "^kube_network_plugin:.*"
         line: "kube_network_plugin: calico"
 
         regexp: "^kube_network_plugin:.*"
         line: "kube_network_plugin: calico"
 

diff --git a/scenarios/k8-canal-nofeature.yaml b/scenarios/k8-canal-nofeature.yaml
index afad438122b174b1b838b3c28eeccdd4c90c7b68..2d026ef42b7fdcaad9ffd471751a3f2e90838853 100644 (file)
--- a/scenarios/k8-canal-nofeature.yaml
+++ b/scenarios/k8-canal-nofeature.yaml
@@ -29,7 +29,7 @@
     # set networking plugin to canal
     - name: Set network plugin to Canal
       lineinfile:
     # set networking plugin to canal
     - name: Set network plugin to Canal
       lineinfile:

-        path: "{{ engine_cache }}/repos/kubespray/inventory/engine/group_vars/k8s-cluster/k8s-cluster.yml"
+        path: "{{ engine_cache }}/repos/kubespray/inventory/engine/group_vars/k8s_cluster/k8s-cluster.yml"

         regexp: "^kube_network_plugin:.*"
         line: "kube_network_plugin: canal"
 
         regexp: "^kube_network_plugin:.*"
         line: "kube_network_plugin: canal"
 

diff --git a/scenarios/k8-cilium-nofeature.yaml b/scenarios/k8-cilium-nofeature.yaml
index d82f25145c73dfc15caf971074dce6c4a66438bb..6f48bd8d7fcc3941bc21ef5bff965d18678322c7 100644 (file)
--- a/scenarios/k8-cilium-nofeature.yaml
+++ b/scenarios/k8-cilium-nofeature.yaml
@@ -29,7 +29,7 @@
     # set networking plugin to cilium
     - name: Set network plugin to Cilium
       lineinfile:
     # set networking plugin to cilium
     - name: Set network plugin to Cilium
       lineinfile:

-        path: "{{ engine_cache }}/repos/kubespray/inventory/engine/group_vars/k8s-cluster/k8s-cluster.yml"
+        path: "{{ engine_cache }}/repos/kubespray/inventory/engine/group_vars/k8s_cluster/k8s-cluster.yml"

         regexp: "^kube_network_plugin:.*"
         line: "kube_network_plugin: cilium"
 
         regexp: "^kube_network_plugin:.*"
         line: "kube_network_plugin: cilium"
 

diff --git a/scenarios/k8-eno-ovs.yaml b/scenarios/k8-eno-ovs.yaml
index ea53be5f83e87cee24f22cd0281e93aa7fab45cb..e55e9f64fd29cd2020c8781eb15d68f63f78b3c3 100644 (file)
--- a/scenarios/k8-eno-ovs.yaml
+++ b/scenarios/k8-eno-ovs.yaml
@@ -29,14 +29,14 @@
     # set master plugin to calico for multus to use as the primary network plugin
     - name: Configure Multus to use Calico as the primary network plugin
       lineinfile:
     # set master plugin to calico for multus to use as the primary network plugin
     - name: Configure Multus to use Calico as the primary network plugin
       lineinfile:

-        path: "{{ engine_cache }}/repos/kubespray/inventory/engine/group_vars/k8s-cluster/k8s-cluster.yml"
+        path: "{{ engine_cache }}/repos/kubespray/inventory/engine/group_vars/k8s_cluster/k8s-cluster.yml"

         regexp: "^kube_network_plugin:.*"
         line: "kube_network_plugin: calico"
 
     # configure multus to use ca
     - name: Enable Multus network plugin
       lineinfile:
         regexp: "^kube_network_plugin:.*"
         line: "kube_network_plugin: calico"
 
     # configure multus to use ca
     - name: Enable Multus network plugin
       lineinfile:

-        path: "{{ engine_cache }}/repos/kubespray/inventory/engine/group_vars/k8s-cluster/k8s-cluster.yml"
+        path: "{{ engine_cache }}/repos/kubespray/inventory/engine/group_vars/k8s_cluster/k8s-cluster.yml"

         regexp: "^kube_network_plugin_multus:.*"
         line: "kube_network_plugin_multus: true"
 
         regexp: "^kube_network_plugin_multus:.*"
         line: "kube_network_plugin_multus: true"
 

diff --git a/scenarios/k8-flannel-nofeature.yaml b/scenarios/k8-flannel-nofeature.yaml
index 118351785d49f876872be9463790faee7b5849c0..0f69a07f89faa2ee5f2ffd7c37f621f0e88eb3be 100644 (file)
--- a/scenarios/k8-flannel-nofeature.yaml
+++ b/scenarios/k8-flannel-nofeature.yaml
@@ -29,7 +29,7 @@
     # set networking plugin to flannel
     - name: Set network plugin to Flannel
       lineinfile:
     # set networking plugin to flannel
     - name: Set network plugin to Flannel
       lineinfile:

-        path: "{{ engine_cache }}/repos/kubespray/inventory/engine/group_vars/k8s-cluster/k8s-cluster.yml"
+        path: "{{ engine_cache }}/repos/kubespray/inventory/engine/group_vars/k8s_cluster/k8s-cluster.yml"

         regexp: "^kube_network_plugin:.*"
         line: "kube_network_plugin: flannel"
 
         regexp: "^kube_network_plugin:.*"
         line: "kube_network_plugin: flannel"
 

diff --git a/scenarios/k8-multus-dualstack.yaml b/scenarios/k8-multus-dualstack.yaml
index 9e03d70275ed5c3ae50427d63ba766bf08b1941e..6255c978ef68d44df292cb4cee95d4cfd8ddab51 100644 (file)
--- a/scenarios/k8-multus-dualstack.yaml
+++ b/scenarios/k8-multus-dualstack.yaml
@@ -82,13 +82,13 @@
 
     - name: Configure Multus to use Calico as the primary network plugin
       lineinfile:
 
     - name: Configure Multus to use Calico as the primary network plugin
       lineinfile:

-        path: "{{ engine_cache }}/repos/kubespray/inventory/engine/group_vars/k8s-cluster/k8s-cluster.yml"
+        path: "{{ engine_cache }}/repos/kubespray/inventory/engine/group_vars/k8s_cluster/k8s-cluster.yml"

         regexp: "^kube_network_plugin:.*"
         line: "kube_network_plugin: calico"
 
     - name: Enable the Multus network plugin
       lineinfile:
         regexp: "^kube_network_plugin:.*"
         line: "kube_network_plugin: calico"
 
     - name: Enable the Multus network plugin
       lineinfile:

-        path: "{{ engine_cache }}/repos/kubespray/inventory/engine/group_vars/k8s-cluster/k8s-cluster.yml"
+        path: "{{ engine_cache }}/repos/kubespray/inventory/engine/group_vars/k8s_cluster/k8s-cluster.yml"

         regexp: "^kube_network_plugin_multus:.*"
         line: "kube_network_plugin_multus: true"
 
         regexp: "^kube_network_plugin_multus:.*"
         line: "kube_network_plugin_multus: true"
 

diff --git a/scenarios/k8-multus-nofeature.yaml b/scenarios/k8-multus-nofeature.yaml
index 1840e4aec487e2ef1a419076845ee7caa1143c6e..a122015511d54768a9ab2d31c7204860677433fe 100644 (file)
--- a/scenarios/k8-multus-nofeature.yaml
+++ b/scenarios/k8-multus-nofeature.yaml
@@ -29,14 +29,14 @@
     # set master plugin to calico for multus to use as the primary network plugin
     - name: Configure Multus to use Calico as the primary network plugin
       lineinfile:
     # set master plugin to calico for multus to use as the primary network plugin
     - name: Configure Multus to use Calico as the primary network plugin
       lineinfile:

-        path: "{{ engine_cache }}/repos/kubespray/inventory/engine/group_vars/k8s-cluster/k8s-cluster.yml"
+        path: "{{ engine_cache }}/repos/kubespray/inventory/engine/group_vars/k8s_cluster/k8s-cluster.yml"

         regexp: "^kube_network_plugin:.*"
         line: "kube_network_plugin: calico"
 
     # configure multus to use ca
     - name: Enable Multus network plugin
       lineinfile:
         regexp: "^kube_network_plugin:.*"
         line: "kube_network_plugin: calico"
 
     # configure multus to use ca
     - name: Enable Multus network plugin
       lineinfile:

-        path: "{{ engine_cache }}/repos/kubespray/inventory/engine/group_vars/k8s-cluster/k8s-cluster.yml"
+        path: "{{ engine_cache }}/repos/kubespray/inventory/engine/group_vars/k8s_cluster/k8s-cluster.yml"

         regexp: "^kube_network_plugin_multus:.*"
         line: "kube_network_plugin_multus: true"
 
         regexp: "^kube_network_plugin_multus:.*"
         line: "kube_network_plugin_multus: true"
 

diff --git a/scenarios/k8-multus-plugins.yaml b/scenarios/k8-multus-plugins.yaml
index 599558bf259765512d16c8c3d596bda15ef87b27..2235615e2a0acf7c6bad7d11493ac072a51ffc7e 100644 (file)
--- a/scenarios/k8-multus-plugins.yaml
+++ b/scenarios/k8-multus-plugins.yaml
@@ -29,14 +29,14 @@
     # set master plugin to calico for multus to use as the primary network plugin
     - name: Configure Multus to use Calico as the primary network plugin
       lineinfile:
     # set master plugin to calico for multus to use as the primary network plugin
     - name: Configure Multus to use Calico as the primary network plugin
       lineinfile:

-        path: "{{ engine_cache }}/repos/kubespray/inventory/engine/group_vars/k8s-cluster/k8s-cluster.yml"
+        path: "{{ engine_cache }}/repos/kubespray/inventory/engine/group_vars/k8s_cluster/k8s-cluster.yml"

         regexp: "^kube_network_plugin:.*"
         line: "kube_network_plugin: calico"
 
     # configure multus to use ca
     - name: Enable Multus network plugin
       lineinfile:
         regexp: "^kube_network_plugin:.*"
         line: "kube_network_plugin: calico"
 
     # configure multus to use ca
     - name: Enable Multus network plugin
       lineinfile:

-        path: "{{ engine_cache }}/repos/kubespray/inventory/engine/group_vars/k8s-cluster/k8s-cluster.yml"
+        path: "{{ engine_cache }}/repos/kubespray/inventory/engine/group_vars/k8s_cluster/k8s-cluster.yml"

         regexp: "^kube_network_plugin_multus:.*"
         line: "kube_network_plugin_multus: true"
 
         regexp: "^kube_network_plugin_multus:.*"
         line: "kube_network_plugin_multus: true"
 

diff --git a/scenarios/k8-weave-nofeature.yaml b/scenarios/k8-weave-nofeature.yaml
index 56637ab4057dd72f205f5f2cc60d63bb39ea86a7..8e6a868d94a861ddc5585d73833a27413e6ab876 100644 (file)
--- a/scenarios/k8-weave-nofeature.yaml
+++ b/scenarios/k8-weave-nofeature.yaml
@@ -29,7 +29,7 @@
     # set networking plugin to weave
     - name: Set network plugin to Weave
       lineinfile:
     # set networking plugin to weave
     - name: Set network plugin to Weave
       lineinfile:

-        path: "{{ engine_cache }}/repos/kubespray/inventory/engine/group_vars/k8s-cluster/k8s-cluster.yml"
+        path: "{{ engine_cache }}/repos/kubespray/inventory/engine/group_vars/k8s_cluster/k8s-cluster.yml"

         regexp: "^kube_network_plugin:.*"
         line: "kube_network_plugin: weave"
 
         regexp: "^kube_network_plugin:.*"
         line: "kube_network_plugin: weave"
 

diff --git a/vars/kubernetes.yaml b/vars/kubernetes.yaml
index 55aa506f9fc515e25ff5201c58248f7bbba07ba9..98bbbb438258d8b751d0ab716fd8e40e27936486 100644 (file)
--- a/vars/kubernetes.yaml
+++ b/vars/kubernetes.yaml
@@ -74,7 +74,7 @@ containerd_io_version: "1.2.13-2"
 # Kubernetes: Kubernetes and kubectl versions
 # -------------------------------------------------------------------------------
 # Kubernetes version that is supported by the pinned kubespray version
 # Kubernetes: Kubernetes and kubectl versions
 # -------------------------------------------------------------------------------
 # Kubernetes version that is supported by the pinned kubespray version

-kubernetes_version: "v1.18.5"
+kubernetes_version: "v1.19.11"

 # version of the kubectl should generally match to the version of kubernetes itself
 # but it would be good to have possibility to override it in case if someone needs it for some reason
 kubectl_version: "{{ kubernetes_version }}"
 # version of the kubectl should generally match to the version of kubernetes itself
 # but it would be good to have possibility to override it in case if someone needs it for some reason
 kubectl_version: "{{ kubernetes_version }}"


@@ -121,7 +121,7 @@ network_resources_injector_version: "v1.2"
 # -------------------------------------------------------------------------------
 # Kubernetes: App versions
 # -------------------------------------------------------------------------------
 # -------------------------------------------------------------------------------
 # Kubernetes: App versions
 # -------------------------------------------------------------------------------

-helm_version: "v3.5.0"
+helm_version: "v3.5.4"

 charts_version: "0b64349aeb537d0fd038df0e1d40ec5cf1206609"
 istio_version: "1.3.1"
 
 charts_version: "0b64349aeb537d0fd038df0e1d40ec5cf1206609"
 istio_version: "1.3.1"