Dedupe on-prem bootstrap manifests

manifests/baremetal/coredns-corefile.tmpl → manifests/on-prem/coredns-corefile.tmpl

@@ -7,7 +7,7 @@
     reload
     template IN {{`{{ .Cluster.IngressVIPRecordType }}`}} {{ .ControllerConfig.DNS.Spec.BaseDomain }} {
         match .*.apps.{{ .ControllerConfig.DNS.Spec.BaseDomain }}
-        answer "{{`{{"{{ .Name }}"}}`}} 60 in {{`{{"{{ .Type }}"}}`}} {{ .ControllerConfig.Infra.Status.PlatformStatus.BareMetal.IngressIP }}"
+        answer "{{`{{"{{ .Name }}"}}`}} 60 in {{`{{"{{ .Type }}"}}`}} {{ onPremPlatformIngressIP .ControllerConfig }}"
         fallthrough
     }
     template IN {{`{{ .Cluster.IngressVIPEmptyType }}`}} {{ .ControllerConfig.DNS.Spec.BaseDomain }} {
@@ -16,7 +16,7 @@
     }
     template IN {{`{{ .Cluster.APIVIPRecordType }}`}} {{ .ControllerConfig.DNS.Spec.BaseDomain }} {
         match api.{{ .ControllerConfig.DNS.Spec.BaseDomain }}
-        answer "{{`{{"{{ .Name }}"}}`}} 60 in {{`{{"{{ .Type }}"}}`}} {{ .ControllerConfig.Infra.Status.PlatformStatus.BareMetal.APIServerInternalIP }}"
+        answer "{{`{{"{{ .Name }}"}}`}} 60 in {{`{{"{{ .Type }}"}}`}} {{ onPremPlatformAPIServerInternalIP .ControllerConfig }}"
         fallthrough
     }
     template IN {{`{{ .Cluster.APIVIPEmptyType }}`}} {{ .ControllerConfig.DNS.Spec.BaseDomain }} {
@@ -25,7 +25,7 @@
     }
     template IN {{`{{ .Cluster.APIVIPRecordType }}`}} {{ .ControllerConfig.DNS.Spec.BaseDomain }} {
         match api-int.{{ .ControllerConfig.DNS.Spec.BaseDomain }}
-        answer "{{`{{"{{ .Name }}"}}`}} 60 in {{`{{"{{ .Type }}"}}`}} {{ .ControllerConfig.Infra.Status.PlatformStatus.BareMetal.APIServerInternalIP }}"
+        answer "{{`{{"{{ .Name }}"}}`}} 60 in {{`{{"{{ .Type }}"}}`}} {{ onPremPlatformAPIServerInternalIP .ControllerConfig }}"
         fallthrough
     }
     template IN {{`{{ .Cluster.APIVIPEmptyType }}`}} {{ .ControllerConfig.DNS.Spec.BaseDomain }} {

manifests/openstack/coredns.yaml → manifests/on-prem/coredns.yaml

@@ -3,11 +3,11 @@ kind: Pod
 apiVersion: v1
 metadata:
   name: coredns
-  namespace: openshift-openstack-infra
+  namespace: openshift-{{ onPremPlatformShortName .ControllerConfig }}-infra
   creationTimestamp:
   deletionGracePeriodSeconds: 65
   labels:
-    app: openstack-infra-mdns
+    app: {{ onPremPlatformShortName .ControllerConfig }}-infra-mdns
 spec:
   volumes:
   - name: resource-dir
@@ -29,9 +29,9 @@ spec:
     - render
     - "/etc/kubernetes/kubeconfig"
     - "--api-vip"
-    - "{{ .ControllerConfig.Infra.Status.PlatformStatus.OpenStack.APIServerInternalIP }}"
+    - "{{ onPremPlatformAPIServerInternalIP .ControllerConfig }}"
     - "--ingress-vip"
-    - "{{ .ControllerConfig.Infra.Status.PlatformStatus.OpenStack.IngressIP }}"
+    - "{{ onPremPlatformIngressIP .ControllerConfig }}"
     - "/config"
     - "--out-dir"
     - "/etc/coredns"

manifests/baremetal/keepalived.yaml → manifests/on-prem/keepalived.yaml

@@ -3,11 +3,11 @@ kind: Pod
 apiVersion: v1
 metadata:
   name: keepalived
-  namespace: openshift-kni-infra
+  namespace: openshift-{{ onPremPlatformShortName .ControllerConfig }}-infra
   creationTimestamp:
   deletionGracePeriodSeconds: 65
   labels:
-    app: kni-infra-vrrp
+    app: {{ onPremPlatformShortName .ControllerConfig }}-infra-vrrp
 spec:
   volumes:
   - name: resource-dir
@@ -114,9 +114,9 @@ spec:
     - "/config/keepalived.conf.tmpl"
     - "/etc/keepalived/keepalived.conf"
     - "--api-vip"
-    - "{{ .ControllerConfig.Infra.Status.PlatformStatus.BareMetal.APIServerInternalIP }}"
+    - "{{ onPremPlatformAPIServerInternalIP .ControllerConfig }}"
     - "--ingress-vip"
-    - "{{ .ControllerConfig.Infra.Status.PlatformStatus.BareMetal.IngressIP }}"
+    - "{{ onPremPlatformIngressIP .ControllerConfig }}"
     - "--cluster-config"
     - "/opt/openshift/manifests/cluster-config.yaml"
     - "--check-interval"