Add missing key/parameter;Fix dependency type;Add k8s version to filename

2023-03-15 10:24:45 +01:00
parent daa7a240cc
commit 6bd49750a4
7 changed files with 14 additions and 2 deletions
--- a/ansible/roles/firstboot/files/ansible_payload/bootstrap/templates/ippool.j2
+++ b/ansible/roles/firstboot/files/ansible_payload/bootstrap/templates/ippool.j2
@ -2,6 +2,7 @@ apiVersion: ipam.cluster.x-k8s.io/v1alpha1
 kind: InClusterIPPool
 metadata:
  name: inclusterippool-{{ _template.cluster.name }}
+  namespace: {{ _template.cluster.namespace }}
 spec:
  start: {{ _template.cluster.network.startip }}
  end: {{ _template.cluster.network.endip }}
--- a/ansible/roles/firstboot/files/ansible_payload/bootstrap/templates/kustomization.cluster-template.j2
+++ b/ansible/roles/firstboot/files/ansible_payload/bootstrap/templates/kustomization.cluster-template.j2
@ -76,6 +76,8 @@ patchesStrategicMerge:
              - apiGroup: ipam.cluster.x-k8s.io
                kind: InClusterIPPool
                name: inclusterippool-${CLUSTER_NAME}
+              nameservers:
+              - {{ _template.network.dnsserver }}
              networkName: '${VSPHERE_NETWORK}'

 patchesJson6902: