C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix(coredns): make sure to keep coredns repository namespace (#8572)

Browse source 
fix: regex

fix: wrong regex_replace usage
This commit is contained in:
Nicolas Goudry 2022-02-24 10:01:33 +01:00 committed by GitHub
parent a090038d02
commit ee079f4740
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
roles/download/templates/kubeadm-images.yaml.j2
View file

@ -21,5 +21,5 @@ etcd:
{% endif %} {% endif %}
dns: dns:
type: CoreDNS type: CoreDNS
imageRepository: {{ coredns_image_repo | regex_replace('/coredns.*$','') }} imageRepository: {{ coredns_image_repo | regex_replace('/coredns(?!/coredns).*$','') }}
imageTag: {{ coredns_image_tag }} imageTag: {{ coredns_image_tag }}

2
roles/kubernetes/control-plane/templates/kubeadm-config.v1beta2.yaml.j2
View file

@ -84,7 +84,7 @@ etcd:
{% endif %} {% endif %}
dns: dns:
type: CoreDNS type: CoreDNS
imageRepository: {{ coredns_image_repo | regex_replace('/coredns.*$','') }} imageRepository: {{ coredns_image_repo | regex_replace('/coredns(?!/coredns).*$','') }}
imageTag: {{ coredns_image_tag }} imageTag: {{ coredns_image_tag }}
networking: networking:
dnsDomain: {{ dns_domain }} dnsDomain: {{ dns_domain }}