Merge pull request openshift#138 from sdemos/always-validate

pkg/daemon: remove annotation equality test from validation
jlebon · Oct 31, 2018 · 214b930 · 214b930
2 parents 038d67d + df97fcf
commit 214b930
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/pkg/daemon/daemon.go b/pkg/daemon/daemon.go
@@ -282,11 +282,6 @@ func (dn *Daemon) isDesiredMachineState() (bool, string, error) {
 	if err != nil {
 		return false, "", err
 	}
-	// if the current annotation is equal to the desired annotation,
-	// system state is valid.
-	if strings.Compare(dcAnnotation, ccAnnotation) == 0 {
-		return true, dcAnnotation, nil
-	}
 
 	currentConfig, err := getMachineConfig(dn.client.MachineconfigurationV1().MachineConfigs(), ccAnnotation)
 	if err != nil {