Skip to content

Commit e6cfd78

Browse files
authored
Merge pull request #64 from canonical/eaudetcobello/bump-bootstrap-provider
bump bootstrap provider to v0.6.9 and generate manifests
2 parents a373eec + 205e66e commit e6cfd78

File tree

4 files changed

+14
-3
lines changed

4 files changed

+14
-3
lines changed

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,10 @@ spec:
216216
snapstoreProxyId:
217217
description: The snap store proxy ID
218218
type: string
219+
snapstoreProxyScheme:
220+
description: The snap store proxy domain's scheme, e.g. "http"
221+
or "https" without "://" Defaults to "http".
222+
type: string
219223
type: object
220224
type: object
221225
machineTemplate:

control-plane-components.yaml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,9 @@ spec:
130130
- classic
131131
- strict
132132
type: string
133+
disableDefaultCNI:
134+
description: Whether or not to use the default CNI
135+
type: boolean
133136
extraKubeletArgs:
134137
description: ExtraKubeletArgs is a list of extra arguments
135138
to add to the kubelet.
@@ -223,6 +226,10 @@ spec:
223226
snapstoreProxyId:
224227
description: The snap store proxy ID
225228
type: string
229+
snapstoreProxyScheme:
230+
description: The snap store proxy domain's scheme, e.g. "http"
231+
or "https" without "://" Defaults to "http".
232+
type: string
226233
type: object
227234
type: object
228235
machineTemplate:

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.9-api
6+
github.com/canonical/cluster-api-bootstrap-provider-microk8s v0.6.9
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.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=
84+
github.com/canonical/cluster-api-bootstrap-provider-microk8s v0.6.9 h1:j9r6uqoyIchT9Yz/WEjib8vXY7sS+IRdiC6eYRD5ht4=
85+
github.com/canonical/cluster-api-bootstrap-provider-microk8s v0.6.9/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)