From 9e94253b3c92380719d569f57fcaca5ee91fce7b Mon Sep 17 00:00:00 2001 From: ahreehong <46465244+ahreehong@users.noreply.github.com> Date: Thu, 7 Mar 2024 14:44:42 -0800 Subject: [PATCH] Bump sigs.k8s.io/controller-tools from 0.10.0 to 0.14.0 Signed-off-by: ahreehong <46465244+ahreehong@users.noreply.github.com> --- Makefile | 2 +- api/v1beta1/zz_generated.deepcopy.go | 1 - ...e.cluster.x-k8s.io_tinkerbellclusters.yaml | 74 ++++--- ...e.cluster.x-k8s.io_tinkerbellmachines.yaml | 196 +++++++++--------- ...r.x-k8s.io_tinkerbellmachinetemplates.yaml | 169 +++++++-------- config/default/manager_image_patch.yaml | 2 +- config/rbac/role.yaml | 1 - config/webhook/manifests.yaml | 2 - 8 files changed, 220 insertions(+), 227 deletions(-) diff --git a/Makefile b/Makefile index 185b610d..9e7473c8 100644 --- a/Makefile +++ b/Makefile @@ -49,7 +49,7 @@ BIN_DIR := $(abspath $(ROOT_DIR)/bin) GO_INSTALL = ./scripts/go_install.sh # Binaries. -CONTROLLER_GEN := go run sigs.k8s.io/controller-tools/cmd/controller-gen@v0.10 +CONTROLLER_GEN := go run sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14 GOLANGCI_LINT_VER := v1.54.2 GOLANGCI_LINT_BIN := golangci-lint diff --git a/api/v1beta1/zz_generated.deepcopy.go b/api/v1beta1/zz_generated.deepcopy.go index 23a0ba39..12958b40 100644 --- a/api/v1beta1/zz_generated.deepcopy.go +++ b/api/v1beta1/zz_generated.deepcopy.go @@ -1,5 +1,4 @@ //go:build !ignore_autogenerated -// +build !ignore_autogenerated /* Copyright The Tinkerbell Authors. diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_tinkerbellclusters.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_tinkerbellclusters.yaml index ab0fc371..e2af462e 100644 --- a/config/crd/bases/infrastructure.cluster.x-k8s.io_tinkerbellclusters.yaml +++ b/config/crd/bases/infrastructure.cluster.x-k8s.io_tinkerbellclusters.yaml @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.10.0 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.14.0 name: tinkerbellclusters.infrastructure.cluster.x-k8s.io spec: group: infrastructure.cluster.x-k8s.io @@ -32,14 +31,19 @@ spec: description: TinkerbellCluster is the Schema for the tinkerbellclusters API. properties: 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' + 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 kind: - description: 'Kind is a string value representing the REST resource this - object represents. Servers may infer this from the endpoint the client - submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' + description: |- + Kind is a string value representing the REST resource this object represents. + Servers may infer this from the endpoint the client submits requests to. + Cannot be updated. + In CamelCase. + More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds type: string metadata: type: object @@ -47,9 +51,12 @@ spec: description: TinkerbellClusterSpec defines the desired state of TinkerbellCluster. properties: controlPlaneEndpoint: - description: "ControlPlaneEndpoint is a required field by ClusterAPI - v1beta1. \n See https://cluster-api.sigs.k8s.io/developer/architecture/controllers/cluster.html - for more details." + description: |- + ControlPlaneEndpoint is a required field by ClusterAPI v1beta1. + + + See https://cluster-api.sigs.k8s.io/developer/architecture/controllers/cluster.html + for more details. properties: host: description: The hostname on which the API server is serving. @@ -64,36 +71,35 @@ spec: type: object imageLookupBaseRegistry: default: ghcr.io/tinkerbell/cluster-api-provider-tinkerbell - description: ImageLookupBaseRegistry is the base Registry URL that - is used for pulling images, if not set, the default will be to use - ghcr.io/tinkerbell/cluster-api-provider-tinkerbell. + description: |- + ImageLookupBaseRegistry is the base Registry URL that is used for pulling images, + if not set, the default will be to use ghcr.io/tinkerbell/cluster-api-provider-tinkerbell. type: string imageLookupFormat: - description: 'ImageLookupFormat is the URL naming format to use for - machine images when a machine does not specify. When set, this will - be used for all cluster machines unless a machine specifies a different - ImageLookupFormat. Supports substitutions for {{.BaseRegistry}}, - {{.OSDistro}}, {{.OSVersion}} and {{.KubernetesVersion}} with the - basse URL, OS distribution, OS version, and kubernetes version, - respectively. BaseRegistry will be the value in ImageLookupBaseRegistry - or ghcr.io/tinkerbell/cluster-api-provider-tinkerbell (the default), - OSDistro will be the value in ImageLookupOSDistro or ubuntu (the - default), OSVersion will be the value in ImageLookupOSVersion or - default based on the OSDistro (if known), and the kubernetes version - as defined by the packages produced by kubernetes/release: v1.13.0, - v1.12.5-mybuild.1, or v1.17.3. For example, the default image format - of {{.BaseRegistry}}/{{.OSDistro}}-{{.OSVersion}}:{{.KubernetesVersion}}.gz - will attempt to pull the image from that location. See also: https://golang.org/pkg/text/template/' + description: |- + ImageLookupFormat is the URL naming format to use for machine images when + a machine does not specify. When set, this will be used for all cluster machines + unless a machine specifies a different ImageLookupFormat. Supports substitutions + for {{.BaseRegistry}}, {{.OSDistro}}, {{.OSVersion}} and {{.KubernetesVersion}} with + the basse URL, OS distribution, OS version, and kubernetes version, respectively. + BaseRegistry will be the value in ImageLookupBaseRegistry or ghcr.io/tinkerbell/cluster-api-provider-tinkerbell + (the default), OSDistro will be the value in ImageLookupOSDistro or ubuntu (the default), + OSVersion will be the value in ImageLookupOSVersion or default based on the OSDistro + (if known), and the kubernetes version as defined by the packages produced by + kubernetes/release: v1.13.0, v1.12.5-mybuild.1, or v1.17.3. For example, the default + image format of {{.BaseRegistry}}/{{.OSDistro}}-{{.OSVersion}}:{{.KubernetesVersion}}.gz will + attempt to pull the image from that location. See also: https://golang.org/pkg/text/template/ type: string imageLookupOSDistro: default: ubuntu - description: ImageLookupOSDistro is the name of the OS distro to use - when fetching machine images, if not set it will default to ubuntu. + description: |- + ImageLookupOSDistro is the name of the OS distro to use when fetching machine images, + if not set it will default to ubuntu. type: string imageLookupOSVersion: - description: ImageLookupOSVersion is the version of the OS distribution - to use when fetching machine images. If not set it will default - based on ImageLookupOSDistro. + description: |- + ImageLookupOSVersion is the version of the OS distribution to use when fetching machine + images. If not set it will default based on ImageLookupOSDistro. type: string type: object status: diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_tinkerbellmachines.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_tinkerbellmachines.yaml index 9fcde974..b3eadb1b 100644 --- a/config/crd/bases/infrastructure.cluster.x-k8s.io_tinkerbellmachines.yaml +++ b/config/crd/bases/infrastructure.cluster.x-k8s.io_tinkerbellmachines.yaml @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.10.0 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.14.0 name: tinkerbellmachines.infrastructure.cluster.x-k8s.io spec: group: infrastructure.cluster.x-k8s.io @@ -44,14 +43,19 @@ spec: description: TinkerbellMachine is the Schema for the tinkerbellmachines API. properties: 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' + 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 kind: - description: 'Kind is a string value representing the REST resource this - object represents. Servers may infer this from the endpoint the client - submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' + description: |- + Kind is a string value representing the REST resource this object represents. + Servers may infer this from the endpoint the client submits requests to. + Cannot be updated. + In CamelCase. + More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds type: string metadata: type: object @@ -62,14 +66,13 @@ spec: description: HardwareAffinity allows filtering for hardware. properties: preferred: - description: Preferred are the preferred hardware affinity terms. - Hardware matching these terms are preferred according to the + description: |- + Preferred are the preferred hardware affinity terms. Hardware matching these terms are preferred according to the weights provided, but are not required. items: - description: WeightedHardwareAffinityTerm is a HardwareAffinityTerm - with an associated weight. The weights of all the matched - WeightedHardwareAffinityTerm fields are added per-hardware - to find the most preferred hardware. + description: |- + WeightedHardwareAffinityTerm is a HardwareAffinityTerm with an associated weight. The weights of all the matched + WeightedHardwareAffinityTerm fields are added per-hardware to find the most preferred hardware. properties: hardwareAffinityTerm: description: HardwareAffinityTerm is the term associated @@ -83,26 +86,25 @@ spec: description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a - selector that contains values, a key, and an - operator that relates the key and values. + description: |- + A label selector requirement is a selector that contains values, a key, and an operator that + relates the key and values. properties: key: description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's relationship - to a set of values. Valid operators are - In, NotIn, Exists and DoesNotExist. + description: |- + operator represents a key's relationship to a set of values. + Valid operators are In, NotIn, Exists and DoesNotExist. type: string values: - description: values is an array of string - values. If the operator is In or NotIn, - the values array must be non-empty. If the - operator is Exists or DoesNotExist, the - values array must be empty. This array is - replaced during a strategic merge patch. + description: |- + values is an array of string values. If the operator is In or NotIn, + the values array must be non-empty. If the operator is Exists or DoesNotExist, + the values array must be empty. This array is replaced during a strategic + merge patch. items: type: string type: array @@ -114,12 +116,10 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} - pairs. A single {key,value} in the matchLabels - map is equivalent to an element of matchExpressions, - whose key field is "key", the operator is "In", - and the values array contains only "value". The - requirements are ANDed. + description: |- + matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels + map is equivalent to an element of matchExpressions, whose key field is "key", the + operator is "In", and the values array contains only "value". The requirements are ANDed. type: object type: object x-kubernetes-map-type: atomic @@ -139,9 +139,9 @@ spec: type: object type: array required: - description: Required are the required hardware affinity terms. The - terms are OR'd together, hardware must match one term to be - considered. + description: |- + Required are the required hardware affinity terms. The terms are OR'd together, hardware must match one term to + be considered. items: description: HardwareAffinityTerm is used to select for a particular existing hardware resource. @@ -154,8 +154,8 @@ spec: description: matchExpressions is a list of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement is a selector - that contains values, a key, and an operator that + description: |- + A label selector requirement is a selector that contains values, a key, and an operator that relates the key and values. properties: key: @@ -163,17 +163,16 @@ spec: applies to. type: string operator: - description: operator represents a key's relationship - to a set of values. Valid operators are In, - NotIn, Exists and DoesNotExist. + description: |- + operator represents a key's relationship to a set of values. + Valid operators are In, NotIn, Exists and DoesNotExist. type: string values: - description: values is an array of string values. - If the operator is In or NotIn, the values array - must be non-empty. If the operator is Exists - or DoesNotExist, the values array must be empty. - This array is replaced during a strategic merge - patch. + description: |- + values is an array of string values. If the operator is In or NotIn, + the values array must be non-empty. If the operator is Exists or DoesNotExist, + the values array must be empty. This array is replaced during a strategic + merge patch. items: type: string type: array @@ -185,11 +184,10 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} pairs. - A single {key,value} in the matchLabels map is equivalent - to an element of matchExpressions, whose key field - is "key", the operator is "In", and the values array - contains only "value". The requirements are ANDed. + description: |- + matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels + map is equivalent to an element of matchExpressions, whose key field is "key", the + operator is "In", and the values array contains only "value". The requirements are ANDed. type: object type: object x-kubernetes-map-type: atomic @@ -199,47 +197,46 @@ spec: type: array type: object hardwareName: - description: Those fields are set programmatically, but they cannot - be re-constructed from "state of the world", so we put them in spec - instead of status. + description: |- + Those fields are set programmatically, but they cannot be re-constructed from "state of the world", so + we put them in spec instead of status. type: string imageLookupBaseRegistry: - description: ImageLookupBaseRegistry is the base Registry URL that - is used for pulling images, if not set, the default will be to use - ghcr.io/tinkerbell/cluster-api-provider-tinkerbell. + description: |- + ImageLookupBaseRegistry is the base Registry URL that is used for pulling images, + if not set, the default will be to use ghcr.io/tinkerbell/cluster-api-provider-tinkerbell. type: string imageLookupFormat: - description: 'ImageLookupFormat is the URL naming format to use for - machine images when a machine does not specify. When set, this will - be used for all cluster machines unless a machine specifies a different - ImageLookupFormat. Supports substitutions for {{.BaseRegistry}}, - {{.OSDistro}}, {{.OSVersion}} and {{.KubernetesVersion}} with the - basse URL, OS distribution, OS version, and kubernetes version, - respectively. BaseRegistry will be the value in ImageLookupBaseRegistry - or ghcr.io/tinkerbell/cluster-api-provider-tinkerbell (the default), - OSDistro will be the value in ImageLookupOSDistro or ubuntu (the - default), OSVersion will be the value in ImageLookupOSVersion or - default based on the OSDistro (if known), and the kubernetes version - as defined by the packages produced by kubernetes/release: v1.13.0, - v1.12.5-mybuild.1, or v1.17.3. For example, the default image format - of {{.BaseRegistry}}/{{.OSDistro}}-{{.OSVersion}}:{{.KubernetesVersion}}.gz - will attempt to pull the image from that location. See also: https://golang.org/pkg/text/template/' + description: |- + ImageLookupFormat is the URL naming format to use for machine images when + a machine does not specify. When set, this will be used for all cluster machines + unless a machine specifies a different ImageLookupFormat. Supports substitutions + for {{.BaseRegistry}}, {{.OSDistro}}, {{.OSVersion}} and {{.KubernetesVersion}} with + the basse URL, OS distribution, OS version, and kubernetes version, respectively. + BaseRegistry will be the value in ImageLookupBaseRegistry or ghcr.io/tinkerbell/cluster-api-provider-tinkerbell + (the default), OSDistro will be the value in ImageLookupOSDistro or ubuntu (the default), + OSVersion will be the value in ImageLookupOSVersion or default based on the OSDistro + (if known), and the kubernetes version as defined by the packages produced by + kubernetes/release: v1.13.0, v1.12.5-mybuild.1, or v1.17.3. For example, the default + image format of {{.BaseRegistry}}/{{.OSDistro}}-{{.OSVersion}}:{{.KubernetesVersion}}.gz will + attempt to pull the image from that location. See also: https://golang.org/pkg/text/template/ type: string imageLookupOSDistro: - description: ImageLookupOSDistro is the name of the OS distro to use - when fetching machine images, if not set it will default to ubuntu. + description: |- + ImageLookupOSDistro is the name of the OS distro to use when fetching machine images, + if not set it will default to ubuntu. type: string imageLookupOSVersion: - description: ImageLookupOSVersion is the version of the OS distribution - to use when fetching machine images. If not set it will default - based on ImageLookupOSDistro. + description: |- + ImageLookupOSVersion is the version of the OS distribution to use when fetching machine + images. If not set it will default based on ImageLookupOSDistro. type: string providerID: type: string templateOverride: - description: 'TemplateOverride overrides the default Tinkerbell template - used by CAPT. You can learn more about Tinkerbell templates here: - https://docs.tinkerbell.org/templates/' + description: |- + TemplateOverride overrides the default Tinkerbell template used by CAPT. + You can learn more about Tinkerbell templates here: https://docs.tinkerbell.org/templates/ type: string type: object status: @@ -263,24 +260,31 @@ spec: type: object type: array errorMessage: - description: "ErrorMessage will be set in the event that there is - a terminal problem reconciling the Machine and will contain a more - verbose string suitable for logging and human consumption. \n This - field should not be set for transitive errors that a controller - faces that are expected to be fixed automatically over time (like - service outages), but instead indicate that something is fundamentally - wrong with the Machine's spec or the configuration of the controller, - and that manual intervention is required. Examples of terminal errors - would be invalid combinations of settings in the spec, values that - are unsupported by the controller, or the responsible controller - itself being critically misconfigured. \n Any transient errors that - occur during the reconciliation of Machines can be added as events - to the Machine object and/or logged in the controller's output." + description: |- + ErrorMessage will be set in the event that there is a terminal problem + reconciling the Machine and will contain a more verbose string suitable + for logging and human consumption. + + + This field should not be set for transitive errors that a controller + faces that are expected to be fixed automatically over + time (like service outages), but instead indicate that something is + fundamentally wrong with the Machine's spec or the configuration of + the controller, and that manual intervention is required. Examples + of terminal errors would be invalid combinations of settings in the + spec, values that are unsupported by the controller, or the + responsible controller itself being critically misconfigured. + + + Any transient errors that occur during the reconciliation of Machines + can be added as events to the Machine object and/or logged in the + controller's output. type: string errorReason: - description: Any transient errors that occur during the reconciliation - of Machines can be added as events to the Machine object and/or - logged in the controller's output. + description: |- + Any transient errors that occur during the reconciliation of Machines + can be added as events to the Machine object and/or logged in the + controller's output. type: string instanceStatus: description: InstanceStatus is the status of the Tinkerbell device diff --git a/config/crd/bases/infrastructure.cluster.x-k8s.io_tinkerbellmachinetemplates.yaml b/config/crd/bases/infrastructure.cluster.x-k8s.io_tinkerbellmachinetemplates.yaml index 99e4c0f2..a3677c06 100644 --- a/config/crd/bases/infrastructure.cluster.x-k8s.io_tinkerbellmachinetemplates.yaml +++ b/config/crd/bases/infrastructure.cluster.x-k8s.io_tinkerbellmachinetemplates.yaml @@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.10.0 - creationTimestamp: null + controller-gen.kubebuilder.io/version: v0.14.0 name: tinkerbellmachinetemplates.infrastructure.cluster.x-k8s.io spec: group: infrastructure.cluster.x-k8s.io @@ -24,14 +23,19 @@ spec: API. properties: 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' + 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 kind: - description: 'Kind is a string value representing the REST resource this - object represents. Servers may infer this from the endpoint the client - submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds' + description: |- + Kind is a string value representing the REST resource this object represents. + Servers may infer this from the endpoint the client submits requests to. + Cannot be updated. + In CamelCase. + More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds type: string metadata: type: object @@ -51,14 +55,13 @@ spec: description: HardwareAffinity allows filtering for hardware. properties: preferred: - description: Preferred are the preferred hardware affinity - terms. Hardware matching these terms are preferred according - to the weights provided, but are not required. + description: |- + Preferred are the preferred hardware affinity terms. Hardware matching these terms are preferred according to the + weights provided, but are not required. items: - description: WeightedHardwareAffinityTerm is a HardwareAffinityTerm - with an associated weight. The weights of all the - matched WeightedHardwareAffinityTerm fields are added - per-hardware to find the most preferred hardware. + description: |- + WeightedHardwareAffinityTerm is a HardwareAffinityTerm with an associated weight. The weights of all the matched + WeightedHardwareAffinityTerm fields are added per-hardware to find the most preferred hardware. properties: hardwareAffinityTerm: description: HardwareAffinityTerm is the term associated @@ -73,30 +76,25 @@ spec: of label selector requirements. The requirements are ANDed. items: - description: A label selector requirement - is a selector that contains values, - a key, and an operator that relates - the key and values. + description: |- + A label selector requirement is a selector that contains values, a key, and an operator that + relates the key and values. properties: key: description: key is the label key that the selector applies to. type: string operator: - description: operator represents a - key's relationship to a set of values. - Valid operators are In, NotIn, Exists - and DoesNotExist. + description: |- + operator represents a key's relationship to a set of values. + Valid operators are In, NotIn, Exists and DoesNotExist. type: string values: - description: values is an array of - string values. If the operator is - In or NotIn, the values array must - be non-empty. If the operator is - Exists or DoesNotExist, the values - array must be empty. This array - is replaced during a strategic merge - patch. + description: |- + values is an array of string values. If the operator is In or NotIn, + the values array must be non-empty. If the operator is Exists or DoesNotExist, + the values array must be empty. This array is replaced during a strategic + merge patch. items: type: string type: array @@ -108,12 +106,10 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} - pairs. A single {key,value} in the matchLabels - map is equivalent to an element of matchExpressions, - whose key field is "key", the operator - is "In", and the values array contains - only "value". The requirements are ANDed. + description: |- + matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels + map is equivalent to an element of matchExpressions, whose key field is "key", the + operator is "In", and the values array contains only "value". The requirements are ANDed. type: object type: object x-kubernetes-map-type: atomic @@ -134,9 +130,9 @@ spec: type: object type: array required: - description: Required are the required hardware affinity - terms. The terms are OR'd together, hardware must match - one term to be considered. + description: |- + Required are the required hardware affinity terms. The terms are OR'd together, hardware must match one term to + be considered. items: description: HardwareAffinityTerm is used to select for a particular existing hardware resource. @@ -150,28 +146,24 @@ spec: selector requirements. The requirements are ANDed. items: - description: A label selector requirement - is a selector that contains values, a key, - and an operator that relates the key and - values. + description: |- + A label selector requirement is a selector that contains values, a key, and an operator that + relates the key and values. properties: key: description: key is the label key that the selector applies to. type: string operator: - description: operator represents a key's - relationship to a set of values. Valid - operators are In, NotIn, Exists and - DoesNotExist. + description: |- + operator represents a key's relationship to a set of values. + Valid operators are In, NotIn, Exists and DoesNotExist. type: string values: - description: values is an array of string - values. If the operator is In or NotIn, - the values array must be non-empty. - If the operator is Exists or DoesNotExist, - the values array must be empty. This - array is replaced during a strategic + description: |- + values is an array of string values. If the operator is In or NotIn, + the values array must be non-empty. If the operator is Exists or DoesNotExist, + the values array must be empty. This array is replaced during a strategic merge patch. items: type: string @@ -184,12 +176,10 @@ spec: matchLabels: additionalProperties: type: string - description: matchLabels is a map of {key,value} - pairs. A single {key,value} in the matchLabels - map is equivalent to an element of matchExpressions, - whose key field is "key", the operator is - "In", and the values array contains only "value". - The requirements are ANDed. + description: |- + matchLabels is a map of {key,value} pairs. A single {key,value} in the matchLabels + map is equivalent to an element of matchExpressions, whose key field is "key", the + operator is "In", and the values array contains only "value". The requirements are ANDed. type: object type: object x-kubernetes-map-type: atomic @@ -199,49 +189,46 @@ spec: type: array type: object hardwareName: - description: Those fields are set programmatically, but they - cannot be re-constructed from "state of the world", so we - put them in spec instead of status. + description: |- + Those fields are set programmatically, but they cannot be re-constructed from "state of the world", so + we put them in spec instead of status. type: string imageLookupBaseRegistry: - description: ImageLookupBaseRegistry is the base Registry - URL that is used for pulling images, if not set, the default - will be to use ghcr.io/tinkerbell/cluster-api-provider-tinkerbell. + description: |- + ImageLookupBaseRegistry is the base Registry URL that is used for pulling images, + if not set, the default will be to use ghcr.io/tinkerbell/cluster-api-provider-tinkerbell. type: string imageLookupFormat: - description: 'ImageLookupFormat is the URL naming format to - use for machine images when a machine does not specify. - When set, this will be used for all cluster machines unless - a machine specifies a different ImageLookupFormat. Supports - substitutions for {{.BaseRegistry}}, {{.OSDistro}}, {{.OSVersion}} - and {{.KubernetesVersion}} with the basse URL, OS distribution, - OS version, and kubernetes version, respectively. BaseRegistry - will be the value in ImageLookupBaseRegistry or ghcr.io/tinkerbell/cluster-api-provider-tinkerbell - (the default), OSDistro will be the value in ImageLookupOSDistro - or ubuntu (the default), OSVersion will be the value in - ImageLookupOSVersion or default based on the OSDistro (if - known), and the kubernetes version as defined by the packages - produced by kubernetes/release: v1.13.0, v1.12.5-mybuild.1, - or v1.17.3. For example, the default image format of {{.BaseRegistry}}/{{.OSDistro}}-{{.OSVersion}}:{{.KubernetesVersion}}.gz - will attempt to pull the image from that location. See also: - https://golang.org/pkg/text/template/' + description: |- + ImageLookupFormat is the URL naming format to use for machine images when + a machine does not specify. When set, this will be used for all cluster machines + unless a machine specifies a different ImageLookupFormat. Supports substitutions + for {{.BaseRegistry}}, {{.OSDistro}}, {{.OSVersion}} and {{.KubernetesVersion}} with + the basse URL, OS distribution, OS version, and kubernetes version, respectively. + BaseRegistry will be the value in ImageLookupBaseRegistry or ghcr.io/tinkerbell/cluster-api-provider-tinkerbell + (the default), OSDistro will be the value in ImageLookupOSDistro or ubuntu (the default), + OSVersion will be the value in ImageLookupOSVersion or default based on the OSDistro + (if known), and the kubernetes version as defined by the packages produced by + kubernetes/release: v1.13.0, v1.12.5-mybuild.1, or v1.17.3. For example, the default + image format of {{.BaseRegistry}}/{{.OSDistro}}-{{.OSVersion}}:{{.KubernetesVersion}}.gz will + attempt to pull the image from that location. See also: https://golang.org/pkg/text/template/ type: string imageLookupOSDistro: - description: ImageLookupOSDistro is the name of the OS distro - to use when fetching machine images, if not set it will - default to ubuntu. + description: |- + ImageLookupOSDistro is the name of the OS distro to use when fetching machine images, + if not set it will default to ubuntu. type: string imageLookupOSVersion: - description: ImageLookupOSVersion is the version of the OS - distribution to use when fetching machine images. If not - set it will default based on ImageLookupOSDistro. + description: |- + ImageLookupOSVersion is the version of the OS distribution to use when fetching machine + images. If not set it will default based on ImageLookupOSDistro. type: string providerID: type: string templateOverride: - description: 'TemplateOverride overrides the default Tinkerbell - template used by CAPT. You can learn more about Tinkerbell - templates here: https://docs.tinkerbell.org/templates/' + description: |- + TemplateOverride overrides the default Tinkerbell template used by CAPT. + You can learn more about Tinkerbell templates here: https://docs.tinkerbell.org/templates/ type: string type: object required: diff --git a/config/default/manager_image_patch.yaml b/config/default/manager_image_patch.yaml index 2b3b15c3..af4861aa 100644 --- a/config/default/manager_image_patch.yaml +++ b/config/default/manager_image_patch.yaml @@ -8,5 +8,5 @@ spec: spec: containers: # Change the value of image field below to your controller image URL - - image: ghcr.io/tinkerbell/cluster-api-provider-tinkerbell-amd64:dev + - image: ghcr.io/tinkerbell/cluster-api-provider-tinkerbell:dev name: manager diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml index c0188b0f..13e5b967 100644 --- a/config/rbac/role.yaml +++ b/config/rbac/role.yaml @@ -2,7 +2,6 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: - creationTimestamp: null name: manager-role rules: - apiGroups: diff --git a/config/webhook/manifests.yaml b/config/webhook/manifests.yaml index efc7ce17..12f241f0 100644 --- a/config/webhook/manifests.yaml +++ b/config/webhook/manifests.yaml @@ -2,7 +2,6 @@ apiVersion: admissionregistration.k8s.io/v1 kind: MutatingWebhookConfiguration metadata: - creationTimestamp: null name: mutating-webhook-configuration webhooks: - admissionReviewVersions: @@ -31,7 +30,6 @@ webhooks: apiVersion: admissionregistration.k8s.io/v1 kind: ValidatingWebhookConfiguration metadata: - creationTimestamp: null name: validating-webhook-configuration webhooks: - admissionReviewVersions: