Skip to content
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

Fix panic error from windows agent if no cni is deployed. #6768

Closed
wants to merge 10 commits into from
Closed

Fix panic error from windows agent if no cni is deployed. #6768

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
3acd10e
Bump K8s to v1.31.0-k3s3 (#6665)
dereknola Aug 30, 2024
4bf1156
feat: bump harvester-cloud-provider to v0.2.6
FrankYang0529 Aug 30, 2024
288210a
Update chart with CNI plugins on Flannel and Cilium
rbrtbnfgl Sep 2, 2024
29f8cc8
Bump multus chart to v4.1.000
thomasferrandiz Sep 5, 2024
d39b0b9
Merge pull request #6745 from thomasferrandiz/issue-6728_release-1.31
thomasferrandiz Sep 5, 2024
3304bd0
Remove sriov images from airgap tarball
thomasferrandiz Sep 5, 2024
93e47f1
Merge pull request #6751 from thomasferrandiz/issue-6746_release-1.31
thomasferrandiz Sep 6, 2024
a2dd825
Add ctr to shell completion
vitorsavian Sep 4, 2024
eabc09b
fix: added null check for cni plugin before setup func is called
Sep 9, 2024
b2692dc
Merge branch 'master' into fix/cni-setup-win
Sep 13, 2024
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
1 change: 0 additions & 1 deletion charts/chart_versions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ charts:
- version: v4.1.001
filename: /charts/rke2-multus.yaml
bootstrap: true
- version: v0.25.601
filename: /charts/rke2-flannel.yaml
bootstrap: true
- version: 1.9.000
Expand Down
2 changes: 2 additions & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@ replace (
k8s.io/kubectl => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.31.0-k3s3
k8s.io/kubelet => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.31.0-k3s3
k8s.io/kubernetes => github.com/k3s-io/kubernetes v1.31.0-k3s3

k8s.io/legacy-cloud-providers => github.com/k3s-io/kubernetes/staging/src/k8s.io/legacy-cloud-providers v1.30.4-k3s1 // upstream stopped producing tags
k8s.io/metrics => github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.31.0-k3s3
k8s.io/mount-utils => github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.31.0-k3s3
k8s.io/node-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/node-api v1.31.0-k3s3
Expand Down
6 changes: 4 additions & 2 deletions pkg/pebinaryexecutor/pebinary.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,8 +129,10 @@ func (p *PEBinaryConfig) Bootstrap(ctx context.Context, nodeConfig *config.Node,
logrus.Fatal("Unsupported CNI: ", p.CNIName)
}

if err := p.CNIPlugin.Setup(ctx, nodeConfig, restConfig, p.DataDir); err != nil {
return err
if p.CNIPlugin != nil {
if err := p.CNIPlugin.Setup(ctx, nodeConfig, restConfig, p.DataDir); err != nil {
return err
}
}

// required to initialize KubeProxy
Expand Down