From 4603d515e57ac9fe5b4229d5a9a5fd6a60ec1379 Mon Sep 17 00:00:00 2001 From: Angelos Kolaitis Date: Tue, 13 Feb 2024 22:30:47 +0200 Subject: [PATCH] Update bootstrap provider to v0.6.0-api.1 --- ...luster.x-k8s.io_microk8scontrolplanes.yaml | 21 +++++++++++++++++++ control-plane-components.yaml | 21 +++++++++++++++++++ go.mod | 2 +- go.sum | 4 ++-- 4 files changed, 45 insertions(+), 3 deletions(-) diff --git a/config/crd/bases/controlplane.cluster.x-k8s.io_microk8scontrolplanes.yaml b/config/crd/bases/controlplane.cluster.x-k8s.io_microk8scontrolplanes.yaml index bbf89c0..da51cfd 100644 --- a/config/crd/bases/controlplane.cluster.x-k8s.io_microk8scontrolplanes.yaml +++ b/config/crd/bases/controlplane.cluster.x-k8s.io_microk8scontrolplanes.yaml @@ -107,6 +107,13 @@ spec: schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' type: string + bootCommands: + description: BootCommands is a list of commands to run during + boot. These will be injected into the `bootcmd` section + of cloud-init. + items: + type: string + type: array confinement: description: The confinement (strict or classic) configuration enum: @@ -168,6 +175,20 @@ spec: noProxy: description: The optional no proxy configuration type: string + postRunCommands: + description: PostRunCommands is a list of commands to run + after installing MicroK8s. These will be injected into the + `runcmd` section of cloud-init. + items: + type: string + type: array + preRunCommands: + description: PreRunCommands is a list of commands to run before + installing MicroK8s. These will be injected into the `runcmd` + section of cloud-init. + items: + type: string + type: array riskLevel: default: stable description: The risk-level (stable, candidate, beta, or edge) diff --git a/control-plane-components.yaml b/control-plane-components.yaml index 08a6e10..71e070c 100644 --- a/control-plane-components.yaml +++ b/control-plane-components.yaml @@ -117,6 +117,13 @@ spec: schemas to the latest internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources' type: string + bootCommands: + description: BootCommands is a list of commands to run during + boot. These will be injected into the `bootcmd` section + of cloud-init. + items: + type: string + type: array confinement: description: The confinement (strict or classic) configuration enum: @@ -178,6 +185,20 @@ spec: noProxy: description: The optional no proxy configuration type: string + postRunCommands: + description: PostRunCommands is a list of commands to run + after installing MicroK8s. These will be injected into the + `runcmd` section of cloud-init. + items: + type: string + type: array + preRunCommands: + description: PreRunCommands is a list of commands to run before + installing MicroK8s. These will be injected into the `runcmd` + section of cloud-init. + items: + type: string + type: array riskLevel: default: stable description: The risk-level (stable, candidate, beta, or edge) diff --git a/go.mod b/go.mod index ee11919..1796a2e 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module github.com/canonical/cluster-api-control-plane-provider-microk8s go 1.19 require ( - github.com/canonical/cluster-api-bootstrap-provider-microk8s v0.6.0-api.0 + github.com/canonical/cluster-api-bootstrap-provider-microk8s v0.6.0-api.1 github.com/onsi/ginkgo v1.16.5 github.com/onsi/gomega v1.22.1 k8s.io/api v0.25.3 diff --git a/go.sum b/go.sum index 0ccae4e..ccbc643 100644 --- a/go.sum +++ b/go.sum @@ -74,8 +74,8 @@ github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdn github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM= 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.0 h1:Je1Xhpztxwj05O5LnkwiklFu0mR1CpAEgci6Ld2IiPI= -github.com/canonical/cluster-api-bootstrap-provider-microk8s v0.6.0-api.0/go.mod h1:tVGQG1UKgtBqnyO1a50LtnzlvWtYqcZbNmJ4SjEEMnI= +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/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=