k8s version 1.19.11 01/11301/9
authornauman <nauman.yaseen@est.tech>
Tue, 16 Nov 2021 12:06:32 +0000 (12:06 +0000)
committerAndrew Fenner <Andrew.Fenner@est.tech>
Tue, 7 Dec 2021 08:55:02 +0000 (08:55 +0000)
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

14 files changed:
playbooks/roles/package/defaults/main.yaml
scenarios/k8-calico-dualstack.yaml
scenarios/k8-calico-istio.yaml
scenarios/k8-calico-nofeature.yaml
scenarios/k8-calico-spinnaker.yaml
scenarios/k8-canal-nofeature.yaml
scenarios/k8-cilium-nofeature.yaml
scenarios/k8-eno-ovs.yaml
scenarios/k8-flannel-nofeature.yaml
scenarios/k8-multus-dualstack.yaml
scenarios/k8-multus-nofeature.yaml
scenarios/k8-multus-plugins.yaml
scenarios/k8-weave-nofeature.yaml
vars/kubernetes.yaml

index b1270d0..de7cea7 100644 (file)
@@ -41,6 +41,7 @@ k8s_binaries:
   - kubeadm
   - kubectl
   - kubelet
+  - calico_crds
 
 k8s_misc_images:
   - addon_resizer
index 6bd00bb..a6abdf7 100644 (file)
@@ -83,7 +83,7 @@
 
     - 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"
 
index ca09ba8..1c8e21f 100644 (file)
@@ -29,7 +29,7 @@
     # 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"
 
index 896888a..97d88a3 100644 (file)
@@ -29,7 +29,7 @@
     # 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"
 
index 9d5cb2f..a52a61d 100644 (file)
@@ -29,7 +29,7 @@
     # 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"
 
index afad438..2d026ef 100644 (file)
@@ -29,7 +29,7 @@
     # 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"
 
index d82f251..6f48bd8 100644 (file)
@@ -29,7 +29,7 @@
     # 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"
 
index ea53be5..e55e9f6 100644 (file)
     # 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:
-        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"
 
index 1183517..0f69a07 100644 (file)
@@ -29,7 +29,7 @@
     # 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"
 
index 9e03d70..6255c97 100644 (file)
 
     - 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:
-        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"
 
index 1840e4a..a122015 100644 (file)
     # 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:
-        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"
 
index 599558b..2235615 100644 (file)
     # 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:
-        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"
 
index 56637ab..8e6a868 100644 (file)
@@ -29,7 +29,7 @@
     # 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"
 
index 55aa506..98bbbb4 100644 (file)
@@ -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_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 }}"
@@ -121,7 +121,7 @@ network_resources_injector_version: "v1.2"
 # -------------------------------------------------------------------------------
 # Kubernetes: App versions
 # -------------------------------------------------------------------------------
-helm_version: "v3.5.0"
+helm_version: "v3.5.4"
 charts_version: "0b64349aeb537d0fd038df0e1d40ec5cf1206609"
 istio_version: "1.3.1"