Ingress Nginx Integration

[infra/stack/kubernetes.git] / vars / kubernetes.yaml

diff --git a/vars/kubernetes.yaml b/vars/kubernetes.yaml
index 462a7c7b24b4d7dd90e579f926056d8b2aa90bbc..8a9b6142f2495ba05a94b258382893d9f1715953 100644 (file)
--- a/vars/kubernetes.yaml
+++ b/vars/kubernetes.yaml
@@ -49,6 +49,7 @@ scenarios:
   - k8-calico-istio
   - k8-calico-nofeature
   - k8-calico-spinnaker
+  - k8-calico-eiffel
   - k8-canal-nofeature
   - k8-cilium-nofeature
   - k8-flannel-nofeature
@@ -60,6 +61,7 @@ scenarios:
 
 # NOTE (fdegir): set default deploy scenario for the stack
 deploy_scenario: "{{ lookup('env', 'DEPLOY_SCENARIO') | default('k8-multus-plugins', true) }}"
+deployment_image_version: "{{ lookup('env', 'DEPLOYMENT_IMAGE_VERSION') | default('v2', true) }}"
 
 # -------------------------------------------------------------------------------
 # Nordix: Docker version
@@ -71,18 +73,19 @@ docker_registry_version: "2.7.1"
 containerd_io_version: "1.2.13-2"
 
 # -------------------------------------------------------------------------------
-# Kubernetes: Kubernetes and kubectl versions
+# Kubernetes: Kubernetes kubectl and Ingress 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 }}"
+ingress_nginx_version: "v1.1.1"
 
 # -------------------------------------------------------------------------------
 # Kubernetes: Versions of rook, ceph and their dependencies
 # -------------------------------------------------------------------------------
-rook_version: "v1.5.9"
+rook_version: "v1.6.0"
 busybox_version: "1.32.0"
 ceph_version: "v14.2.18-20210316"
 cephcsi_version: "v3.2.0"
@@ -109,10 +112,19 @@ 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: "50a6e66bb84e54087cf52a9b9241f6283ad2e16f"
+whereabouts_version: "v0.4.2"
+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"