Sitelet https://github.com/kubernetes/kops/pull/18635/files
Skip to content

Enable nri mounting on kindnet in kops #18635

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kubernetes-prow merged 2 commits into from
Jul 29, 2026
Merged

Enable nri mounting on kindnet in kops #18635

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
caf8fa5
Enable nri mounting on kindnet in kops
michaelasp Jul 28, 2026
e5e76fc
Bump kindnet to 1.0.1
michaelasp Jul 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkg/model/components/kindnet.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ func (b *KindnetOptionsBuilder) BuildOptions(o *kops.Cluster) error {
}

if c.Version == "" {
c.Version = "v1.0.0"
c.Version = "v1.0.1"
}

if c.Masquerade == nil {
Expand Down
2 changes: 1 addition & 1 deletion ...ion/update_cluster/minimal-ipv6-kindnet/data/aws_s3_object_cluster-completed.spec_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ spec:
logLevel: 2
masquerade:
enabled: false
version: v1.0.0
version: v1.0.1
nodeTerminationHandler:
cpuRequest: 50m
deleteSQSMsgIfNodeNotFound: false
Expand Down
2 changes: 1 addition & 1 deletion ...minimal-ipv6-kindnet/data/aws_s3_object_minimal-ipv6.example.com-addons-bootstrap_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ spec:
k8s-addon: storage-aws.addons.k8s.io
- id: k8s-1.32
manifest: networking.kindnet/k8s-1.32.yaml
manifestHash: 6bb2eef717e9b77664f55e3029343bb375dba58595c5cbedbff2eaebae108e66
manifestHash: 7ef53ee7af5d7f1b5daa357ba2d8e1679c1f238147b87ec2e50b39b0296dba44
name: networking.kindnet
needsRollingUpdate: all
selector:
Expand Down
9 changes: 7 additions & 2 deletions ...et/data/aws_s3_object_minimal-ipv6.example.com-addons-networking.kindnet-k8s-1.32_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: spec.nodeName
image: registry.k8s.io/networking/kindnet:v1.0.0
image: registry.k8s.io/networking/kindnet:v1.0.1
name: kindnet-cni
resources:
requests:
Expand All @@ -136,13 +136,15 @@ spec:
name: cni-cfg
- mountPath: /var/lib/cni-kindnet
name: var-lib-kindnet
- mountPath: /var/run/nri
name: nri-plugin
hostNetwork: true
initContainers:
- command:
- sh
- -c
- cat /opt/cni/bin/cni-kindnet > /cni/cni-kindnet ; chmod +x /cni/cni-kindnet
image: registry.k8s.io/networking/kindnet:v1.0.0
image: registry.k8s.io/networking/kindnet:v1.0.1
name: install-cni-bin
volumeMounts:
- mountPath: /cni
Expand All @@ -164,3 +166,6 @@ spec:
path: /var/lib/cni-kindnet
type: DirectoryOrCreate
name: var-lib-kindnet
- hostPath:
path: /var/run/nri
name: nri-plugin
2 changes: 1 addition & 1 deletion ...tegration/update_cluster/privatekindnet/data/aws_s3_object_cluster-completed.spec_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ spec:
- 172.20.0.0/16
- 100.96.0.0/11
- 100.64.0.0/13
version: v1.0.0
version: v1.0.1
nodeTerminationHandler:
cpuRequest: 50m
deleteSQSMsgIfNodeNotFound: false
Expand Down
2 changes: 1 addition & 1 deletion ...ter/privatekindnet/data/aws_s3_object_privatekindnet.example.com-addons-bootstrap_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ spec:
k8s-addon: storage-aws.addons.k8s.io
- id: k8s-1.32
manifest: networking.kindnet/k8s-1.32.yaml
manifestHash: 8eec5430c6c2d0a29696015bc2679de0bf2f2444f6a6f103ac54f03bdb5a4114
manifestHash: 40eafac9d59f831a8522df7cf28341ee40d670ca0d7684220ecc5e409d5e18e1
name: networking.kindnet
needsRollingUpdate: all
selector:
Expand Down
9 changes: 7 additions & 2 deletions .../data/aws_s3_object_privatekindnet.example.com-addons-networking.kindnet-k8s-1.32_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ spec:
valueFrom:
fieldRef:
fieldPath: spec.nodeName
image: registry.k8s.io/networking/kindnet:v1.0.0
image: registry.k8s.io/networking/kindnet:v1.0.1
name: kindnet-cni
resources:
requests:
Expand All @@ -137,13 +137,15 @@ spec:
name: cni-cfg
- mountPath: /var/lib/cni-kindnet
name: var-lib-kindnet
- mountPath: /var/run/nri
name: nri-plugin
hostNetwork: true
initContainers:
- command:
- sh
- -c
- cat /opt/cni/bin/cni-kindnet > /cni/cni-kindnet ; chmod +x /cni/cni-kindnet
image: registry.k8s.io/networking/kindnet:v1.0.0
image: registry.k8s.io/networking/kindnet:v1.0.1
name: install-cni-bin
volumeMounts:
- mountPath: /cni
Expand All @@ -165,3 +167,6 @@ spec:
path: /var/lib/cni-kindnet
type: DirectoryOrCreate
name: var-lib-kindnet
- hostPath:
path: /var/run/nri
name: nri-plugin
5 changes: 5 additions & 0 deletions upup/models/cloudup/resources/addons/networking.kindnet/k8s-1.32.yaml.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,8 @@ spec:
mountPath: /etc/cni/net.d
- name: var-lib-kindnet
mountPath: /var/lib/cni-kindnet
- name: nri-plugin
mountPath: /var/run/nri
resources:
requests:
cpu: "100m"
Expand All @@ -168,6 +170,9 @@ spec:
hostPath:
path: /var/lib/cni-kindnet
type: DirectoryOrCreate
- name: nri-plugin
hostPath:
path: /var/run/nri
{{- if .Networking.Kindnet.AdminNetworkPolicies }}
---
apiVersion: apiextensions.k8s.io/v1
Expand Down
Loading