CRD Spec: add option to configure HostNetwork and DNSPolicy

this allows the network plugins like CNI to use etcd-cluster as kv when bootstrapping the cluster fixes #1929
coreos · Jun 14, 2019 · 4797be3 · 4797be3
1 parent 8347d27
commit 4797be3
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 0 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
diff --git a/pkg/apis/etcd/v1beta2/cluster.go b/pkg/apis/etcd/v1beta2/cluster.go
@@ -162,6 +162,12 @@ type PodPolicy struct {
 	// '.cluster.local'.
 	// The default is to not set a cluster domain explicitly.
 	ClusterDomain string `json:"ClusterDomain"`
+
+	// hostNetwork will set HostNetwork: true in podspec
+	HostNetwork bool `json:"hostNetwork,omitempty"`
+
+	// dnsPolicy will set dnsPolicy: <whatever> in podspec
+	DNSPolicy v1.DNSPolicy `json:"dnsPolicy,omitempty"`
 }
 
 // TODO: move this to initializer

diff --git a/pkg/util/k8sutil/k8sutil.go b/pkg/util/k8sutil/k8sutil.go
@@ -402,6 +402,15 @@ func newEtcdPod(m *etcdutil.Member, initialCluster []string, clusterName, state,
 			SecurityContext:              podSecurityContext(cs.Pod),
 		},
 	}
+
+	if cs.Pod.DNSPolicy != "" {
+		pod.Spec.DNSPolicy = cs.Pod.DNSPolicy
+	}
+
+	if cs.Pod.HostNetwork {
+		pod.Spec.HostNetwork = true
+	}
+
 	SetEtcdVersion(pod, cs.Version)
 	return pod
 }