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

add new disableDefaultCNI field #63

Merged
merged 2 commits into from
Jul 30, 2024
Merged

add new disableDefaultCNI field #63

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
bb272e0
add new disableDefaultCNI field
eaudetcobello Jul 29, 2024
e4260ad
bump bootstrap-provider version
eaudetcobello Jul 30, 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
3 changes: 3 additions & 0 deletions config/crd/bases/controlplane.cluster.x-k8s.io_microk8scontrolplanes.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,9 @@ spec:
- classic
- strict
type: string
disableDefaultCNI:
description: Whether or not to use the default CNI
type: boolean
extraKubeletArgs:
description: ExtraKubeletArgs is a list of extra arguments
to add to the kubelet.
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ module github.com/canonical/cluster-api-control-plane-provider-microk8s
go 1.21

require (
github.com/canonical/cluster-api-bootstrap-provider-microk8s v0.6.0-api.1
github.com/canonical/cluster-api-bootstrap-provider-microk8s v0.6.9-api
github.com/onsi/ginkgo v1.16.5
github.com/onsi/gomega v1.22.1
k8s.io/api v0.25.3
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,8 @@ github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnweb
github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM=
github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ=
github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0=
github.com/canonical/cluster-api-bootstrap-provider-microk8s v0.6.0-api.1 h1:t/qqh9l44Ci+aZsk67k5kCv9xrLCD6Le4GfVr5hze8o=
github.com/canonical/cluster-api-bootstrap-provider-microk8s v0.6.0-api.1/go.mod h1:tVGQG1UKgtBqnyO1a50LtnzlvWtYqcZbNmJ4SjEEMnI=
github.com/canonical/cluster-api-bootstrap-provider-microk8s v0.6.9-api h1:wlS8dXLofkWI2rHlgr6U/iviwBXWPl93t/0064uV880=
github.com/canonical/cluster-api-bootstrap-provider-microk8s v0.6.9-api/go.mod h1:U/c+efAG83sqU+L502RgtfS8v7VOYCWEg3LNbJYFQz0=
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
Expand Down
Loading