Workaround konnectivity ingress issue

Signed-off-by: Alexey Makhov <[email protected]>
Signed-off-by: makhov <[email protected]>

Author: makhov

e2e/ingress_test.go

@@ -25,6 +25,7 @@ import (
 	"path/filepath"
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+	"strings"
 	"testing"
 	"time"
 
@@ -152,6 +153,14 @@ func ingressSupportSpec(t *testing.T) {
 		clusterv1.ClusterNameLabel: workloadClusterName,
 	}), "Should list machines")
 
+	out, err := exec.Command("/bin/sh", "-c", fmt.Sprintf(`docker ps | grep control-plane | awk '{print $1}'`)).Output()
+	t.Log(string(out))
+	require.NoError(t, err, "Should list test control plane container")
+	containerName := strings.Trim(string(out), "\n ")
+	cmd := exec.Command("docker", "exec", workloadClusterName, "kubectl", "exec	", "-n", "k0smotron", containerName, "--", "k0s", "kc", "logs", "-n", "kube-system", "ds/konnectivity-agent")
+	out, err = cmd.CombinedOutput()
+	t.Logf("Konnectivity agent logs:\n%s", string(out))
+
 	for _, m := range machineList.Items {
 		var (
 			stdout bytes.Buffer

internal/controller/k0smotron.io/k0smotroncluster_configmap.go

@@ -281,7 +281,6 @@ func getV1Beta1Spec(kmc *km.Cluster, sans []string) map[string]interface{} {
 		}
 		v1beta1Spec["konnectivity"] = map[string]any{
 			"externalAddress": kmc.Spec.Ingress.KonnectivityHost,
-			"agentPort":       kmc.Spec.Ingress.Port,
 		}
 	}
 

internal/controller/k0smotron.io/k0smotroncluster_ingress.go

@@ -167,6 +167,74 @@ spec:
     app: k0smotron-haproxy
   sessionAffinity: None
   type: ClusterIP`, scope.clusterSettings.kubernetesServiceIP, scope.clusterSettings.kubernetesServiceIP),
+			"4_konnectivity.yaml": fmt.Sprintf(`apiVersion: apps/v1
+kind: DaemonSet
+metadata:
+  labels:
+    k8s-app: konnectivity-agent
+  namespace: kube-system
+  name: konnectivity-agent
+spec:
+  selector:
+    matchLabels:
+      k8s-app: konnectivity-agent
+  template:
+    metadata:
+      labels:
+        k8s-app: konnectivity-agent
+      annotations:
+        prometheus.io/scrape: 'true'
+        prometheus.io/port: '8093'
+    spec:
+      securityContext:
+        runAsNonRoot: true
+        supplementalGroups: [0]
+      nodeSelector:
+        kubernetes.io/os: linux
+      priorityClassName: system-cluster-critical
+      tolerations:
+        - operator: Exists
+      containers:
+        - image: quay.io/k0sproject/apiserver-network-proxy-agent:v0.33.0
+          imagePullPolicy: IfNotPresent
+          name: konnectivity-agent
+          command: ["/proxy-agent"]
+          env:
+              - name: NODE_IP
+                valueFrom:
+                  fieldRef:
+                    fieldPath: status.hostIP
+          args:
+            - --logtostderr=true
+            - --ca-cert=/var/run/secrets/kubernetes.io/serviceaccount/ca.crt
+            - --proxy-server-host=%s
+            - --proxy-server-port=%d
+            - --service-account-token-path=/var/run/secrets/tokens/konnectivity-agent-token
+            - --agent-identifiers=host=$(NODE_IP)
+            - --agent-id=$(NODE_IP)
+          volumeMounts:
+            - mountPath: /var/run/secrets/tokens
+              name: konnectivity-agent-token
+          livenessProbe:
+            httpGet:
+              port: 8093
+              path: /healthz
+            initialDelaySeconds: 15
+            timeoutSeconds: 15
+          readinessProbe:
+            httpGet:
+              port: 8093
+              path: /readyz
+            initialDelaySeconds: 15
+            timeoutSeconds: 15
+      serviceAccountName: konnectivity-agent
+      volumes:
+        - name: konnectivity-agent-token
+          projected:
+            sources:
+              - serviceAccountToken:
+                  path: konnectivity-agent-token
+                  audience: system:konnectivity-server`, kmc.Spec.Ingress.KonnectivityHost, kmc.Spec.Ingress.Port),
 		},
 	}