From 90c867b4242beb4b58faf9ceed11adc1290eeb2a Mon Sep 17 00:00:00 2001
From: Florian Ruynat <florian234@hotmail.com>
Date: Thu, 18 Jun 2020 16:48:19 +0200
Subject: [PATCH] Update loadbalancers versions (haproxy&nginx) (#6278)
---
roles/download/defaults/main.yml | 4 ++--
tests/files/packet_centos8-calico.yml | 3 +--
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml
index 740ea1b5d..482d764d5 100644
--- a/roles/download/defaults/main.yml
+++ b/roles/download/defaults/main.yml
@@ -438,9 +438,9 @@ multus_image_repo: "{{ docker_image_repo }}/nfvpe/multus"
multus_image_tag: "{{ multus_version }}"
nginx_image_repo: "{{ docker_image_repo }}/library/nginx"
-nginx_image_tag: 1.17
+nginx_image_tag: 1.19
haproxy_image_repo: "{{ docker_image_repo }}/library/haproxy"
-haproxy_image_tag: 1.9
+haproxy_image_tag: 2.1
# Coredns version should be supported by corefile-migration (or at least work with)
# bundle with kubeadm; if not 'basic' upgrade can sometimes fail
diff --git a/tests/files/packet_centos8-calico.yml b/tests/files/packet_centos8-calico.yml
index f03e0d240..30844b330 100644
--- a/tests/files/packet_centos8-calico.yml
+++ b/tests/files/packet_centos8-calico.yml
@@ -7,10 +7,9 @@ mode: default
kube_network_plugin: calico
deploy_netchecker: true
dns_min_replicas: 1
-
metrics_server_enabled: true
-
dashboard_namespace: "kube-dashboard"
+loadbalancer_apiserver_type: haproxy
# required / not autodetected for now
calico_iptables_backend: "NFT"
--
GitLab