Check if ovn-k should be expected

pmtk · pmtk · commit 3425bac13c99 · 2024-12-18T10:58:34.000+01:00
diff --git a/pkg/healthcheck/microshift_core_workloads.go b/pkg/healthcheck/microshift_core_workloads.go
@@ -14,9 +14,6 @@ func getCoreMicroShiftWorkloads() (map[string]NamespaceWorkloads, error) {
 	}
 
 	workloads := map[string]NamespaceWorkloads{
-		"openshift-ovn-kubernetes": {
-			DaemonSets: []string{"ovnkube-master", "ovnkube-node"},
-		},
 		"openshift-service-ca": {
 			Deployments: []string{"service-ca"},
 		},
@@ -31,6 +28,11 @@ func getCoreMicroShiftWorkloads() (map[string]NamespaceWorkloads, error) {
 		},
 	}
 	fillOptionalWorkloadsIfApplicable(cfg, workloads)
+	if cfg.Network.IsEnabled() {
+		workloads["openshift-ovn-kubernetes"] = NamespaceWorkloads{
+			DaemonSets: []string{"ovnkube-master", "ovnkube-node"},
+		}
+	}
 
 	return workloads, nil
 }

Original file line number	Diff line number	Diff line change
`@@ -14,9 +14,6 @@ func getCoreMicroShiftWorkloads() (map[string]NamespaceWorkloads, error) {`
`14`	`14`	`}`
`15`	`15`
`16`	`16`	`workloads := map[string]NamespaceWorkloads{`
`17`		`- "openshift-ovn-kubernetes": {`
`18`		`- DaemonSets: []string{"ovnkube-master", "ovnkube-node"},`
`19`		`- },`
`20`	`17`	`"openshift-service-ca": {`
`21`	`18`	`Deployments: []string{"service-ca"},`
`22`	`19`	`},`
`@@ -31,6 +28,11 @@ func getCoreMicroShiftWorkloads() (map[string]NamespaceWorkloads, error) {`
`31`	`28`	`},`
`32`	`29`	`}`
`33`	`30`	`fillOptionalWorkloadsIfApplicable(cfg, workloads)`
	`31`	`+ if cfg.Network.IsEnabled() {`
	`32`	`+ workloads["openshift-ovn-kubernetes"] = NamespaceWorkloads{`
	`33`	`+ DaemonSets: []string{"ovnkube-master", "ovnkube-node"},`
	`34`	`+ }`
	`35`	`+ }`
`34`	`36`
`35`	`37`	`return workloads, nil`
`36`	`38`	`}`