diff --git a/apis/v1beta1/microk8sconfig_types.go b/apis/v1beta1/microk8sconfig_types.go index 752e088..4eed55c 100644 --- a/apis/v1beta1/microk8sconfig_types.go +++ b/apis/v1beta1/microk8sconfig_types.go @@ -73,13 +73,13 @@ type InitConfiguration struct { // The confinement (strict or classic) configuration // +optional // +kubebuilder:validation:Enum=classic;strict - Confinement string `json:"Confinement,omitempty"` + Confinement string `json:"confinement,omitempty"` // The risk-level (stable, candidate, beta, or edge) for the snaps // +optional // +kubebuilder:validation:Enum=stable;candidate;beta;edge // +kubebuilder:default:=stable - RiskLevel string `json:"RiskLevel,omitempty"` + RiskLevel string `json:"riskLevel,omitempty"` // ExtraWriteFiles is a list of extra files to inject with cloud-init. // +optional diff --git a/bootstrap-components.yaml b/bootstrap-components.yaml index 58f9ee2..df9b726 100644 --- a/bootstrap-components.yaml +++ b/bootstrap-components.yaml @@ -57,24 +57,9 @@ spec: type: object initConfiguration: properties: - Confinement: - description: The confinement (strict or classic) configuration - enum: - - classic - - strict - type: string IPinIP: description: The optional IPinIP configuration type: boolean - RiskLevel: - default: stable - description: The risk-level (stable, candidate, beta, or edge) for the snaps - enum: - - stable - - candidate - - beta - - edge - type: string addons: description: List of addons to be enabled upon cluster creation items: @@ -83,6 +68,12 @@ spec: apiVersion: description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized 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 + confinement: + description: The confinement (strict or classic) configuration + enum: + - classic + - strict + type: string extraKubeletArgs: description: ExtraKubeletArgs is a list of extra arguments to add to the kubelet. items: @@ -130,6 +121,15 @@ spec: noProxy: description: The optional no proxy configuration type: string + riskLevel: + default: stable + description: The risk-level (stable, candidate, beta, or edge) for the snaps + enum: + - stable + - candidate + - beta + - edge + type: string type: object type: object status: @@ -250,24 +250,9 @@ spec: type: object initConfiguration: properties: - Confinement: - description: The confinement (strict or classic) configuration - enum: - - classic - - strict - type: string IPinIP: description: The optional IPinIP configuration type: boolean - RiskLevel: - default: stable - description: The risk-level (stable, candidate, beta, or edge) for the snaps - enum: - - stable - - candidate - - beta - - edge - type: string addons: description: List of addons to be enabled upon cluster creation items: @@ -276,6 +261,12 @@ spec: apiVersion: description: 'APIVersion defines the versioned schema of this representation of an object. Servers should convert recognized 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 + confinement: + description: The confinement (strict or classic) configuration + enum: + - classic + - strict + type: string extraKubeletArgs: description: ExtraKubeletArgs is a list of extra arguments to add to the kubelet. items: @@ -323,6 +314,15 @@ spec: noProxy: description: The optional no proxy configuration type: string + riskLevel: + default: stable + description: The risk-level (stable, candidate, beta, or edge) for the snaps + enum: + - stable + - candidate + - beta + - edge + type: string type: object type: object type: object diff --git a/config/crd/bases/bootstrap.cluster.x-k8s.io_microk8sconfigs.yaml b/config/crd/bases/bootstrap.cluster.x-k8s.io_microk8sconfigs.yaml index 625b10b..097f69e 100644 --- a/config/crd/bases/bootstrap.cluster.x-k8s.io_microk8sconfigs.yaml +++ b/config/crd/bases/bootstrap.cluster.x-k8s.io_microk8sconfigs.yaml @@ -61,25 +61,9 @@ spec: type: object initConfiguration: properties: - Confinement: - description: The confinement (strict or classic) configuration - enum: - - classic - - strict - type: string IPinIP: description: The optional IPinIP configuration type: boolean - RiskLevel: - default: stable - description: The risk-level (stable, candidate, beta, or edge) - for the snaps - enum: - - stable - - candidate - - beta - - edge - type: string addons: description: List of addons to be enabled upon cluster creation items: @@ -91,6 +75,12 @@ 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 + confinement: + description: The confinement (strict or classic) configuration + enum: + - classic + - strict + type: string extraKubeletArgs: description: ExtraKubeletArgs is a list of extra arguments to add to the kubelet. @@ -145,6 +135,16 @@ spec: noProxy: description: The optional no proxy configuration type: string + riskLevel: + default: stable + description: The risk-level (stable, candidate, beta, or edge) + for the snaps + enum: + - stable + - candidate + - beta + - edge + type: string type: object type: object status: diff --git a/config/crd/bases/bootstrap.cluster.x-k8s.io_microk8sconfigtemplates.yaml b/config/crd/bases/bootstrap.cluster.x-k8s.io_microk8sconfigtemplates.yaml index 9cc6bde..c285a34 100644 --- a/config/crd/bases/bootstrap.cluster.x-k8s.io_microk8sconfigtemplates.yaml +++ b/config/crd/bases/bootstrap.cluster.x-k8s.io_microk8sconfigtemplates.yaml @@ -67,25 +67,9 @@ spec: type: object initConfiguration: properties: - Confinement: - description: The confinement (strict or classic) configuration - enum: - - classic - - strict - type: string IPinIP: description: The optional IPinIP configuration type: boolean - RiskLevel: - default: stable - description: The risk-level (stable, candidate, beta, - or edge) for the snaps - enum: - - stable - - candidate - - beta - - edge - type: string addons: description: List of addons to be enabled upon cluster creation @@ -98,6 +82,12 @@ spec: convert recognized 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 + confinement: + description: The confinement (strict or classic) configuration + enum: + - classic + - strict + type: string extraKubeletArgs: description: ExtraKubeletArgs is a list of extra arguments to add to the kubelet. @@ -153,6 +143,16 @@ spec: noProxy: description: The optional no proxy configuration type: string + riskLevel: + default: stable + description: The risk-level (stable, candidate, beta, + or edge) for the snaps + enum: + - stable + - candidate + - beta + - edge + type: string type: object type: object type: object