Merge pull request #4322 from ncopa/kube-router-2.1

Update kube-router to 2.1.x
k0sproject · Apr 29, 2024 · b3f2405 · b3f2405
2 parents 5adf9a4 + a0231bc
commit b3f2405
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 1 deletion.
diff --git a/pkg/component/controller/kuberouter.go b/pkg/component/controller/kuberouter.go
@@ -177,6 +177,7 @@ func (k *KubeRouter) Start(_ context.Context) error {
 	return nil
 }
 
+// from https://github.com/cloudnativelabs/kube-router/blob/master/daemonset/
 const kubeRouterTemplate = `---
 apiVersion: v1
 kind: ConfigMap
@@ -272,6 +273,7 @@ spec:
           - mountPath: /etc/kube-router
             name: kube-router-cfg
       hostNetwork: true
+      hostPID: true
       tolerations:
       - effect: NoSchedule
         operator: Exists
@@ -313,6 +315,10 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: spec.nodeName
+        - name: POD_NAME
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.name
         - name: KUBE_ROUTER_CNI_CONF_FILE
           value: /etc/cni/net.d/10-kuberouter.conflist
         livenessProbe:
@@ -377,6 +383,28 @@ rules:
       - get
       - list
       - watch
+  - apiGroups:
+      - "coordination.k8s.io"
+    resources:
+      - leases
+    verbs:
+      - get
+      - create
+      - update
+  - apiGroups:
+      - ""
+    resources:
+      - services/status
+    verbs:
+      - update
+  - apiGroups:
+      - "discovery.k8s.io"
+    resources:
+      - endpointslices
+    verbs:
+      - get
+      - list
+      - watch
 
 ---
 kind: ClusterRoleBinding

diff --git a/pkg/constant/constant.go b/pkg/constant/constant.go
@@ -96,7 +96,7 @@ const (
 	CalicoNodeImage                    = "quay.io/k0sproject/calico-node"
 	KubeControllerImage                = "quay.io/k0sproject/calico-kube-controllers"
 	KubeRouterCNIImage                 = "quay.io/k0sproject/kube-router"
-	KubeRouterCNIImageVersion          = "v1.6.1-iptables1.8.9-0"
+	KubeRouterCNIImageVersion          = "v2.1.0-iptables1.8.9-0"
 	KubeRouterCNIInstallerImage        = "quay.io/k0sproject/cni-node"
 	KubeRouterCNIInstallerImageVersion = "1.3.0-k0s.0"
 	OpenEBSRepository                  = "https://openebs.github.io/charts"