Browse Source
fix(coredns): make sure to keep coredns repository namespace (#8572)
fix: regex
fix: wrong regex_replace usage
pull/8580/head
Nicolas Goudry
2 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
2 additions and
2 deletions
-
roles/download/templates/kubeadm-images.yaml.j2
-
roles/kubernetes/control-plane/templates/kubeadm-config.v1beta2.yaml.j2
|
|
|
@ -21,5 +21,5 @@ etcd: |
|
|
|
{% endif %} |
|
|
|
dns: |
|
|
|
type: CoreDNS |
|
|
|
imageRepository: {{ coredns_image_repo | regex_replace('/coredns.*$','') }} |
|
|
|
imageRepository: {{ coredns_image_repo | regex_replace('/coredns(?!/coredns).*$','') }} |
|
|
|
imageTag: {{ coredns_image_tag }} |
|
|
|
@ -84,7 +84,7 @@ etcd: |
|
|
|
{% endif %} |
|
|
|
dns: |
|
|
|
type: CoreDNS |
|
|
|
imageRepository: {{ coredns_image_repo | regex_replace('/coredns.*$','') }} |
|
|
|
imageRepository: {{ coredns_image_repo | regex_replace('/coredns(?!/coredns).*$','') }} |
|
|
|
imageTag: {{ coredns_image_tag }} |
|
|
|
networking: |
|
|
|
dnsDomain: {{ dns_domain }} |
|
|
|
|
