Merge pull request kubernetes#17204 from aojea/kindnet_distroless

kindnet: use commands instead of args for the container image
borg-land · Jan 13, 2025 · 2b133b2 · 2b133b2
2 parents ce641d9 + 35e7a25
commit 2b133b2
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/...minimal-ipv6-kindnet/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content b/...minimal-ipv6-kindnet/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content
@@ -99,7 +99,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.32
     manifest: networking.kindnet/k8s-1.32.yaml
-    manifestHash: 43ba729e334963108d9468ac9fe4ca08f3b99bc2ae19c4f830895438f453d684
+    manifestHash: f986094857bdd8b6b72dc503bb31b5c78a0b811a7872690fd0bfb7ee575e1fb1
     name: networking.kindnet
     needsRollingUpdate: all
     selector:

diff --git a/...et/data/aws_s3_object_minimal-ipv6.example.com-addons-networking.kindnet-k8s-1.32_content b/...et/data/aws_s3_object_minimal-ipv6.example.com-addons-networking.kindnet-k8s-1.32_content
@@ -100,7 +100,7 @@ spec:
         tier: node
     spec:
       containers:
-      - args:
+      - command:
         - /bin/kindnetd
         - --hostname-override=$(NODE_NAME)
         - --v=2

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
@@ -99,7 +99,7 @@ spec:
     version: 9.99.0
   - id: k8s-1.32
     manifest: networking.kindnet/k8s-1.32.yaml
-    manifestHash: 6f423b54cac7857cdd53f1998b399e3a029e675569c7ac6ae7eaf3e0979095f1
+    manifestHash: 0bb1fd2f646124bf3a5e1c41db9ad7f44103f5fbf9e4d8076b1d791e35c58443
     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
@@ -100,7 +100,7 @@ spec:
         tier: node
     spec:
       containers:
-      - args:
+      - command:
         - /bin/kindnetd
         - --hostname-override=$(NODE_NAME)
         - --v=2

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
@@ -102,7 +102,7 @@ spec:
       containers:
       - name: kindnet-cni
         image: "ghcr.io/aojea/kindnetd:{{ .Networking.Kindnet.Version }}"
-        args:
+        command:
         - /bin/kindnetd
         - --hostname-override=$(NODE_NAME)
         - --v={{ .Networking.Kindnet.LogLevel }}