feat(RHOAIENG-52137): add Gateway API CRD as dependency (#3247)

Author: davidebianchi

.github/scripts/manifest-utils.js

@@ -87,10 +87,14 @@ function parseManifestFile(filePath) {
     // Parse both ODH and RHOAI manifest blocks
     const odhComponents = parseManifestBlock(content, 'ODH_COMPONENT_MANIFESTS', 'odh');
     const rhoaiComponents = parseManifestBlock(content, 'RHOAI_COMPONENT_MANIFESTS', 'rhoai');
+    const odhCharts = parseManifestBlock(content, 'ODH_COMPONENT_CHARTS', 'odh');
+    const rhoaiCharts = parseManifestBlock(content, 'RHOAI_COMPONENT_CHARTS', 'rhoai');
 
     return {
         odh: odhComponents,
-        rhoai: rhoaiComponents
+        rhoai: rhoaiComponents,
+        odhCharts: odhCharts,
+        rhoaiCharts: rhoaiCharts
     };
 }
 

.github/scripts/update-manifests-commit-sha.js

@@ -7,7 +7,7 @@ module.exports = async function ({ github, core }) {
   const updates = [];
 
   // Process both ODH and RHOAI platforms
-  for (const components of [parsedManifests.odh, parsedManifests.rhoai]) {
+  for (const components of [parsedManifests.odh, parsedManifests.rhoai, parsedManifests.odhCharts, parsedManifests.rhoaiCharts]) {
     // Filter to only components with branch@sha format
     const componentsWithSha = [];
     for (const componentInfo of components) {

api/cloudmanager/common/types.go

@@ -24,6 +24,10 @@ type LWSConfiguration struct{}
 // +kubebuilder:object:generate=true
 type SailOperatorConfiguration struct{}
 
+// GatewayAPIConfiguration defines the configuration for the Gateway API dependency.
+// +kubebuilder:object:generate=true
+type GatewayAPIConfiguration struct{}
+
 // CertManagerDependency defines the cert-manager operator dependency.
 // +kubebuilder:object:generate=true
 type CertManagerDependency struct {
@@ -66,6 +70,20 @@ type SailOperatorDependency struct {
 	Configuration SailOperatorConfiguration `json:"configuration,omitempty"`
 }
 
+// GatewayAPIDependency defines the Gateway API dependency.
+// +kubebuilder:object:generate=true
+type GatewayAPIDependency struct {
+	// ManagementPolicy determines whether the operator manages this dependency.
+	// Managed: the operator installs and reconciles the dependency.
+	// Unmanaged: the operator does not manage the dependency; the user is responsible.
+	// +kubebuilder:default=Managed
+	ManagementPolicy ManagementPolicy `json:"managementPolicy,omitempty"`
+
+	// Configuration for the Gateway API.
+	// +optional
+	Configuration GatewayAPIConfiguration `json:"configuration,omitempty"`
+}
+
 // Dependencies defines the dependency configurations for cloud manager operators.
 // +kubebuilder:object:generate=true
 type Dependencies struct {
@@ -80,4 +98,8 @@ type Dependencies struct {
 	// SailOperator defines the Sail operator (Istio) dependency.
 	// +optional
 	SailOperator SailOperatorDependency `json:"sailOperator,omitempty"`
+
+	// GatewayAPI defines the Gateway API dependency.
+	// +optional
+	GatewayAPI GatewayAPIDependency `json:"gatewayAPI,omitempty"`
 }

api/cloudmanager/common/zz_generated.deepcopy.go

@@ -4,6 +4,8 @@ metadata:
   name: default-azurekubernetesengine
 spec:
   dependencies:
+    gatewayAPI:
+      managementPolicy: Managed
     certManager:
       managementPolicy: Managed
     lws:

config/cloudmanager/azure/samples/azurekubernetesengine_v1alpha1.yaml

@@ -4,6 +4,8 @@ metadata:
   name: default-coreweavekubernetesengine
 spec:
   dependencies:
+    gatewayAPI:
+      managementPolicy: Managed
     certManager:
       managementPolicy: Managed
     lws:

config/cloudmanager/coreweave/samples/coreweavekubernetesengine_v1alpha1.yaml

@@ -61,9 +61,10 @@ declare -A RHOAI_COMPONENT_MANIFESTS=(
 
 # ODH Component Charts
 declare -A ODH_COMPONENT_CHARTS=(
-    ["cert-manager-operator"]="opendatahub-io:odh-gitops:main@99d7a56589872aea722797e90f12b8801aad1065:charts/cert-manager-operator"
-    ["lws-operator"]="opendatahub-io:odh-gitops:main@99d7a56589872aea722797e90f12b8801aad1065:charts/lws-operator"
-    ["sail-operator"]="opendatahub-io:odh-gitops:main@99d7a56589872aea722797e90f12b8801aad1065:charts/sail-operator"
+    ["cert-manager-operator"]="opendatahub-io:odh-gitops:main@f600f22bdec2fb6ee24ead6fa04b6b3d896781fb:charts/cert-manager-operator"
+    ["lws-operator"]="opendatahub-io:odh-gitops:main@f600f22bdec2fb6ee24ead6fa04b6b3d896781fb:charts/lws-operator"
+    ["sail-operator"]="opendatahub-io:odh-gitops:main@f600f22bdec2fb6ee24ead6fa04b6b3d896781fb:charts/sail-operator"
+    ["gateway-api"]="opendatahub-io:odh-gitops:main@f600f22bdec2fb6ee24ead6fa04b6b3d896781fb:charts/gateway-api"
 )
 
 # RHOAI Component Charts

get_all_manifests.sh

@@ -37,6 +37,7 @@ func TestAzureKubernetesEngine(t *testing.T) {
 		wt := tc.NewWithT(t)
 
 		createAzureCR(t, wt, ccmcommon.Dependencies{
+			GatewayAPI:   ccmcommon.GatewayAPIDependency{ManagementPolicy: ccmcommon.Managed},
 			CertManager:  ccmcommon.CertManagerDependency{ManagementPolicy: ccmcommon.Managed},
 			LWS:          ccmcommon.LWSDependency{ManagementPolicy: ccmcommon.Managed},
 			SailOperator: ccmcommon.SailOperatorDependency{ManagementPolicy: ccmcommon.Managed},

internal/controller/cloudmanager/azure/azurekubernetesengine_controller_test.go

@@ -3,6 +3,7 @@ package common
 import (
 	"os"
 	"path/filepath"
+	"strings"
 
 	helm "github.com/k8s-manifest-kit/renderer-helm/pkg"
 
@@ -32,6 +33,18 @@ type chartDef struct {
 // namespaces. Both ManagedNamespaces and BuildHelmCharts derive from this list.
 func allChartDefs() []chartDef {
 	return []chartDef{
+		{
+			policyFn: func(d ccmcommon.Dependencies) ccmcommon.ManagementPolicy {
+				return d.GatewayAPI.ManagementPolicy
+			},
+			chart: types.HelmChartInfo{
+				Source: helm.Source{
+					Chart:       filepath.Join(DefaultChartsPath, "gateway-api"),
+					ReleaseName: "gateway-api",
+					Values:      helm.Values(map[string]any{}),
+				},
+			},
+		},
 		{
 			namespace: NamespaceCertManagerOperator,
 			policyFn: func(d ccmcommon.Dependencies) ccmcommon.ManagementPolicy {
@@ -92,6 +105,9 @@ func ManagedNamespaces() []string {
 	var namespaces []string
 
 	for _, def := range allChartDefs() {
+		if strings.TrimSpace(def.namespace) == "" {
+			continue
+		}
 		if _, ok := seen[def.namespace]; !ok {
 			seen[def.namespace] = struct{}{}
 			namespaces = append(namespaces, def.namespace)

internal/controller/cloudmanager/common/charts.go

@@ -25,32 +25,48 @@ func TestManagedNamespaces(t *testing.T) {
 	})
 }
 
+func getAllUnmanagedDependencies() ccmcommon.Dependencies {
+	return ccmcommon.Dependencies{
+		GatewayAPI:   ccmcommon.GatewayAPIDependency{ManagementPolicy: ccmcommon.Unmanaged},
+		CertManager:  ccmcommon.CertManagerDependency{ManagementPolicy: ccmcommon.Unmanaged},
+		LWS:          ccmcommon.LWSDependency{ManagementPolicy: ccmcommon.Unmanaged},
+		SailOperator: ccmcommon.SailOperatorDependency{ManagementPolicy: ccmcommon.Unmanaged},
+	}
+}
+
 func TestBuildHelmCharts(t *testing.T) {
+	// expectedReleaseNames is the hardcoded ground truth for chart names and order.
+	// Update this list when adding or removing a chart.
+	expectedReleaseNames := []string{
+		"gateway-api",
+		"cert-manager-operator",
+		"lws-operator",
+		"sail-operator",
+	}
+
 	t.Run("returns all charts in order when all managed", func(t *testing.T) {
 		g := NewWithT(t)
 
-		deps := ccmcommon.Dependencies{
-			CertManager:  ccmcommon.CertManagerDependency{ManagementPolicy: ccmcommon.Managed},
-			LWS:          ccmcommon.LWSDependency{ManagementPolicy: ccmcommon.Managed},
-			SailOperator: ccmcommon.SailOperatorDependency{ManagementPolicy: ccmcommon.Managed},
-		}
+		original := DefaultChartsPath
+		DefaultChartsPath = "/test/charts"
+		t.Cleanup(func() { DefaultChartsPath = original })
 
-		charts := BuildHelmCharts(deps)
+		// Zero-value ManagementPolicy ("") is not "Unmanaged", so all charts are returned.
+		// In practice, kubebuilder defaults ManagementPolicy to "Managed".
+		charts := BuildHelmCharts(ccmcommon.Dependencies{})
 
-		g.Expect(charts).To(HaveLen(3))
-		g.Expect(charts[0].ReleaseName).To(Equal("cert-manager-operator"))
-		g.Expect(charts[1].ReleaseName).To(Equal("lws-operator"))
-		g.Expect(charts[2].ReleaseName).To(Equal("sail-operator"))
+		g.Expect(charts).To(HaveLen(len(expectedReleaseNames)))
+		for i, name := range expectedReleaseNames {
+			g.Expect(charts[i].ReleaseName).To(Equal(name))
+			g.Expect(charts[i].Chart).To(Equal(filepath.Join("/test/charts", name)))
+		}
 	})
 
 	t.Run("excludes unmanaged charts and preserves order", func(t *testing.T) {
 		g := NewWithT(t)
 
-		deps := ccmcommon.Dependencies{
-			CertManager:  ccmcommon.CertManagerDependency{ManagementPolicy: ccmcommon.Unmanaged},
-			LWS:          ccmcommon.LWSDependency{ManagementPolicy: ccmcommon.Managed},
-			SailOperator: ccmcommon.SailOperatorDependency{ManagementPolicy: ccmcommon.Unmanaged},
-		}
+		deps := getAllUnmanagedDependencies()
+		deps.LWS.ManagementPolicy = ccmcommon.Managed
 
 		charts := BuildHelmCharts(deps)
 
@@ -61,47 +77,10 @@ func TestBuildHelmCharts(t *testing.T) {
 	t.Run("returns empty slice when all unmanaged", func(t *testing.T) {
 		g := NewWithT(t)
 
-		deps := ccmcommon.Dependencies{
-			CertManager:  ccmcommon.CertManagerDependency{ManagementPolicy: ccmcommon.Unmanaged},
-			LWS:          ccmcommon.LWSDependency{ManagementPolicy: ccmcommon.Unmanaged},
-			SailOperator: ccmcommon.SailOperatorDependency{ManagementPolicy: ccmcommon.Unmanaged},
-		}
+		deps := getAllUnmanagedDependencies()
 
 		charts := BuildHelmCharts(deps)
 
 		g.Expect(charts).To(BeEmpty())
 	})
-
-	t.Run("keeps charts when ManagementPolicy is zero value", func(t *testing.T) {
-		g := NewWithT(t)
-
-		deps := ccmcommon.Dependencies{} // All zero values
-
-		charts := BuildHelmCharts(deps)
-
-		// Zero-value ManagementPolicy ("") is not "Unmanaged", so charts remain.
-		// In practice, kubebuilder defaults ManagementPolicy to "Managed".
-		g.Expect(charts).To(HaveLen(3))
-	})
-
-	t.Run("chart paths use DefaultChartsPath", func(t *testing.T) {
-		g := NewWithT(t)
-
-		original := DefaultChartsPath
-		DefaultChartsPath = "/test/charts"
-		t.Cleanup(func() { DefaultChartsPath = original })
-
-		deps := ccmcommon.Dependencies{
-			CertManager:  ccmcommon.CertManagerDependency{ManagementPolicy: ccmcommon.Managed},
-			LWS:          ccmcommon.LWSDependency{ManagementPolicy: ccmcommon.Managed},
-			SailOperator: ccmcommon.SailOperatorDependency{ManagementPolicy: ccmcommon.Managed},
-		}
-
-		charts := BuildHelmCharts(deps)
-
-		g.Expect(charts).To(HaveLen(3))
-		g.Expect(charts[0].Chart).To(Equal(filepath.Join("/test/charts", "cert-manager-operator")))
-		g.Expect(charts[1].Chart).To(Equal(filepath.Join("/test/charts", "lws-operator")))
-		g.Expect(charts[2].Chart).To(Equal(filepath.Join("/test/charts", "sail-operator")))
-	})
 }