Skip to content

Deprecate EtcdDiscoveryDomain field on ControllerConfig CRD #1675

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 4, 2020
Merged

Deprecate EtcdDiscoveryDomain field on ControllerConfig CRD #1675

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
10 changes: 5 additions & 5 deletions manifests/baremetal/coredns-corefile.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
. {
errors
health :18080
mdns {{ .ControllerConfig.EtcdDiscoveryDomain }} {{`{{.Cluster.MasterAmount}}`}} {{`{{.Cluster.Name}}`}}
mdns {{ .ControllerConfig.Infra.Status.EtcdDiscoveryDomain }} {{`{{.Cluster.MasterAmount}}`}} {{`{{.Cluster.Name}}`}}
forward . {{`{{- range $upstream := .DNSUpstreams}} {{$upstream}}{{- end}}`}}
cache 30
reload
hosts {
{{ .ControllerConfig.Infra.Status.PlatformStatus.BareMetal.APIServerInternalIP }} api-int.{{ .ControllerConfig.EtcdDiscoveryDomain }}
{{ .ControllerConfig.Infra.Status.PlatformStatus.BareMetal.APIServerInternalIP }} api.{{ .ControllerConfig.EtcdDiscoveryDomain }}
{{ .ControllerConfig.Infra.Status.PlatformStatus.BareMetal.APIServerInternalIP }} api-int.{{ .ControllerConfig.Infra.Status.EtcdDiscoveryDomain }}
{{ .ControllerConfig.Infra.Status.PlatformStatus.BareMetal.APIServerInternalIP }} api.{{ .ControllerConfig.Infra.Status.EtcdDiscoveryDomain }}
fallthrough
}
template IN A {{ .ControllerConfig.EtcdDiscoveryDomain }} {
match .*.apps.{{ .ControllerConfig.EtcdDiscoveryDomain }}
template IN A {{ .ControllerConfig.Infra.Status.EtcdDiscoveryDomain }} {
match .*.apps.{{ .ControllerConfig.Infra.Status.EtcdDiscoveryDomain }}
answer "{{`{{"{{ .Name }}"}}`}} 60 in a {{ .ControllerConfig.Infra.Status.PlatformStatus.BareMetal.IngressIP }}"
fallthrough
}
Expand Down
2 changes: 1 addition & 1 deletion manifests/controllerconfig.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ spec:
type: string
format: byte
etcdDiscoveryDomain:
description: etcdDiscoveryDomain specifies the etcd discovery domain
description: etcdDiscoveryDomain is deprecated, use infra.status.etcdDiscoveryDomain instead
type: string
etcdMetricCAData:
description: etcdMetricData specifies the etcd metric CA data
Expand Down
6 changes: 3 additions & 3 deletions manifests/openstack/coredns-corefile.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
. {
errors
health :18080
mdns {{ .ControllerConfig.EtcdDiscoveryDomain }} {{`{{.Cluster.MasterAmount}}`}} {{`{{.Cluster.Name}}`}}
mdns {{ .ControllerConfig.Infra.Status.EtcdDiscoveryDomain }} {{`{{.Cluster.MasterAmount}}`}} {{`{{.Cluster.Name}}`}}
forward . {{`{{- range $upstream := .DNSUpstreams}} {{$upstream}}{{- end}}`}} {
policy sequential
}
cache 30
reload
hosts /etc/coredns/api-int.hosts {{ .ControllerConfig.EtcdDiscoveryDomain }} {
{{ .ControllerConfig.Infra.Status.PlatformStatus.OpenStack.APIServerInternalIP }} api-int.{{ .ControllerConfig.EtcdDiscoveryDomain }} api.{{ .ControllerConfig.EtcdDiscoveryDomain }}
hosts /etc/coredns/api-int.hosts {{ .ControllerConfig.Infra.Status.EtcdDiscoveryDomain }} {
{{ .ControllerConfig.Infra.Status.PlatformStatus.OpenStack.APIServerInternalIP }} api-int.{{ .ControllerConfig.Infra.Status.EtcdDiscoveryDomain }} api.{{ .ControllerConfig.Infra.Status.EtcdDiscoveryDomain }}
fallthrough
}
}
6 changes: 3 additions & 3 deletions manifests/ovirt/coredns-corefile.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
. {
errors
health :18080
mdns {{ .ControllerConfig.EtcdDiscoveryDomain }} {{`{{.Cluster.MasterAmount}}`}} {{`{{.Cluster.Name}}`}}
mdns {{ .ControllerConfig.Infra.Status.EtcdDiscoveryDomain }} {{`{{.Cluster.MasterAmount}}`}} {{`{{.Cluster.Name}}`}}
forward . {{`{{- range $upstream := .DNSUpstreams}} {{$upstream}}{{- end}}`}}
cache 30
reload
hosts /etc/coredns/api-int.hosts {{ .ControllerConfig.EtcdDiscoveryDomain }} {
{{ .ControllerConfig.Infra.Status.PlatformStatus.Ovirt.APIServerInternalIP }} api-int.{{ .ControllerConfig.EtcdDiscoveryDomain }} api.{{ .ControllerConfig.EtcdDiscoveryDomain }}
hosts /etc/coredns/api-int.hosts {{ .ControllerConfig.Infra.Status.EtcdDiscoveryDomain }} {
{{ .ControllerConfig.Infra.Status.PlatformStatus.Ovirt.APIServerInternalIP }} api-int.{{ .ControllerConfig.Infra.Status.EtcdDiscoveryDomain }} api.{{ .ControllerConfig.Infra.Status.EtcdDiscoveryDomain }}
fallthrough
}
}
10 changes: 5 additions & 5 deletions manifests/vsphere/coredns-corefile.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
. {
errors
health :18080
mdns {{ .ControllerConfig.EtcdDiscoveryDomain }} {{`{{.Cluster.MasterAmount}}`}} {{`{{.Cluster.Name}}`}}
mdns {{ .ControllerConfig.Infra.Status.EtcdDiscoveryDomain }} {{`{{.Cluster.MasterAmount}}`}} {{`{{.Cluster.Name}}`}}
forward . {{`{{- range $upstream := .DNSUpstreams}} {{$upstream}}{{- end}}`}}
cache 30
reload
hosts {
{{ .ControllerConfig.Infra.Status.PlatformStatus.VSphere.APIServerInternalIP }} api-int.{{ .ControllerConfig.EtcdDiscoveryDomain }}
{{ .ControllerConfig.Infra.Status.PlatformStatus.VSphere.APIServerInternalIP }} api.{{ .ControllerConfig.EtcdDiscoveryDomain }}
{{ .ControllerConfig.Infra.Status.PlatformStatus.VSphere.APIServerInternalIP }} api-int.{{ .ControllerConfig.Infra.Status.EtcdDiscoveryDomain }}
{{ .ControllerConfig.Infra.Status.PlatformStatus.VSphere.APIServerInternalIP }} api.{{ .ControllerConfig.Infra.Status.EtcdDiscoveryDomain }}
fallthrough
}
template IN A {{ .ControllerConfig.EtcdDiscoveryDomain }} {
match .*.apps.{{ .ControllerConfig.EtcdDiscoveryDomain }}
template IN A {{ .ControllerConfig.Infra.Status.EtcdDiscoveryDomain }} {
match .*.apps.{{ .ControllerConfig.Infra.Status.EtcdDiscoveryDomain }}
answer "{{`{{"{{ .Name }}"}}`}} 60 in a {{ .ControllerConfig.Infra.Status.PlatformStatus.VSphere.IngressIP }}"
fallthrough
}
Expand Down
4 changes: 2 additions & 2 deletions pkg/apis/machineconfiguration.openshift.io/v1/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ type ControllerConfigSpec struct {
// The openshift platform, e.g. "libvirt", "openstack", "gcp", "baremetal", "aws", or "none"
Platform string `json:"platform"`

// etcdDiscoveryDomain specifies the etcd discovery domain
EtcdDiscoveryDomain string `json:"etcdDiscoveryDomain"`
// etcdDiscoveryDomain is deprecated, use Infra.Status.EtcdDiscoveryDomain instead
EtcdDiscoveryDomain string `json:"etcdDiscoveryDomain,omitempty"`

// TODO: Use string for CA data

Expand Down
1 change: 0 additions & 1 deletion pkg/controller/bootstrap/testdata/bootstrap/machineconfigcontroller-controllerconfig.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ spec:
cloudProviderConfig: ""
clusterDNSIP: 172.30.0.10
etcdCAData: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCkVUQ0QgQ0EgREFUQQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
etcdDiscoveryDomain: domain.example.com
etcdMetricCAData: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCkVUQ0QgTUVUUklDIENBIERBVEEKLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=
images:
baremetalRuntimeCfgImage: ""
Expand Down
8 changes: 6 additions & 2 deletions pkg/controller/container-runtime-config/container_runtime_config_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,12 @@ func newControllerConfig(name, platform string) *mcfgv1.ControllerConfig {
TypeMeta: metav1.TypeMeta{APIVersion: mcfgv1.SchemeGroupVersion.String()},
ObjectMeta: metav1.ObjectMeta{Name: name, UID: types.UID(utilrand.String(5))},
Spec: mcfgv1.ControllerConfigSpec{
EtcdDiscoveryDomain: fmt.Sprintf("%s.tt.testing", name),
Platform: platform,
Infra: &apicfgv1.Infrastructure{
Status: apicfgv1.InfrastructureStatus{
EtcdDiscoveryDomain: fmt.Sprintf("%s.tt.testing", name),
},
},
Platform: platform,
},
}
return cc
Expand Down
8 changes: 6 additions & 2 deletions pkg/controller/kubelet-config/kubelet_config_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,12 @@ func newControllerConfig(name, platform string) *mcfgv1.ControllerConfig {
TypeMeta: metav1.TypeMeta{APIVersion: mcfgv1.SchemeGroupVersion.String()},
ObjectMeta: metav1.ObjectMeta{Name: name, UID: types.UID(utilrand.String(5))},
Spec: mcfgv1.ControllerConfigSpec{
EtcdDiscoveryDomain: fmt.Sprintf("%s.tt.testing", name),
Platform: platform,
Infra: &osev1.Infrastructure{
Status: osev1.InfrastructureStatus{
EtcdDiscoveryDomain: fmt.Sprintf("%s.tt.testing", name),
},
},
Platform: platform,
},
}
return cc
Expand Down
9 changes: 7 additions & 2 deletions pkg/controller/render/render_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
"github.com/clarketm/json"
ign "github.com/coreos/ignition/config/v2_2"
igntypes "github.com/coreos/ignition/config/v2_2/types"
configv1 "github.com/openshift/api/config/v1"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
corev1 "k8s.io/api/core/v1"
Expand Down Expand Up @@ -220,8 +221,12 @@ func newControllerConfig(name string) *mcfgv1.ControllerConfig {
TypeMeta: metav1.TypeMeta{APIVersion: mcfgv1.SchemeGroupVersion.String()},
ObjectMeta: metav1.ObjectMeta{Name: name, UID: types.UID(utilrand.String(5))},
Spec: mcfgv1.ControllerConfigSpec{
EtcdDiscoveryDomain: fmt.Sprintf("%s.tt.testing", name),
OSImageURL: "dummy",
Infra: &configv1.Infrastructure{
Status: configv1.InfrastructureStatus{
EtcdDiscoveryDomain: fmt.Sprintf("%s.tt.testing", name),
},
},
OSImageURL: "dummy",
},
Status: mcfgv1.ControllerConfigStatus{
Conditions: []mcfgv1.ControllerConfigStatusCondition{
Expand Down
4 changes: 2 additions & 2 deletions pkg/controller/template/render.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,13 +349,13 @@ func etcdServerCertDNSNames(cfg RenderConfig) (interface{}, error) {
}

func etcdPeerCertDNSNames(cfg RenderConfig) (interface{}, error) {
if cfg.EtcdDiscoveryDomain == "" {
if cfg.Infra.Status.EtcdDiscoveryDomain == "" {
return nil, fmt.Errorf("invalid configuration")
}

var dnsNames = []string{
"${ETCD_DNS_NAME}",
cfg.EtcdDiscoveryDomain, // https://github.com/etcd-io/etcd/blob/583763261f1c843e07c1bf7fea5fb4cfb684fe87/Documentation/op-guide/clustering.md#dns-discovery
cfg.Infra.Status.EtcdDiscoveryDomain, // https://github.com/etcd-io/etcd/blob/583763261f1c843e07c1bf7fea5fb4cfb684fe87/Documentation/op-guide/clustering.md#dns-discovery
}
return strings.Join(dnsNames, ","), nil
}
Expand Down
7 changes: 6 additions & 1 deletion pkg/controller/template/render_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (

ign "github.com/coreos/ignition/config/v2_2"
igntypes "github.com/coreos/ignition/config/v2_2/types"
configv1 "github.com/openshift/api/config/v1"
mcfgv1 "github.com/openshift/machine-config-operator/pkg/apis/machineconfiguration.openshift.io/v1"
"k8s.io/client-go/kubernetes/scheme"
)
Expand Down Expand Up @@ -152,7 +153,11 @@ func TestEtcdPeerCertDNSNames(t *testing.T) {
t.Run(name, func(t *testing.T) {
config := &mcfgv1.ControllerConfig{
Spec: mcfgv1.ControllerConfigSpec{
EtcdDiscoveryDomain: c.etcdDiscoveryDomain,
Infra: &configv1.Infrastructure{
Status: configv1.InfrastructureStatus{
EtcdDiscoveryDomain: c.etcdDiscoveryDomain,
},
},
},
}
got, err := renderTemplate(RenderConfig{&config.Spec, `{"dummy":"dummy"}`}, name, dummyTemplate)
Expand Down
11 changes: 8 additions & 3 deletions pkg/controller/template/template_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"time"

"github.com/clarketm/json"
configv1 "github.com/openshift/api/config/v1"
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/equality"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down Expand Up @@ -59,9 +60,13 @@ func newControllerConfig(name string) *mcfgv1.ControllerConfig {
TypeMeta: metav1.TypeMeta{APIVersion: mcfgv1.SchemeGroupVersion.String()},
ObjectMeta: metav1.ObjectMeta{Name: name, Generation: 1},
Spec: mcfgv1.ControllerConfigSpec{
ClusterDNSIP: "10.3.0.1/16",
EtcdDiscoveryDomain: fmt.Sprintf("%s.openshift.testing", name),
Platform: "libvirt",
ClusterDNSIP: "10.3.0.1/16",
Infra: &configv1.Infrastructure{
Status: configv1.InfrastructureStatus{
EtcdDiscoveryDomain: fmt.Sprintf("%s.openshift.testing", name),
},
},
Platform: "libvirt",
PullSecret: &corev1.ObjectReference{
Namespace: "default",
Name: "coreos-pull-secret",
Expand Down
1 change: 0 additions & 1 deletion pkg/controller/template/test_data/controller_config_aws.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ kind: "ControllerConfig"
spec:
clusterDNSIP: "10.3.0.10"
cloudProviderConfig: ""
etcdDiscoveryDomain: "my-test-cluster.installer.team.coreos.systems"
etcdInitialCount: 3
platform: "aws"
etcdCAData: ZHVtbXkgZXRjZC1jYQo=
Expand Down
1 change: 0 additions & 1 deletion pkg/controller/template/test_data/controller_config_baremetal.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ kind: "ControllerConfig"
spec:
clusterDNSIP: "10.3.0.10"
cloudProviderConfig: ""
etcdDiscoveryDomain: "my-test-cluster.installer.team.coreos.systems"
etcdInitialCount: 3
platform: "baremetal"
etcdCAData: ZHVtbXkgZXRjZC1jYQo=
Expand Down
1 change: 0 additions & 1 deletion pkg/controller/template/test_data/controller_config_gcp.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ kind: "ControllerConfig"
spec:
clusterDNSIP: "10.3.0.10"
cloudProviderConfig: ""
etcdDiscoveryDomain: "my-test-cluster.installer.team.coreos.systems"
etcdInitialCount: 3
platform: "gcp"
etcdCAData: ZHVtbXkgZXRjZC1jYQo=
Expand Down
1 change: 0 additions & 1 deletion pkg/controller/template/test_data/controller_config_libvirt.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ kind: "ControllerConfig"
spec:
clusterDNSIP: "10.3.0.10"
cloudProviderConfig: ""
etcdDiscoveryDomain: "my-test-cluster.installer.team.coreos.systems"
etcdInitialCount: 3
platform: "libvirt"
etcdCAData: ZHVtbXkgZXRjZC1jYQo=
Expand Down
1 change: 0 additions & 1 deletion pkg/controller/template/test_data/controller_config_none.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ kind: "ControllerConfig"
spec:
clusterDNSIP: "10.3.0.10"
cloudProviderConfig: ""
etcdDiscoveryDomain: "my-test-cluster.installer.team.coreos.systems"
etcdInitialCount: 3
platform: "none"
etcdCAData: ZHVtbXkgZXRjZC1jYQo=
Expand Down
1 change: 0 additions & 1 deletion pkg/controller/template/test_data/controller_config_openstack.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ spec:
multi-line cloud config
[test]
option = dummy
etcdDiscoveryDomain: "my-test-cluster.installer.team.coreos.systems"
etcdInitialCount: 3
platform: "openstack"
etcdCAData: ZHVtbXkgZXRjZC1jYQo=
Expand Down
1 change: 0 additions & 1 deletion pkg/controller/template/test_data/controller_config_ovirt.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ spec:
multi-line cloud config
[test]
option = dummy
etcdDiscoveryDomain: "my-test-cluster.example.org"
etcdInitialCount: 3
platform: "ovirt"
etcdCAData: OHVtbXkgZXRjZC1jYQo=
Expand Down
1 change: 0 additions & 1 deletion pkg/controller/template/test_data/controller_config_vsphere.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ spec:
multi-line cloud config
[test]
option = dummy
etcdDiscoveryDomain: "my-test-cluster.installer.team.coreos.systems"
etcdInitialCount: 3
platform: "vsphere"
etcdCAData: ZHVtbXkgZXRjZC1jYQo=
Expand Down
34 changes: 17 additions & 17 deletions pkg/operator/assets/bindata.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,17 +97,17 @@ func (fi bindataFileInfo) Sys() interface{} {
var _manifestsBaremetalCorednsCorefileTmpl = []byte(`. {
errors
health :18080
mdns {{ .ControllerConfig.EtcdDiscoveryDomain }} {{`+"`"+`{{.Cluster.MasterAmount}}`+"`"+`}} {{`+"`"+`{{.Cluster.Name}}`+"`"+`}}
mdns {{ .ControllerConfig.Infra.Status.EtcdDiscoveryDomain }} {{`+"`"+`{{.Cluster.MasterAmount}}`+"`"+`}} {{`+"`"+`{{.Cluster.Name}}`+"`"+`}}
forward . {{`+"`"+`{{- range $upstream := .DNSUpstreams}} {{$upstream}}{{- end}}`+"`"+`}}
cache 30
reload
hosts {
{{ .ControllerConfig.Infra.Status.PlatformStatus.BareMetal.APIServerInternalIP }} api-int.{{ .ControllerConfig.EtcdDiscoveryDomain }}
{{ .ControllerConfig.Infra.Status.PlatformStatus.BareMetal.APIServerInternalIP }} api.{{ .ControllerConfig.EtcdDiscoveryDomain }}
{{ .ControllerConfig.Infra.Status.PlatformStatus.BareMetal.APIServerInternalIP }} api-int.{{ .ControllerConfig.Infra.Status.EtcdDiscoveryDomain }}
{{ .ControllerConfig.Infra.Status.PlatformStatus.BareMetal.APIServerInternalIP }} api.{{ .ControllerConfig.Infra.Status.EtcdDiscoveryDomain }}
fallthrough
}
template IN A {{ .ControllerConfig.EtcdDiscoveryDomain }} {
match .*.apps.{{ .ControllerConfig.EtcdDiscoveryDomain }}
template IN A {{ .ControllerConfig.Infra.Status.EtcdDiscoveryDomain }} {
match .*.apps.{{ .ControllerConfig.Infra.Status.EtcdDiscoveryDomain }}
answer "{{`+"`"+`{{"{{ .Name }}"}}`+"`"+`}} 60 in a {{ .ControllerConfig.Infra.Status.PlatformStatus.BareMetal.IngressIP }}"
fallthrough
}
Expand Down Expand Up @@ -527,7 +527,7 @@ spec:
type: string
format: byte
etcdDiscoveryDomain:
description: etcdDiscoveryDomain specifies the etcd discovery domain
description: etcdDiscoveryDomain is deprecated, use infra.status.etcdDiscoveryDomain instead
type: string
etcdMetricCAData:
description: etcdMetricData specifies the etcd metric CA data
Expand Down Expand Up @@ -1745,14 +1745,14 @@ func manifestsMasterMachineconfigpoolYaml() (*asset, error) {
var _manifestsOpenstackCorednsCorefileTmpl = []byte(`. {
errors
health :18080
mdns {{ .ControllerConfig.EtcdDiscoveryDomain }} {{`+"`"+`{{.Cluster.MasterAmount}}`+"`"+`}} {{`+"`"+`{{.Cluster.Name}}`+"`"+`}}
mdns {{ .ControllerConfig.Infra.Status.EtcdDiscoveryDomain }} {{`+"`"+`{{.Cluster.MasterAmount}}`+"`"+`}} {{`+"`"+`{{.Cluster.Name}}`+"`"+`}}
forward . {{`+"`"+`{{- range $upstream := .DNSUpstreams}} {{$upstream}}{{- end}}`+"`"+`}} {
policy sequential
}
cache 30
reload
hosts /etc/coredns/api-int.hosts {{ .ControllerConfig.EtcdDiscoveryDomain }} {
{{ .ControllerConfig.Infra.Status.PlatformStatus.OpenStack.APIServerInternalIP }} api-int.{{ .ControllerConfig.EtcdDiscoveryDomain }} api.{{ .ControllerConfig.EtcdDiscoveryDomain }}
hosts /etc/coredns/api-int.hosts {{ .ControllerConfig.Infra.Status.EtcdDiscoveryDomain }} {
{{ .ControllerConfig.Infra.Status.PlatformStatus.OpenStack.APIServerInternalIP }} api-int.{{ .ControllerConfig.Infra.Status.EtcdDiscoveryDomain }} api.{{ .ControllerConfig.Infra.Status.EtcdDiscoveryDomain }}
fallthrough
}
}
Expand Down Expand Up @@ -2018,12 +2018,12 @@ func manifestsOpenstackKeepalivedYaml() (*asset, error) {
var _manifestsOvirtCorednsCorefileTmpl = []byte(`. {
errors
health :18080
mdns {{ .ControllerConfig.EtcdDiscoveryDomain }} {{`+"`"+`{{.Cluster.MasterAmount}}`+"`"+`}} {{`+"`"+`{{.Cluster.Name}}`+"`"+`}}
mdns {{ .ControllerConfig.Infra.Status.EtcdDiscoveryDomain }} {{`+"`"+`{{.Cluster.MasterAmount}}`+"`"+`}} {{`+"`"+`{{.Cluster.Name}}`+"`"+`}}
forward . {{`+"`"+`{{- range $upstream := .DNSUpstreams}} {{$upstream}}{{- end}}`+"`"+`}}
cache 30
reload
hosts /etc/coredns/api-int.hosts {{ .ControllerConfig.EtcdDiscoveryDomain }} {
{{ .ControllerConfig.Infra.Status.PlatformStatus.Ovirt.APIServerInternalIP }} api-int.{{ .ControllerConfig.EtcdDiscoveryDomain }} api.{{ .ControllerConfig.EtcdDiscoveryDomain }}
hosts /etc/coredns/api-int.hosts {{ .ControllerConfig.Infra.Status.EtcdDiscoveryDomain }} {
{{ .ControllerConfig.Infra.Status.PlatformStatus.Ovirt.APIServerInternalIP }} api-int.{{ .ControllerConfig.Infra.Status.EtcdDiscoveryDomain }} api.{{ .ControllerConfig.Infra.Status.EtcdDiscoveryDomain }}
fallthrough
}
}
Expand Down Expand Up @@ -2289,17 +2289,17 @@ func manifestsOvirtKeepalivedYaml() (*asset, error) {
var _manifestsVsphereCorednsCorefileTmpl = []byte(`. {
errors
health :18080
mdns {{ .ControllerConfig.EtcdDiscoveryDomain }} {{`+"`"+`{{.Cluster.MasterAmount}}`+"`"+`}} {{`+"`"+`{{.Cluster.Name}}`+"`"+`}}
mdns {{ .ControllerConfig.Infra.Status.EtcdDiscoveryDomain }} {{`+"`"+`{{.Cluster.MasterAmount}}`+"`"+`}} {{`+"`"+`{{.Cluster.Name}}`+"`"+`}}
forward . {{`+"`"+`{{- range $upstream := .DNSUpstreams}} {{$upstream}}{{- end}}`+"`"+`}}
cache 30
reload
hosts {
{{ .ControllerConfig.Infra.Status.PlatformStatus.VSphere.APIServerInternalIP }} api-int.{{ .ControllerConfig.EtcdDiscoveryDomain }}
{{ .ControllerConfig.Infra.Status.PlatformStatus.VSphere.APIServerInternalIP }} api.{{ .ControllerConfig.EtcdDiscoveryDomain }}
{{ .ControllerConfig.Infra.Status.PlatformStatus.VSphere.APIServerInternalIP }} api-int.{{ .ControllerConfig.Infra.Status.EtcdDiscoveryDomain }}
{{ .ControllerConfig.Infra.Status.PlatformStatus.VSphere.APIServerInternalIP }} api.{{ .ControllerConfig.Infra.Status.EtcdDiscoveryDomain }}
fallthrough
}
template IN A {{ .ControllerConfig.EtcdDiscoveryDomain }} {
match .*.apps.{{ .ControllerConfig.EtcdDiscoveryDomain }}
template IN A {{ .ControllerConfig.Infra.Status.EtcdDiscoveryDomain }} {
match .*.apps.{{ .ControllerConfig.Infra.Status.EtcdDiscoveryDomain }}
answer "{{`+"`"+`{{"{{ .Name }}"}}`+"`"+`}} 60 in a {{ .ControllerConfig.Infra.Status.PlatformStatus.VSphere.IngressIP }}"
fallthrough
}
Expand Down
2 changes: 2 additions & 0 deletions pkg/operator/render.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,8 @@ func createDiscoveredControllerConfigSpec(infra *configv1.Infrastructure, networ
ClusterDNSIP: dnsIP,
KubeletIPv6: ipv6,
CloudProviderConfig: "",
// EtcdDiscoveryDomain is unused and deprecated in favour of using Infra.Status.EtcdDiscoveryDomain directly
// Still populating it here for now until it will be removed eventually
EtcdDiscoveryDomain: infra.Status.EtcdDiscoveryDomain,
Platform: platform,
Infra: infra,
Expand Down
2 changes: 1 addition & 1 deletion pkg/operator/render_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ func TestCreateDiscoveredControllerConfigSpec(t *testing.T) {
} else if controllerConfigSpec.Platform == "" {
t.Fatalf("Error setting controller config platform")
}
etcdDomain := controllerConfigSpec.EtcdDiscoveryDomain
etcdDomain := controllerConfigSpec.Infra.Status.EtcdDiscoveryDomain
testDomain := test.Infra.Status.EtcdDiscoveryDomain
if etcdDomain != testDomain {
t.Fatalf("%s failed: got = %s want = %s", desc, etcdDomain, testDomain)
Expand Down
Loading