From 78cceec2c7360cd108c031ac9b8ca379598e685b Mon Sep 17 00:00:00 2001 From: Martin Schuppert Date: Mon, 11 Sep 2023 14:00:30 +0200 Subject: [PATCH] Update DNSMasq to use serviceOverride instead of externalEndpoints --- ...nstackcontrolplane_galera_network_isolation.yaml | 13 +++++++++---- ...rolplane_galera_network_isolation_3replicas.yaml | 13 +++++++++---- ...ta1_openstackcontrolplane_network_isolation.yaml | 13 +++++++++---- ...penstackcontrolplane_network_isolation_ceph.yaml | 13 +++++++++---- 4 files changed, 36 insertions(+), 16 deletions(-) diff --git a/config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation.yaml b/config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation.yaml index 1673391d9..353c77859 100644 --- a/config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation.yaml +++ b/config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation.yaml @@ -7,10 +7,15 @@ spec: storageClass: local-storage dns: template: - externalEndpoints: - - ipAddressPool: ctlplane - loadBalancerIPs: - - 192.168.122.80 + override: + service: + metadata: + annotations: + metallb.universe.tf/address-pool: ctlplane + metallb.universe.tf/allow-shared-ip: ctlplane + metallb.universe.tf/loadBalancerIPs: 192.168.122.80 + spec: + type: LoadBalancer options: - key: server values: diff --git a/config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation_3replicas.yaml b/config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation_3replicas.yaml index 68b8fdf58..af50a34f0 100644 --- a/config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation_3replicas.yaml +++ b/config/samples/core_v1beta1_openstackcontrolplane_galera_network_isolation_3replicas.yaml @@ -7,10 +7,15 @@ spec: storageClass: local-storage dns: template: - externalEndpoints: - - ipAddressPool: ctlplane - loadBalancerIPs: - - 192.168.122.80 + override: + service: + metadata: + annotations: + metallb.universe.tf/address-pool: ctlplane + metallb.universe.tf/allow-shared-ip: ctlplane + metallb.universe.tf/loadBalancerIPs: 192.168.122.80 + spec: + type: LoadBalancer options: - key: server values: diff --git a/config/samples/core_v1beta1_openstackcontrolplane_network_isolation.yaml b/config/samples/core_v1beta1_openstackcontrolplane_network_isolation.yaml index 5a31ed287..a63e0e7f4 100644 --- a/config/samples/core_v1beta1_openstackcontrolplane_network_isolation.yaml +++ b/config/samples/core_v1beta1_openstackcontrolplane_network_isolation.yaml @@ -7,10 +7,15 @@ spec: storageClass: local-storage dns: template: - externalEndpoints: - - ipAddressPool: ctlplane - loadBalancerIPs: - - 192.168.122.80 + override: + service: + metadata: + annotations: + metallb.universe.tf/address-pool: ctlplane + metallb.universe.tf/allow-shared-ip: ctlplane + metallb.universe.tf/loadBalancerIPs: 192.168.122.80 + spec: + type: LoadBalancer options: - key: server values: diff --git a/config/samples/core_v1beta1_openstackcontrolplane_network_isolation_ceph.yaml b/config/samples/core_v1beta1_openstackcontrolplane_network_isolation_ceph.yaml index 0ab04e18b..c5fe4c06f 100644 --- a/config/samples/core_v1beta1_openstackcontrolplane_network_isolation_ceph.yaml +++ b/config/samples/core_v1beta1_openstackcontrolplane_network_isolation_ceph.yaml @@ -27,10 +27,15 @@ spec: readOnly: true dns: template: - externalEndpoints: - - ipAddressPool: ctlplane - loadBalancerIPs: - - 192.168.122.80 + override: + service: + metadata: + annotations: + metallb.universe.tf/address-pool: ctlplane + metallb.universe.tf/allow-shared-ip: ctlplane + metallb.universe.tf/loadBalancerIPs: 192.168.122.80 + spec: + type: LoadBalancer options: - key: server values: