From 507091ec8b6fac48d5d7f13882d76d42f9a6fde5 Mon Sep 17 00:00:00 2001
From: Olivier Lemasle <o.lemasle@gmail.com>
Date: Wed, 1 Sep 2021 17:18:59 +0200
Subject: [PATCH] Replace cluster_name by dns_domain (#7923)
`cluster_name` defaults to `dns_domain` value (see [here][1] and [here][2])
but they could have different values.
`dns_domain` should be used here instead of `cluster_name` because the DNS
resolution is configured to use `dns_domain`.
[1]: https://github.com/kubernetes-sigs/kubespray/blob/0ef7af76bc234efa06183e7329e557df87f9c0ee/roles/kubespray-defaults/defaults/main.yaml#L104
[2]: https://github.com/kubernetes-sigs/kubespray/blob/1afdb05ea9e1678b97e0224191d0a9341ce84f41/inventory/sample/group_vars/k8s_cluster/k8s-cluster.yml#L196
---
.../kubernetes-apps/registry/templates/registry-proxy-ds.yml.j2 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/roles/kubernetes-apps/registry/templates/registry-proxy-ds.yml.j2 b/roles/kubernetes-apps/registry/templates/registry-proxy-ds.yml.j2
index e431b323d..a6fd92ec3 100644
--- a/roles/kubernetes-apps/registry/templates/registry-proxy-ds.yml.j2
+++ b/roles/kubernetes-apps/registry/templates/registry-proxy-ds.yml.j2
@@ -27,7 +27,7 @@ spec:
imagePullPolicy: {{ k8s_image_pull_policy }}
env:
- name: REGISTRY_HOST
- value: registry.{{ registry_namespace }}.svc.{{ cluster_name }}
+ value: registry.{{ registry_namespace }}.svc.{{ dns_domain }}
- name: REGISTRY_PORT
value: "{{ registry_port }}"
ports:
--
GitLab