From 3fe6dbb65c87043d883e4edbfc7a489a8d1ee1d7 Mon Sep 17 00:00:00 2001 From: Sergey Date: Thu, 17 Jun 2021 03:00:19 +0300 Subject: [PATCH] fix image pull url for coredns v1.8.0 (#7702) --- roles/download/defaults/main.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/roles/download/defaults/main.yml b/roles/download/defaults/main.yml index 820139110..afcfc944f 100644 --- a/roles/download/defaults/main.yml +++ b/roles/download/defaults/main.yml @@ -493,9 +493,10 @@ haproxy_image_tag: 2.3 # Coredns version should be supported by corefile-migration (or at least work with) # bundle with kubeadm; if not 'basic' upgrade can sometimes fail -coredns_image_is_namespaced: "{{ (kube_major_version | regex_replace('^v', '') | float) >= 1.21 }}" coredns_version: "v1.8.0" +coredns_image_is_namespaced: "{{ (kube_version is version('v1.21.0','>=')) or (coredns_version is version('v1.7.1','>=')) }}" + coredns_image_repo: "{{ kube_image_repo }}{{'/coredns/coredns' if (coredns_image_is_namespaced | bool) else '/coredns' }}" coredns_image_tag: "{{ coredns_version if (coredns_image_is_namespaced | bool) else (coredns_version | regex_replace('^v', '')) }}"