Merge pull request openshift#8798 from mjturek/powervs-gate-disc

openshift-merge-bot[bot] · web-flow · commit 144e9c313ce3 · 2024-08-08T14:55:22.000Z
no-jira: PowerVS: Block disconnected deploys in 4.17
diff --git a/pkg/asset/manifests/powervs/cluster.go b/pkg/asset/manifests/powervs/cluster.go
@@ -176,8 +176,10 @@ func GenerateClusterAssets(installConfig *installconfig.InstallConfig, clusterID
 		}
 
 		powerVSCluster.Spec.DHCPServer.DNSServer = &dnsServerIP
-		// Disable SNAT for disconnected scenario.
-		powerVSCluster.Spec.DHCPServer.Snat = ptr.To(len(installConfig.Config.DeprecatedImageContentSources) == 0 && len(installConfig.Config.ImageDigestSources) == 0)
+		// TODO(mjturek): Restore once work is finished in 4.18 for disconnected scenario.
+		if !(len(installConfig.Config.DeprecatedImageContentSources) == 0 && len(installConfig.Config.ImageDigestSources) == 0) {
+			return nil, fmt.Errorf("deploying a disconnected cluster directly in 4.17 is not supported for Power VS. Please deploy disconnected in 4.16 and upgrade to 4.17")
+		}
 	}
 
 	// If a VPC was specified, pass all subnets in it to cluster API

Original file line number	Diff line number	Diff line change
`@@ -176,8 +176,10 @@ func GenerateClusterAssets(installConfig *installconfig.InstallConfig, clusterID`
`176`	`176`	`}`
`177`	`177`
`178`	`178`	`powerVSCluster.Spec.DHCPServer.DNSServer = &dnsServerIP`
`179`		`- // Disable SNAT for disconnected scenario.`
`180`		`- powerVSCluster.Spec.DHCPServer.Snat = ptr.To(len(installConfig.Config.DeprecatedImageContentSources) == 0 && len(installConfig.Config.ImageDigestSources) == 0)`
	`179`	`+ // TODO(mjturek): Restore once work is finished in 4.18 for disconnected scenario.`
	`180`	`+ if !(len(installConfig.Config.DeprecatedImageContentSources) == 0 && len(installConfig.Config.ImageDigestSources) == 0) {`
	`181`	`+ return nil, fmt.Errorf("deploying a disconnected cluster directly in 4.17 is not supported for Power VS. Please deploy disconnected in 4.16 and upgrade to 4.17")`
	`182`	`+ }`
`181`	`183`	`}`
`182`	`184`
`183`	`185`	`// If a VPC was specified, pass all subnets in it to cluster API`