Use tagged versions for the dependent projects of ENO

Deploy-Scenario: k8-eno-ovs

Signed-off-by: Rafael Montero Herrera <rafael.montero.herrera@ericsson.com>
Change-Id: If6ca213ec0762a04561f5eb288909b40fb02ac41

diff --git a/apps/eno/kubespray/playbooks/roles/install/tasks/install-app-master.yml b/apps/eno/kubespray/playbooks/roles/install/tasks/install-app-master.yml
index d498fae69befc6eb791402edde92cdd4bc4db0aa..a68338e3d39ea79ad28fbb6b4514f4ce5bded592 100644 (file)
--- a/apps/eno/kubespray/playbooks/roles/install/tasks/install-app-master.yml
+++ b/apps/eno/kubespray/playbooks/roles/install/tasks/install-app-master.yml
@@ -37,7 +37,7 @@
   git:
     repo: https://github.com/Nordix/eno.git
     dest: /root/k8s-addons/eno
-    version: master
+    version: "{{ eno_version }}"
 
 - name: Make install eno-controller Docker image
   command: "make eno-docker-build -C k8s-addons/eno/"

diff --git a/apps/eno/kubespray/playbooks/roles/install/tasks/install-app-worker.yml b/apps/eno/kubespray/playbooks/roles/install/tasks/install-app-worker.yml
index 5d1358197ceaf2df61237dddb4f4e5fc9cde5fed..ce51409071d3e0acec7d0fdda38bf743b2d07acf 100644 (file)
--- a/apps/eno/kubespray/playbooks/roles/install/tasks/install-app-worker.yml
+++ b/apps/eno/kubespray/playbooks/roles/install/tasks/install-app-worker.yml
@@ -37,7 +37,7 @@
   git:
     repo: https://github.com/Nordix/eno.git
     dest: /root/k8s-addons/eno
-    version: master
+    version: "{{ eno_version }}"
 
 - name: Make install eno-controller Docker image
   command: "make eno-docker-build -C k8s-addons/eno/"

diff --git a/apps/network-resources-injector/kubespray/playbooks/roles/install/tasks/install-app-master.yml b/apps/network-resources-injector/kubespray/playbooks/roles/install/tasks/install-app-master.yml
index 69176b6f61aea64ba8c163a0d0d129249d147f8d..6dfa1ace43bfc7ddc9d5204e531ed072b665bdc5 100644 (file)
--- a/apps/network-resources-injector/kubespray/playbooks/roles/install/tasks/install-app-master.yml
+++ b/apps/network-resources-injector/kubespray/playbooks/roles/install/tasks/install-app-master.yml
@@ -31,7 +31,7 @@
   git:
     repo: https://github.com/k8snetworkplumbingwg/network-resources-injector.git
     dest: /root/k8s-addons/network-resources-injector
-    version: master
+    version: "{{ network_resources_injector_version }}"
 
 - name: Set python3.6 as default
   alternatives:

diff --git a/apps/network-resources-injector/kubespray/playbooks/roles/install/tasks/install-app-worker.yml b/apps/network-resources-injector/kubespray/playbooks/roles/install/tasks/install-app-worker.yml
index f8ce92237656714e272270d4a308f41e238aaf2b..4da6f6474986a4199abc23dff7bc82e3e276812b 100644 (file)
--- a/apps/network-resources-injector/kubespray/playbooks/roles/install/tasks/install-app-worker.yml
+++ b/apps/network-resources-injector/kubespray/playbooks/roles/install/tasks/install-app-worker.yml
@@ -37,7 +37,7 @@
   git:
     repo: https://github.com/k8snetworkplumbingwg/network-resources-injector.git
     dest: /root/k8s-addons/network-resources-injector
-    version: master
+    version: "{{ network_resources_injector_version }}"
 
 - name: Make install Docker image
   command: "make image -C k8s-addons/network-resources-injector/"

diff --git a/apps/ovs-cni/kubespray/playbooks/roles/install/tasks/install-plugin.yml b/apps/ovs-cni/kubespray/playbooks/roles/install/tasks/install-plugin.yml
index 4456e85eee17bca7800417d8d5b44eba75589def..6a9d3a3b2ff3753b991a3824ae248cd58e31f177 100644 (file)
--- a/apps/ovs-cni/kubespray/playbooks/roles/install/tasks/install-plugin.yml
+++ b/apps/ovs-cni/kubespray/playbooks/roles/install/tasks/install-plugin.yml
@@ -37,7 +37,7 @@
   git:
     repo: https://github.com/k8snetworkplumbingwg/ovs-cni.git
     dest: /root/k8s-addons/ovs-cni
-    version: main
+    version: "{{ ovs_cni_version }}"
 
 - name: Make install
   command: "make -C k8s-addons/ovs-cni/"

diff --git a/apps/sriov-network-device-plugin/kubespray/playbooks/roles/install/tasks/install-plugin.yml b/apps/sriov-network-device-plugin/kubespray/playbooks/roles/install/tasks/install-plugin.yml
index 262d44576f06c67551b3d0c5118830ec5c644ce6..ee457e04e61aeedb9c4c4f96b673a0dc3e5e3c74 100644 (file)
--- a/apps/sriov-network-device-plugin/kubespray/playbooks/roles/install/tasks/install-plugin.yml
+++ b/apps/sriov-network-device-plugin/kubespray/playbooks/roles/install/tasks/install-plugin.yml
@@ -37,7 +37,7 @@
   git:
     repo: https://github.com/k8snetworkplumbingwg/sriov-network-device-plugin.git
     dest: /root/k8s-addons/sriov-network-device-plugin
-    version: master
+    version: "{{ sriov_network_device_plugin_version }}"
 
 - name: Make install Docker image
   command: "make image -C k8s-addons/sriov-network-device-plugin/"

diff --git a/apps/whereabouts/kubespray/playbooks/roles/install/tasks/install-plugin.yml b/apps/whereabouts/kubespray/playbooks/roles/install/tasks/install-plugin.yml
index 12567ae2e897edec80ab89f86ddb73481492c465..b8106ff53a0fdf001188ca744dfe6818755437a5 100644 (file)
--- a/apps/whereabouts/kubespray/playbooks/roles/install/tasks/install-plugin.yml
+++ b/apps/whereabouts/kubespray/playbooks/roles/install/tasks/install-plugin.yml
@@ -31,7 +31,7 @@
   git:
     repo: https://github.com/k8snetworkplumbingwg/whereabouts.git
     dest: /root/k8s-addons/whereabouts
-    version: master
+    version: "{{ whereabouts_version }}"
 
 - name: Install Whereabouts IPAM Plugin
   command: "kubectl apply -f k8s-addons/whereabouts/doc/daemonset-install.yaml -f k8s-addons/whereabouts/doc/whereabouts.cni.cncf.io_ippools.yaml"

diff --git a/vars/kubernetes.yaml b/vars/kubernetes.yaml
index 462a7c7b24b4d7dd90e579f926056d8b2aa90bbc..60460debfe7bc2b33ca4889eb2a9547e61456068 100644 (file)
--- a/vars/kubernetes.yaml
+++ b/vars/kubernetes.yaml
@@ -109,6 +109,15 @@ prom_push_gateway_version: "v1.0.1"
 spinnaker_version: "1.23.2"
 spinnaker_app_version: "1.16.2"
 
+# -------------------------------------------------------------------------------
+# Kubernetes: Versions of eno and its dependencies
+# -------------------------------------------------------------------------------
+eno_version: "master"
+sriov_network_device_plugin_version: "v3.3.2"
+ovs_cni_version: "v0.24.0"
+whereabouts_version: "v0.4.2"
+network_resources_injector_version: "v1.2"
+
 # -------------------------------------------------------------------------------
 # Kubernetes: App versions
 # -------------------------------------------------------------------------------