Update docs/networking/kindnet.md

Co-authored-by: Ciprian Hacman <[email protected]> Change-Id: I183e7dc52a71aa0d22607412c6e174c8d934c0c4
kubernetes · Jan 7, 2025 · 98ad825 · 98ad825
1 parent 8dc1e0d
commit 98ad825
Show file tree

Hide file tree

Showing 15 changed files with 41 additions and 2 deletions.
diff --git a/docs/networking/kindnet.md b/docs/networking/kindnet.md
@@ -1,5 +1,9 @@
 # Kindnet
 
+***Kindnet support is experimental, and may be removed at any time***
+
+## Introduction
+
 * [kindnet](http://kindnet.es)
 
 Kindnet focuses on providing essential networking functionality without unnecessary complexity.

diff --git a/k8s/crds/kops.k8s.io_clusters.yaml b/k8s/crds/kops.k8s.io_clusters.yaml
@@ -5785,6 +5785,9 @@ spec:
                       fastPathThreshold:
                         format: int32
                         type: integer
+                      logLevel:
+                        format: int32
+                        type: integer
                       masquerade:
                         description: KindnetMasqueradeSpec configures Kindnet masquerading
                           settings.

diff --git a/pkg/apis/kops/networking.go b/pkg/apis/kops/networking.go
@@ -572,6 +572,8 @@ type KindnetNetworkingSpec struct {
 	FastPathThreshold *int32 `json:"fastPathThreshold,omitempty"`
 	// node agent masquerading rules
 	Masquerade *KindnetMasqueradeSpec `json:"masquerade,omitempty"`
+	// log level
+	LogLevel *int32 `json:"logLevel,omitempty"`
 }
 
 type KindnetMasqueradeSpec struct {

diff --git a/pkg/apis/kops/v1alpha2/networking.go b/pkg/apis/kops/v1alpha2/networking.go
@@ -686,6 +686,7 @@ type KindnetNetworkingSpec struct {
 	NAT64                        *bool                  `json:"nat64,omitempty"`
 	FastPathThreshold            *int32                 `json:"fastPathThreshold,omitempty"`
 	Masquerade                   *KindnetMasqueradeSpec `json:"masquerade,omitempty"`
+	LogLevel                     *int32                 `json:"logLevel,omitempty"`
 }
 
 // KindnetMasqueradeSpec configures Kindnet masquerading settings.

diff --git a/pkg/apis/kops/v1alpha2/zz_generated.conversion.go b/pkg/apis/kops/v1alpha2/zz_generated.conversion.go
diff --git a/pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go b/pkg/apis/kops/v1alpha2/zz_generated.deepcopy.go
diff --git a/pkg/apis/kops/v1alpha3/networking.go b/pkg/apis/kops/v1alpha3/networking.go
@@ -522,6 +522,7 @@ type KindnetNetworkingSpec struct {
 	NAT64                        *bool                  `json:"nat64,omitempty"`
 	FastPathThreshold            *int32                 `json:"fastPathThreshold,omitempty"`
 	Masquerade                   *KindnetMasqueradeSpec `json:"masquerade,omitempty"`
+	LogLevel                     *int32                 `json:"logLevel,omitempty"`
 }
 
 type KindnetMasqueradeSpec struct {

diff --git a/pkg/apis/kops/v1alpha3/zz_generated.conversion.go b/pkg/apis/kops/v1alpha3/zz_generated.conversion.go
diff --git a/pkg/apis/kops/v1alpha3/zz_generated.deepcopy.go b/pkg/apis/kops/v1alpha3/zz_generated.deepcopy.go
diff --git a/pkg/apis/kops/zz_generated.deepcopy.go b/pkg/apis/kops/zz_generated.deepcopy.go
diff --git a/pkg/model/components/kindnet.go b/pkg/model/components/kindnet.go
@@ -60,5 +60,9 @@ func (b *KindnetOptionsBuilder) BuildOptions(o *kops.Cluster) error {
 		c.FastPathThreshold = fi.PtrTo(int32(0))
 	}
 
+	if c.LogLevel == nil {
+		c.LogLevel = fi.PtrTo(int32(2))
+	}
+
 	return nil
 }
diff --git a/...tegration/update_cluster/privatekindnet/data/aws_s3_object_cluster-completed.spec_content b/...tegration/update_cluster/privatekindnet/data/aws_s3_object_cluster-completed.spec_content
@@ -190,6 +190,8 @@ spec:
   networkCIDR: 172.20.0.0/16
   networking:
     kindnet:
+      fastPathThreshold: 0
+      logLevel: 2
       masquerade:
         enabled: true
         nonMasqueradeCIDRs:

diff --git a/...ter/privatekindnet/data/aws_s3_object_privatekindnet.example.com-addons-bootstrap_content b/...ter/privatekindnet/data/aws_s3_object_privatekindnet.example.com-addons-bootstrap_content
@@ -106,7 +106,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.32
     manifest: networking.kindnet/k8s-1.32.yaml
-    manifestHash: 8da09d999d4060ab14a2517619248aadd0697dd9f966ea1cbf9866a780c27ea5
+    manifestHash: 01687948e8fc685a14c3571170e46aae89adce0300947f3625a2074b1b729a63
     name: networking.kindnet
     needsRollingUpdate: all
     selector:

diff --git a/.../data/aws_s3_object_privatekindnet.example.com-addons-networking.kindnet-k8s-1.32_content b/.../data/aws_s3_object_privatekindnet.example.com-addons-networking.kindnet-k8s-1.32_content
@@ -104,6 +104,7 @@ spec:
         - /bin/kindnetd
         - --hostname-override=$(NODE_NAME)
         - --v=2
+        - --fastpath-threshold=0
         - --masquerading=true
         - --no-masquerade-cidr=172.20.0.0/16,100.96.0.0/11,100.64.0.0/13
         env:

diff --git a/upup/models/cloudup/resources/addons/networking.kindnet/k8s-1.32.yaml.template b/upup/models/cloudup/resources/addons/networking.kindnet/k8s-1.32.yaml.template
@@ -105,7 +105,9 @@ spec:
         args:
         - /bin/kindnetd
         - --hostname-override=$(NODE_NAME)
-        - --v=2
+        {{- if .Networking.Kindnet.LogLevel }}
+        - --v={{ .Networking.Kindnet.LogLevel }}
+        {{- end }}
         {{- if .Networking.Kindnet.NetworkPolicies }}
         - --network-policy={{ .Networking.Kindnet.NetworkPolicies }}
         {{- end }}