Merge pull request #1545 from thomasmckay/4257-cherry-pick

OCM-4257 | fix: doesn't check /labels for HCP
openshift · Oct 13, 2023 · 132b354 · 132b354
2 parents 68a1e6e + 58d33c8
commit 132b354
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/cmd/edit/ingress/cmd.go b/cmd/edit/ingress/cmd.go
@@ -207,10 +207,14 @@ func run(cmd *cobra.Command, argv []string) {
 		interactive.Enable()
 	}
 
-	hasLegacyIngressSupport, err := r.OCMClient.HasLegacyIngressSupport(cluster)
-	if err != nil {
-		r.Reporter.Errorf("There was a problem checking version compatibility: %v", err)
-		os.Exit(1)
+	hasLegacyIngressSupport := true
+	if !ocm.IsHyperShiftCluster(cluster) {
+		var err error
+		hasLegacyIngressSupport, err = r.OCMClient.HasLegacyIngressSupport(cluster)
+		if err != nil {
+			r.Reporter.Errorf("There was a problem checking version compatibility: %v", err)
+			os.Exit(1)
+		}
 	}
 
 	if hasLegacyIngressSupport && IsIngressV2SetViaCLI(cmd.Flags()) {