Skip to content

Commit a373eec

Browse files
Merge pull request #63 from canonical/eaudetcobello/KU-1189
companion to canonical/cluster-api-bootstrap-provider-microk8s#109
2 parents afea4a0 + e4260ad commit a373eec

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

config/crd/bases/controlplane.cluster.x-k8s.io_microk8scontrolplanes.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,9 @@ spec:
120120
- classic
121121
- strict
122122
type: string
123+
disableDefaultCNI:
124+
description: Whether or not to use the default CNI
125+
type: boolean
123126
extraKubeletArgs:
124127
description: ExtraKubeletArgs is a list of extra arguments
125128
to add to the kubelet.

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/canonical/cluster-api-control-plane-provider-microk8s
33
go 1.21
44

55
require (
6-
github.com/canonical/cluster-api-bootstrap-provider-microk8s v0.6.0-api.1
6+
github.com/canonical/cluster-api-bootstrap-provider-microk8s v0.6.9-api
77
github.com/onsi/ginkgo v1.16.5
88
github.com/onsi/gomega v1.22.1
99
k8s.io/api v0.25.3

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,8 @@ github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnweb
8181
github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM=
8282
github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ=
8383
github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0=
84-
github.com/canonical/cluster-api-bootstrap-provider-microk8s v0.6.0-api.1 h1:t/qqh9l44Ci+aZsk67k5kCv9xrLCD6Le4GfVr5hze8o=
85-
github.com/canonical/cluster-api-bootstrap-provider-microk8s v0.6.0-api.1/go.mod h1:tVGQG1UKgtBqnyO1a50LtnzlvWtYqcZbNmJ4SjEEMnI=
84+
github.com/canonical/cluster-api-bootstrap-provider-microk8s v0.6.9-api h1:wlS8dXLofkWI2rHlgr6U/iviwBXWPl93t/0064uV880=
85+
github.com/canonical/cluster-api-bootstrap-provider-microk8s v0.6.9-api/go.mod h1:U/c+efAG83sqU+L502RgtfS8v7VOYCWEg3LNbJYFQz0=
8686
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
8787
github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
8888
github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=

0 commit comments

Comments
 (0)