Remove kube-core operator from installer entirely

openshift · Oct 8, 2018 · 1ad081a · 1ad081a
1 parent 7c15908
commit 1ad081a
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 230 deletions.
diff --git a/pkg/asset/ignition/bootstrap/bootstrap.go b/pkg/asset/ignition/bootstrap/bootstrap.go
@@ -74,7 +74,6 @@ func (a *Bootstrap) Dependencies() []asset.Asset {
 		&kubeconfig.Kubelet{},
 		&manifests.Manifests{},
 		&manifests.Tectonic{},
-		&manifests.KubeCoreOperator{},
 	}
 }
 
@@ -166,18 +165,13 @@ func (a *Bootstrap) getTemplateData(installConfig *types.InstallConfig) (*bootst
 
 func (a *Bootstrap) addBootstrapFiles(dependencies asset.Parents) {
 	kubeletKubeconfig := &kubeconfig.Kubelet{}
-	kubeCoreOperator := &manifests.KubeCoreOperator{}
-	dependencies.Get(kubeletKubeconfig, kubeCoreOperator)
+	dependencies.Get(kubeletKubeconfig)
 
 	a.config.Storage.Files = append(
 		a.config.Storage.Files,
 		ignition.FileFromBytes("/etc/kubernetes/kubeconfig", 0600, kubeletKubeconfig.Files()[0].Data),
 		ignition.FileFromBytes("/var/lib/kubelet/kubeconfig", 0600, kubeletKubeconfig.Files()[0].Data),
 	)
-	a.config.Storage.Files = append(
-		a.config.Storage.Files,
-		ignition.FilesFromAsset(rootDir, 0644, kubeCoreOperator)...,
-	)
 }
 
 func (a *Bootstrap) addBootkubeFiles(dependencies asset.Parents, templateData *bootstrapTemplateData) {

diff --git a/pkg/asset/manifests/content/tectonic/kube-core-00-appversion.go b/pkg/asset/manifests/content/tectonic/kube-core-00-appversion.go
diff --git a/pkg/asset/manifests/content/tectonic/kube-core-00-operator.go b/pkg/asset/manifests/content/tectonic/kube-core-00-operator.go
diff --git a/pkg/asset/manifests/kube-core-operator.go b/pkg/asset/manifests/kube-core-operator.go
diff --git a/pkg/asset/manifests/operators.go b/pkg/asset/manifests/operators.go
@@ -43,7 +43,6 @@ func (m *Manifests) Name() string {
 func (m *Manifests) Dependencies() []asset.Asset {
 	return []asset.Asset{
 		&installconfig.InstallConfig{},
-		&KubeCoreOperator{},
 		&networkOperator{},
 		&kubeAddonOperator{},
 		&machineAPIOperator{},
@@ -69,16 +68,14 @@ func (m *Manifests) Dependencies() []asset.Asset {
 
 // Generate generates the respective operator config.yml files
 func (m *Manifests) Generate(dependencies asset.Parents) error {
-	kco := &KubeCoreOperator{}
 	no := &networkOperator{}
 	addon := &kubeAddonOperator{}
 	mao := &machineAPIOperator{}
 	installConfig := &installconfig.InstallConfig{}
-	dependencies.Get(kco, no, addon, mao, installConfig)
+	dependencies.Get(no, addon, mao, installConfig)
 
-	// kco+no+mao go to kube-system config map
+	// no+mao go to kube-system config map
 	m.kubeSysConfig = configMap("kube-system", "cluster-config-v1", genericData{
-		"kco-config":     string(kco.Files()[0].Data),
 		"network-config": string(no.Files()[0].Data),
 		"install-config": string(installConfig.Files()[0].Data),
 		"mao-config":     string(mao.Files()[0].Data),

diff --git a/pkg/asset/manifests/tectonic.go b/pkg/asset/manifests/tectonic.go
@@ -58,8 +58,6 @@ func (t *Tectonic) Generate(dependencies asset.Parents) error {
 		"99_binding-discovery.yaml":                  []byte(content.BindingDiscovery),
 		"99_kube-addon-00-appversion.yaml":           []byte(content.AppVersionKubeAddon),
 		"99_kube-addon-01-operator.yaml":             applyTemplateData(content.KubeAddonOperator, templateData),
-		"99_kube-core-00-appversion.yaml":            []byte(content.AppVersionKubeCore),
-		"99_kube-core-00-operator.yaml":              applyTemplateData(content.KubeCoreOperator, templateData),
 		"99_role-admin.yaml":                         []byte(content.RoleAdmin),
 		"99_role-user.yaml":                          []byte(content.RoleUser),
 		"99_tectonic-ingress-00-appversion.yaml":     []byte(content.AppVersionTectonicIngress),