From 6093c30211fd9a02033596324e800cf803a3e116 Mon Sep 17 00:00:00 2001 From: Rafael Montero Herrera Date: Thu, 7 Oct 2021 12:20:30 +0000 Subject: [PATCH] Use tagged versions for the dependent projects of ENO Deploy-Scenario: k8-eno-ovs Signed-off-by: Rafael Montero Herrera Change-Id: If6ca213ec0762a04561f5eb288909b40fb02ac41 --- .../playbooks/roles/install/tasks/install-app-master.yml | 2 +- .../playbooks/roles/install/tasks/install-app-worker.yml | 2 +- .../playbooks/roles/install/tasks/install-app-master.yml | 2 +- .../playbooks/roles/install/tasks/install-app-worker.yml | 2 +- .../playbooks/roles/install/tasks/install-plugin.yml | 2 +- .../playbooks/roles/install/tasks/install-plugin.yml | 2 +- .../playbooks/roles/install/tasks/install-plugin.yml | 2 +- vars/kubernetes.yaml | 9 +++++++++ 8 files changed, 16 insertions(+), 7 deletions(-) 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 d498fae..a68338e 100644 --- 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 5d13581..ce51409 100644 --- 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 69176b6..6dfa1ac 100644 --- 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 f8ce922..4da6f64 100644 --- 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 4456e85..6a9d3a3 100644 --- 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 262d445..ee457e0 100644 --- 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 12567ae..b8106ff 100644 --- 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 462a7c7..60460de 100644 --- 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 # ------------------------------------------------------------------------------- -- 2.25.1