Merge pull request openshift#3830 from dgoodwin/revert-3763-mco-565b

Revert "MCO-565: MCO-568: MCO-659: MCO-660 On-cluster build opt-in function, building machine-os-builder stub, RBAC and service acct inclusions"
cdoern · Jul 31, 2023 · 6b2fa8d · 6b2fa8d
2 parents 8e61b30 + 4d5f77b
commit 6b2fa8d
Show file tree

Hide file tree

Showing 17 changed files with 1 addition and 511 deletions.
diff --git a/Makefile b/Makefile
@@ -1,5 +1,5 @@
 MCO_COMPONENTS = daemon controller server operator
-EXTRA_COMPONENTS = apiserver-watcher machine-os-builder
+EXTRA_COMPONENTS = apiserver-watcher
 ALL_COMPONENTS = $(patsubst %,machine-config-%,$(MCO_COMPONENTS)) $(EXTRA_COMPONENTS)
 PREFIX ?= /usr
 GO111MODULE?=on

diff --git a/cmd/machine-os-builder/main.go b/cmd/machine-os-builder/main.go
diff --git a/cmd/machine-os-builder/start.go b/cmd/machine-os-builder/start.go
diff --git a/cmd/machine-os-builder/version.go b/cmd/machine-os-builder/version.go
diff --git a/manifests/machineosbuilder/clusterrole.yaml b/manifests/machineosbuilder/clusterrole.yaml
diff --git a/manifests/machineosbuilder/clusterrolebinding-anyuid.yaml b/manifests/machineosbuilder/clusterrolebinding-anyuid.yaml
diff --git a/manifests/machineosbuilder/clusterrolebinding-service-account.yaml b/manifests/machineosbuilder/clusterrolebinding-service-account.yaml
diff --git a/manifests/machineosbuilder/deployment.yaml b/manifests/machineosbuilder/deployment.yaml
diff --git a/manifests/machineosbuilder/events-clusterrole.yaml b/manifests/machineosbuilder/events-clusterrole.yaml
diff --git a/manifests/machineosbuilder/events-rolebinding-default.yaml b/manifests/machineosbuilder/events-rolebinding-default.yaml
diff --git a/manifests/machineosbuilder/events-rolebinding-target.yaml b/manifests/machineosbuilder/events-rolebinding-target.yaml
diff --git a/manifests/machineosbuilder/sa.yaml b/manifests/machineosbuilder/sa.yaml
diff --git a/pkg/controller/common/constants.go b/pkg/controller/common/constants.go
@@ -39,7 +39,6 @@ const (
 
 	// MachineConfigPoolMaster is the MachineConfigPool name given to the master
 	MachineConfigPoolMaster = "master"
-
 	// MachineConfigPoolWorker is the MachineConfigPool name given to the worker
 	MachineConfigPoolWorker = "worker"
 

diff --git a/pkg/operator/operator.go b/pkg/operator/operator.go
@@ -362,7 +362,6 @@ func (optr *Operator) sync(key string) error {
 		{"MachineConfigDaemon", optr.syncMachineConfigDaemon},
 		{"MachineConfigController", optr.syncMachineConfigController},
 		{"MachineConfigServer", optr.syncMachineConfigServer},
-		{"MachineOSBuilder", optr.syncMachineOSBuilder},
 		// this check must always run last since it makes sure the pools are in sync/upgrading correctly
 		{"RequiredPools", optr.syncRequiredMachineConfigPools},
 	}