Merge pull request #1636 from runcom/start-services-ovn-ovs

Start openvswitch and ovsdb-server when network is ovn/ovs
openshift · Jun 16, 2020 · 8b3e260 · 8b3e260
2 parents 274e5cd + be883a8
commit 8b3e260
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 1 deletion.
diff --git a/cmd/machine-config-operator/bootstrap.go b/cmd/machine-config-operator/bootstrap.go
@@ -118,7 +118,8 @@ func runBootstrapCmd(cmd *cobra.Command, args []string) {
 		bootstrapOpts.additionalTrustBundleFile,
 		bootstrapOpts.proxyConfigFile,
 		bootstrapOpts.configFile,
-		bootstrapOpts.infraConfigFile, bootstrapOpts.networkConfigFile,
+		bootstrapOpts.infraConfigFile,
+		bootstrapOpts.networkConfigFile,
 		bootstrapOpts.cloudConfigFile,
 		bootstrapOpts.cloudProviderCAFile,
 		bootstrapOpts.etcdCAFile, bootstrapOpts.etcdMetricCAFile, bootstrapOpts.rootCAFile, bootstrapOpts.kubeCAFile, bootstrapOpts.pullSecretFile,

diff --git a/lib/resourcemerge/machineconfig.go b/lib/resourcemerge/machineconfig.go
@@ -67,6 +67,7 @@ func ensureControllerConfigSpec(modified *bool, existing *mcfgv1.ControllerConfi
 	setStringIfSet(modified, &existing.Platform, required.Platform)
 	setStringIfSet(modified, &existing.EtcdDiscoveryDomain, required.EtcdDiscoveryDomain)
 	setStringIfSet(modified, &existing.OSImageURL, required.OSImageURL)
+	setStringIfSet(modified, &existing.NetworkType, required.NetworkType)
 
 	setBytesIfSet(modified, &existing.AdditionalTrustBundle, required.AdditionalTrustBundle)
 	setBytesIfSet(modified, &existing.EtcdCAData, required.EtcdCAData)

diff --git a/manifests/controllerconfig.crd.yaml b/manifests/controllerconfig.crd.yaml
@@ -346,6 +346,9 @@ spec:
               description: kubeletIPv6 is true to force a single-stack IPv6 kubelet
                 config
               type: boolean
+            networkType:
+              description: networkType holds the type of network the cluster is using
+              type: string
             osImageURL:
               description: osImageURL is the location of the container image that
                 contains the OS update payload. Its value is taken from the data.osImageURL

diff --git a/pkg/apis/machineconfiguration.openshift.io/v1/types.go b/pkg/apis/machineconfiguration.openshift.io/v1/types.go
@@ -92,6 +92,13 @@ type ControllerConfigSpec struct {
 
 	// kubeletIPv6 is true to force a single-stack IPv6 kubelet config
 	KubeletIPv6 bool `json:"kubeletIPv6,omitempty"`
+
+	// networkType holds the type of network the cluster is using
+	// XXX: this is temporary and will be dropped as soon as possible in favor of a better support
+	// to start network related services the proper way.
+	// Nobody is also changing this once the cluster is up and running the first time, so, disallow
+	// regeneration if this changes.
+	NetworkType string `json:"networkType,omitempty"`
 }
 
 // ControllerConfigStatus is the status for ControllerConfig

diff --git a/pkg/operator/assets/bindata.go b/pkg/operator/assets/bindata.go
@@ -800,6 +800,9 @@ spec:
               description: kubeletIPv6 is true to force a single-stack IPv6 kubelet
                 config
               type: boolean
+            networkType:
+              description: networkType holds the type of network the cluster is using
+              type: string
             osImageURL:
               description: osImageURL is the location of the container image that
                 contains the OS update payload. Its value is taken from the data.osImageURL

diff --git a/pkg/operator/render.go b/pkg/operator/render.go
@@ -92,6 +92,7 @@ func createDiscoveredControllerConfigSpec(infra *configv1.Infrastructure, networ
 	}
 
 	ccSpec := &mcfgv1.ControllerConfigSpec{
+		NetworkType:         network.Spec.NetworkType,
 		ClusterDNSIP:        dnsIP,
 		KubeletIPv6:         ipv6,
 		CloudProviderConfig: "",

diff --git a/templates/common/_base/units/openvswitch.service b/templates/common/_base/units/openvswitch.service
@@ -0,0 +1,2 @@
+name: "openvswitch.service"
+enabled: {{if eq .NetworkType "OVNKubernetes"}}true{{else if eq .NetworkType "OpenShiftSDN"}}true{{else}}false{{end}}
diff --git a/templates/common/_base/units/ovsdb-server.service b/templates/common/_base/units/ovsdb-server.service
@@ -0,0 +1,2 @@
+name: "ovsdb-server.service"
+enabled: {{if eq .NetworkType "OVNKubernetes"}}true{{else if eq .NetworkType "OpenShiftSDN"}}true{{else}}false{{end}}