gateway

src/k8s/pkg/k8sd/features/contour/chart.go

@@ -13,4 +13,10 @@ var (
 		Namespace:    "projectcontour",
 		ManifestPath: path.Join("charts", "contour-18.1.2.tgz"),
 	}
+
+	chartEnvoyGateway = helm.InstallableChart{
+		Name:         "ck-gateway",
+		Namespace:    "envoy-gateway-system",
+		ManifestPath: path.Join("charts", "gateway-helm-v1.0.1.tgz"),
+	}
 )

src/k8s/pkg/k8sd/features/contour/gateway.go

@@ -9,16 +9,28 @@ import (
 	"github.com/canonical/k8s/pkg/snap"
 )
 
-// ApplyGateway assumes that the managed Cilium CNI is already installed on the cluster. It will fail if that is not the case.
-// ApplyGateway will deploy the Gateway API CRDs on the cluster and enable the GatewayAPI controllers on Cilium, when gateway.Enabled is true.
-// ApplyGateway will remove the Gateway API CRDs from the cluster and disable the GatewayAPI controllers on Cilium, when gateway.Enabled is false.
-// ApplyGateway will rollout restart the Cilium pods in case any Cilium configuration was changed.
+// ApplyGateway assumes that the Contour is already installed on the cluster. It will fail if that is not the case.
+// ApplyGateway will deploy the envoy-gateway-system on the cluster and enable set the right gateway configs in contour when gateway.Enabled is true.
+// ApplyGateway will remove the envoy-gateway-system from the cluster and remove the right gateway configs in contour when gateway.Enabled is false.
+// ApplyGateway will rollout restart the Contour pods.
 // ApplyGateway returns an error if anything fails.
 func ApplyGateway(ctx context.Context, snap snap.Snap, gateway types.Gateway, network types.Network, _ types.Annotations) error {
 	m := snap.HelmClient()
+	// First Install envoy-gateway-system
+	if gateway.GetEnabled() {
+		if _, err := m.Apply(ctx, chartEnvoyGateway, helm.StatePresent, nil); err != nil {
+			return fmt.Errorf("failed to install envoy-gateway-system: %w", err)
+		}
+
+	} else {
+		if _, err := m.Apply(ctx, chartEnvoyGateway, helm.StateDeleted, nil); err != nil {
+			return fmt.Errorf("failed to uninstall envoy-gateway-system: %w", err)
+		}
+	}
 
+	// Second update gateway config bits in contour ingress
 	var values map[string]any
-	if gateway.GetEnabled() { //TODO: Do we need to chek for ingress enabled?
+	if gateway.GetEnabled() { //TODO: Do we need to check for ingress enabled? Are we overwriting values set in ingress?
 		values = map[string]any{
 			"gateway": map[string]any{
 				"gatewayRef": map[string]any{
@@ -39,14 +51,14 @@ func ApplyGateway(ctx context.Context, snap snap.Snap, gateway types.Gateway, ne
 	}
 	changed, err := m.Apply(ctx, chartContour, helm.StateUpgradeOnlyOrDeleted(network.GetEnabled()), values)
 	if err != nil {
-		return fmt.Errorf("failed to apply Gateway API contour configuration: %w", err)
+		return fmt.Errorf("failed to apply Gateway configuration to contour: %w", err)
 	}
 
 	if !changed || !gateway.GetEnabled() {
 		return nil
 	}
 	if err := rolloutRestartContour(ctx, snap, 3); err != nil {
-		return fmt.Errorf("failed to rollout restart contour to apply Gateway API: %w", err)
+		return fmt.Errorf("failed to rollout restart contour to apply Gateway configuration: %w", err)
 	}
 
 	return nil

src/k8s/pkg/k8sd/features/contour/ingress.go

@@ -59,7 +59,7 @@ func rolloutRestartContour(ctx context.Context, snap snap.Snap, attempts int) er
 	}
 
 	if err := control.RetryFor(ctx, attempts, 0, func() error {
-		if err := client.RestartDeployment(ctx, "contour-contour", "projectcontour"); err != nil { //TODO: check name of deployment
+		if err := client.RestartDeployment(ctx, "ck-ingress-contour-envoy", "projectcontour"); err != nil { //TODO: check name of deployment
 			return fmt.Errorf("failed to restart contour deployment: %w", err)
 		}
 		return nil
@@ -68,7 +68,7 @@ func rolloutRestartContour(ctx context.Context, snap snap.Snap, attempts int) er
 	}
 
 	if err := control.RetryFor(ctx, attempts, 0, func() error {
-		if err := client.RestartDaemonset(ctx, "contour-envoy", "projectcontour"); err != nil {
+		if err := client.RestartDaemonset(ctx, "ck-ingress-contour-envoy", "projectcontour"); err != nil {
 			return fmt.Errorf("failed to restart contour daemonset: %w", err)
 		}
 		return nil

src/k8s/pkg/k8sd/features/implementation_default.go

@@ -18,7 +18,7 @@ var Implementation Interface = &implementation{
 	applyNetwork:       fake.ApplyNetwork, //TODO: remove default overwrite for testing
 	applyLoadBalancer:  fake.ApplyLoadBalancer,
 	applyIngress:       contour.ApplyIngress,
-	applyGateway:       fake.ApplyGateway,
+	applyGateway:       contour.ApplyGateway,
 	applyMetricsServer: metrics_server.ApplyMetricsServer,
 	applyLocalStorage:  localpv.ApplyLocalStorage,
 }