Ingress Nginx Integration

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

diff --git a/vars/kubernetes.yaml b/vars/kubernetes.yaml
index c05e3105bb49ce8a90f1823864d863147be97db4..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-istio
   - k8-calico-nofeature
   - k8-calico-spinnaker

+  - k8-calico-eiffel

   - k8-canal-nofeature
   - k8-cilium-nofeature
   - k8-flannel-nofeature
   - k8-canal-nofeature
   - k8-cilium-nofeature
   - k8-flannel-nofeature


@@ -72,13 +73,14 @@ docker_registry_version: "2.7.1"
 containerd_io_version: "1.2.13-2"
 
 # -------------------------------------------------------------------------------
 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.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 }}"
 # -------------------------------------------------------------------------------
 # Kubernetes version that is supported by the pinned kubespray version
 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
 
 # -------------------------------------------------------------------------------
 # Kubernetes: Versions of rook, ceph and their dependencies


@@ -115,7 +117,7 @@ spinnaker_app_version: "1.16.2"
 # -------------------------------------------------------------------------------
 eno_version: "master"
 sriov_network_device_plugin_version: "v3.3.2"
 # -------------------------------------------------------------------------------
 eno_version: "master"
 sriov_network_device_plugin_version: "v3.3.2"

-ovs_cni_version: "v0.24.0"
+ovs_cni_version: "50a6e66bb84e54087cf52a9b9241f6283ad2e16f"

 whereabouts_version: "v0.4.2"
 network_resources_injector_version: "v1.2"
 
 whereabouts_version: "v0.4.2"
 network_resources_injector_version: "v1.2"