Merge pull request #1359 from runcom/osimageurl-race-43

Bug 1786993: [release-4.3] Fix osImageURL upgrade race
openshift · Jan 13, 2020 · 25bb6ae · 25bb6ae
2 parents 311a01e + 109eb3b
commit 25bb6ae
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 0 deletions.
diff --git a/...0_machine-config-operator_00_service.yaml → ...0_machine-config-operator_00_service.yaml b/...0_machine-config-operator_00_service.yaml → ...0_machine-config-operator_00_service.yaml
diff --git a/install/0000_80_machine-config-operator_05_osimageurl.yaml b/install/0000_80_machine-config-operator_05_osimageurl.yaml
@@ -4,6 +4,7 @@ metadata:
   name: machine-config-osimageurl
   namespace: openshift-machine-config-operator
 data:
+  releaseVersion: 0.0.1-snapshot
   # The OS payload, managed by the daemon + pivot + rpm-ostree
   # https://github.com/openshift/machine-config-operator/issues/183
   osImageURL: "registry.svc.ci.openshift.org/openshift:machine-os-content"
diff --git a/pkg/operator/sync.go b/pkg/operator/sync.go
@@ -685,6 +685,11 @@ func (optr *Operator) getOsImageURL(namespace string) (string, error) {
 	if err != nil {
 		return "", err
 	}
+	releaseVersion := cm.Data["releaseVersion"]
+	optrVersion, _ := optr.vStore.Get("operator")
+	if releaseVersion != optrVersion {
+		return "", fmt.Errorf("refusing to read osImageURL version %q, operator version %q", releaseVersion, optrVersion)
+	}
 	return cm.Data["osImageURL"], nil
 }