more wip

docs/src/snap/howto/networking/default-network.md

@@ -76,8 +76,8 @@ You can `disable` the built-in network:
    disabling Network.
 ```
 
-If your underlying network is cilium you will have to run `sudo k8s disable gateway` 
-before disabling network.
+If your underlying network is cilium you will have to run 
+`sudo k8s disable gateway` before disabling network.
 
 ```
 sudo k8s disable network

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

@@ -10,7 +10,7 @@ var (
 	// chartContour represents manifests to deploy Contour.
 	chartContour = helm.InstallableChart{
 		Name:         "ck-ingress",
-		Namespace:    "project-contour",
+		Namespace:    "projectcontour",
 		ManifestPath: path.Join("charts", "contour-18.1.2.tgz"),
 	}
 )

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

@@ -23,7 +23,7 @@ func ApplyGateway(ctx context.Context, snap snap.Snap, gateway types.Gateway, ne
 			"gateway": map[string]any{
 				"gatewayRef": map[string]any{
 					"name":      "gateway",
-					"namespace": "project-contour",
+					"namespace": "projectcontour",
 				},
 			},
 		}

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

@@ -18,18 +18,27 @@ import (
 func ApplyIngress(ctx context.Context, snap snap.Snap, ingress types.Ingress, network types.Network, _ types.Annotations) error {
 	m := snap.HelmClient()
 
+	//TODO: map these friends
+	// enableProxyProtocol = ingress.GetEnableProxyProtocol()
+	// defaultTLSSecret = ingress.GetDefaultTLSSecret()
+
+	if !ingress.GetEnabled() {
+		if _, err := m.Apply(ctx, chartContour, helm.StateDeleted, nil); err != nil {
+			return fmt.Errorf("failed to uninstall ingress: %w", err)
+		}
+	}
 	var values map[string]any
 	if ingress.GetEnabled() {
 		values = map[string]any{
-			"envoy-service-namespace": "project-contour",
+			"envoy-service-namespace": "projectcontour",
 			"envoy-service-name":      "envoy",
-			"tls": map[string]any{
-				"envoy-client-certificate": ingress.GetDefaultTLSSecret(), //TODO: I think this is wrong
-			},
+			// "tls": map[string]any{
+			// 	"envoy-client-certificate": ingress.GetDefaultTLSSecret(), //TODO: I think this is wrong
+			// },
 		}
 	}
 
-	changed, err := m.Apply(ctx, chartContour, helm.StateUpgradeOnlyOrDeleted(network.GetEnabled()), values)
+	changed, err := m.Apply(ctx, chartContour, helm.StatePresent, values)
 	if err != nil {
 		return fmt.Errorf("failed to enable ingress: %w", err)
 	}
@@ -50,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", "project-contour"); err != nil { //TODO: check name of deployment
+		if err := client.RestartDeployment(ctx, "contour-contour", "projectcontour"); err != nil { //TODO: check name of deployment
 			return fmt.Errorf("failed to restart contour deployment: %w", err)
 		}
 		return nil
@@ -59,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", "project-contour"); err != nil {
+		if err := client.RestartDaemonset(ctx, "contour-envoy", "projectcontour"); err != nil {
 			return fmt.Errorf("failed to restart contour daemonset: %w", err)
 		}
 		return nil

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

@@ -0,0 +1,13 @@
+package fake
+
+import (
+	"context"
+
+	"github.com/canonical/k8s/pkg/k8sd/types"
+	"github.com/canonical/k8s/pkg/snap"
+)
+
+// ApplyGateway is a dummy implementation of the ApplyGateway function. It does nothing and returns nil.
+func ApplyGateway(ctx context.Context, snap snap.Snap, gateway types.Gateway, network types.Network, _ types.Annotations) error {
+	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:       contour.ApplyGateway,
+	applyGateway:       fake.ApplyGateway,
 	applyMetricsServer: metrics_server.ApplyMetricsServer,
 	applyLocalStorage:  localpv.ApplyLocalStorage,
 }