Skip to content

Bug 1841066: OpenStack: Remove DNS VIP #1666

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Jun 3, 2020
Merged

Bug 1841066: OpenStack: Remove DNS VIP #1666

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions manifests/openstack/coredns.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@ spec:
- "/etc/kubernetes/kubeconfig"
- "--api-vip"
- "{{ .ControllerConfig.Infra.Status.PlatformStatus.OpenStack.APIServerInternalIP }}"
- "--dns-vip"
- "{{ .ControllerConfig.Infra.Status.PlatformStatus.OpenStack.NodeDNSIP }}"
- "--ingress-vip"
- "{{ .ControllerConfig.Infra.Status.PlatformStatus.OpenStack.IngressIP }}"
- "/config"
Expand Down
15 changes: 0 additions & 15 deletions manifests/openstack/keepalived.conf.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,18 +18,3 @@ vrrp_instance {{`{{.Cluster.Name}}`}}_API {
{{`{{ .Cluster.APIVIP }}`}}/{{`{{ .Cluster.VIPNetmask }}`}}
}
}

vrrp_instance {{`{{.Cluster.Name}}`}}_DNS {
state MASTER
interface {{`{{.VRRPInterface}}`}}
virtual_router_id {{`{{.Cluster.DNSVirtualRouterID }}`}}
priority 140
advert_int 1
authentication {
auth_type PASS
auth_pass {{`{{.Cluster.Name}}`}}_dns_vip
}
virtual_ipaddress {
{{`{{ .Cluster.DNSVIP }}`}}/{{`{{ .Cluster.VIPNetmask }}`}}
}
}
2 changes: 0 additions & 2 deletions manifests/openstack/keepalived.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@ spec:
- "/etc/kubernetes/kubeconfig"
- "--api-vip"
- "{{ .ControllerConfig.Infra.Status.PlatformStatus.OpenStack.APIServerInternalIP }}"
- "--dns-vip"
- "{{ .ControllerConfig.Infra.Status.PlatformStatus.OpenStack.NodeDNSIP }}"
- "--ingress-vip"
- "{{ .ControllerConfig.Infra.Status.PlatformStatus.OpenStack.IngressIP }}"
- "/config"
Expand Down
19 changes: 0 additions & 19 deletions pkg/operator/assets/bindata.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1805,8 +1805,6 @@ spec:
- "/etc/kubernetes/kubeconfig"
- "--api-vip"
- "{{ .ControllerConfig.Infra.Status.PlatformStatus.OpenStack.APIServerInternalIP }}"
- "--dns-vip"
- "{{ .ControllerConfig.Infra.Status.PlatformStatus.OpenStack.NodeDNSIP }}"
- "--ingress-vip"
- "{{ .ControllerConfig.Infra.Status.PlatformStatus.OpenStack.IngressIP }}"
- "/config"
Expand Down Expand Up @@ -1902,21 +1900,6 @@ vrrp_instance {{`+"`"+`{{.Cluster.Name}}`+"`"+`}}_API {
{{`+"`"+`{{ .Cluster.APIVIP }}`+"`"+`}}/{{`+"`"+`{{ .Cluster.VIPNetmask }}`+"`"+`}}
}
}

vrrp_instance {{`+"`"+`{{.Cluster.Name}}`+"`"+`}}_DNS {
state MASTER
interface {{`+"`"+`{{.VRRPInterface}}`+"`"+`}}
virtual_router_id {{`+"`"+`{{.Cluster.DNSVirtualRouterID }}`+"`"+`}}
priority 140
advert_int 1
authentication {
auth_type PASS
auth_pass {{`+"`"+`{{.Cluster.Name}}`+"`"+`}}_dns_vip
}
virtual_ipaddress {
{{`+"`"+`{{ .Cluster.DNSVIP }}`+"`"+`}}/{{`+"`"+`{{ .Cluster.VIPNetmask }}`+"`"+`}}
}
}
`)

func manifestsOpenstackKeepalivedConfTmplBytes() ([]byte, error) {
Expand Down Expand Up @@ -1966,8 +1949,6 @@ spec:
- "/etc/kubernetes/kubeconfig"
- "--api-vip"
- "{{ .ControllerConfig.Infra.Status.PlatformStatus.OpenStack.APIServerInternalIP }}"
- "--dns-vip"
- "{{ .ControllerConfig.Infra.Status.PlatformStatus.OpenStack.NodeDNSIP }}"
- "--ingress-vip"
- "{{ .ControllerConfig.Infra.Status.PlatformStatus.OpenStack.IngressIP }}"
- "/config"
Expand Down
4 changes: 1 addition & 3 deletions templates/common/openstack/files/openstack-coredns.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@ contents:
- "/etc/kubernetes/kubeconfig"
- "--api-vip"
- "{{ .Infra.Status.PlatformStatus.OpenStack.APIServerInternalIP }}"
- "--dns-vip"
- "{{ .Infra.Status.PlatformStatus.OpenStack.NodeDNSIP }}"
- "--ingress-vip"
- "{{ .Infra.Status.PlatformStatus.OpenStack.IngressIP }}"
- "/config"
Expand Down Expand Up @@ -88,4 +86,4 @@ contents:
tolerations:
- operator: Exists
priorityClassName: system-node-critical
status: {}
status: {}
4 changes: 1 addition & 3 deletions templates/common/openstack/files/openstack-keepalived.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,6 @@ contents:
- "/etc/kubernetes/kubeconfig"
- "--api-vip"
- "{{ .Infra.Status.PlatformStatus.OpenStack.APIServerInternalIP }}"
- "--dns-vip"
- "{{ .Infra.Status.PlatformStatus.OpenStack.NodeDNSIP }}"
- "--ingress-vip"
- "{{ .Infra.Status.PlatformStatus.OpenStack.IngressIP }}"
- "/config"
Expand Down Expand Up @@ -84,4 +82,4 @@ contents:
tolerations:
- operator: Exists
priorityClassName: system-node-critical
status: {}
status: {}
4 changes: 1 addition & 3 deletions templates/common/openstack/files/openstack-mdns-publisher.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,6 @@ contents:
- "/etc/kubernetes/kubeconfig"
- "--api-vip"
- "{{ .Infra.Status.PlatformStatus.OpenStack.APIServerInternalIP }}"
- "--dns-vip"
- "{{ .Infra.Status.PlatformStatus.OpenStack.NodeDNSIP }}"
- "--ingress-vip"
- "{{ .Infra.Status.PlatformStatus.OpenStack.IngressIP }}"
- "/config"
Expand Down Expand Up @@ -104,4 +102,4 @@ contents:
tolerations:
- operator: Exists
priorityClassName: system-node-critical
status: {}
status: {}
9 changes: 8 additions & 1 deletion templates/master/00-master/openstack/files/NetworkManager-resolv-prepender.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,14 @@ contents:
# Ensure resolv.conf exists before we try to run podman
cp /var/run/NetworkManager/resolv.conf /etc/resolv.conf

NAMESERVER_IP="{{.Infra.Status.PlatformStatus.OpenStack.NodeDNSIP}}"
NAMESERVER_IP=$(/usr/bin/podman run --rm \
--authfile /var/lib/kubelet/config.json \
--net=host \
{{ .Images.baremetalRuntimeCfgImage }} \
node-ip \
show \
"{{.Infra.Status.PlatformStatus.OpenStack.APIServerInternalIP}}" \
"{{.Infra.Status.PlatformStatus.OpenStack.IngressIP}}")
DOMAIN="{{.EtcdDiscoveryDomain}}"
if [[ -n "$NAMESERVER_IP" ]]; then
logger -s "NM resolv-prepender: Prepending 'nameserver $NAMESERVER_IP' to /etc/resolv.conf (other nameservers from /var/run/NetworkManager/resolv.conf)"
Expand Down
25 changes: 3 additions & 22 deletions templates/master/00-master/openstack/files/openstack-keepalived-keepalived.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,15 @@ contents:
interval 1
weight 50
}
vrrp_script chk_dns {
script "/usr/bin/host -t SRV _etcd-server-ssl._tcp.{{ .EtcdDiscoveryDomain }} localhost"
interval 1
weight 50
}

# TODO: Improve this check. The port is assumed to be alive.
# Need to assess what is the ramification if the port is not there.
vrrp_script chk_ingress {
script "/usr/bin/curl -o /dev/null -kLs http://localhost:1936/healthz"
interval 1
weight 50
}

vrrp_instance {{`{{ .Cluster.Name }}`}}_API {
state BACKUP
interface {{`{{ .VRRPInterface }}`}}
Expand All @@ -37,23 +34,7 @@ contents:
chk_ocp
}
}
vrrp_instance {{`{{ .Cluster.Name }}`}}_DNS {
state BACKUP
interface {{`{{ .VRRPInterface }}`}}
virtual_router_id {{`{{ .Cluster.DNSVirtualRouterID }}`}}
priority 40
advert_int 1
authentication {
auth_type PASS
auth_pass {{`{{ .Cluster.Name }}`}}_dns_vip
}
virtual_ipaddress {
{{`{{ .Cluster.DNSVIP }}`}}/{{`{{ .Cluster.VIPNetmask }}`}}
}
track_script {
chk_dns
}
}

vrrp_instance {{`{{ .Cluster.Name }}`}}_INGRESS {
state BACKUP
interface {{`{{ .VRRPInterface }}`}}
Expand Down
1 change: 0 additions & 1 deletion templates/worker/00-worker/openstack/files/NetworkManager-resolv-prepender.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ contents:
node-ip \
show \
"{{.Infra.Status.PlatformStatus.OpenStack.APIServerInternalIP}}" \
"{{.Infra.Status.PlatformStatus.OpenStack.NodeDNSIP}}" \
"{{.Infra.Status.PlatformStatus.OpenStack.IngressIP}}")
DOMAIN="{{.EtcdDiscoveryDomain}}"
if [[ -n "$NAMESERVER_IP" ]]; then
Expand Down