From a14d0cc04efccea7d744db23e18684e77c4e5e58 Mon Sep 17 00:00:00 2001 From: Bharat Kunwar Date: Thu, 21 Nov 2019 16:45:33 +0000 Subject: [PATCH] Make traefik compatible with 1.16.x Also bump up version to 1.7.19. Story: 2006853 Task: 37586 Change-Id: Ic91f46f98d07ada0bd4b777ce1409a98e847cf1b --- .../templates/kubernetes/fragments/enable-ingress-traefik.sh | 4 ++++ .../drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml | 2 +- .../drivers/k8s_fedora_coreos_v1/templates/kubecluster.yaml | 2 +- .../traefik-compatible-with-k8s-1-16-9a9ef6d3ccc92fb4.yaml | 4 ++++ 4 files changed, 10 insertions(+), 2 deletions(-) create mode 100644 releasenotes/notes/traefik-compatible-with-k8s-1-16-9a9ef6d3ccc92fb4.yaml diff --git a/magnum/drivers/common/templates/kubernetes/fragments/enable-ingress-traefik.sh b/magnum/drivers/common/templates/kubernetes/fragments/enable-ingress-traefik.sh index 4170feab70..fc61798634 100644 --- a/magnum/drivers/common/templates/kubernetes/fragments/enable-ingress-traefik.sh +++ b/magnum/drivers/common/templates/kubernetes/fragments/enable-ingress-traefik.sh @@ -48,6 +48,10 @@ metadata: labels: k8s-app: ingress-traefik-backend spec: + selector: + matchLabels: + k8s-app: ingress-traefik-backend + name: ingress-traefik-backend template: metadata: labels: diff --git a/magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml b/magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml index fd575e74c7..2026f24aaa 100644 --- a/magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml +++ b/magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml @@ -261,7 +261,7 @@ parameters: traefik_ingress_controller_tag: type: string description: tag of the traefik containers to be used. - default: v1.7.10 + default: v1.7.19 wait_condition_timeout: type: number diff --git a/magnum/drivers/k8s_fedora_coreos_v1/templates/kubecluster.yaml b/magnum/drivers/k8s_fedora_coreos_v1/templates/kubecluster.yaml index 2aa94b31b2..f7ab3f8b1b 100644 --- a/magnum/drivers/k8s_fedora_coreos_v1/templates/kubecluster.yaml +++ b/magnum/drivers/k8s_fedora_coreos_v1/templates/kubecluster.yaml @@ -261,7 +261,7 @@ parameters: traefik_ingress_controller_tag: type: string description: tag of the traefik containers to be used. - default: v1.7.10 + default: v1.7.19 wait_condition_timeout: type: number diff --git a/releasenotes/notes/traefik-compatible-with-k8s-1-16-9a9ef6d3ccc92fb4.yaml b/releasenotes/notes/traefik-compatible-with-k8s-1-16-9a9ef6d3ccc92fb4.yaml new file mode 100644 index 0000000000..7d4f605884 --- /dev/null +++ b/releasenotes/notes/traefik-compatible-with-k8s-1-16-9a9ef6d3ccc92fb4.yaml @@ -0,0 +1,4 @@ +--- +fixes: + - | + Bump up traefik to 1.7.19 for compatibility with Kubernetes 1.16.x.