Skip to content

Commit 16c4563

Browse files
authored
Bump sigs.k8s.io/controller-tools from 0.10.0 to 0.14.0 (#351)
## Description Bumps [sigs.k8s.io/controller-tools](https://github.com/kubernetes-sigs/controller-tools) from 0.10.0 to 0.14.0. ## Why is this needed EKS-Anywhere needs to use a newer version of controller-gen that includes this [fix](kubernetes-sigs/controller-tools#402) so that it will not populate `creationTimestamp: null` in the generated manifests.
2 parents 5289599 + 9e94253 commit 16c4563

8 files changed

+220
-227
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ BIN_DIR := $(abspath $(ROOT_DIR)/bin)
4949
GO_INSTALL = ./scripts/go_install.sh
5050

5151
# Binaries.
52-
CONTROLLER_GEN := go run sigs.k8s.io/controller-tools/cmd/controller-gen@v0.10
52+
CONTROLLER_GEN := go run sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14
5353

5454
GOLANGCI_LINT_VER := v1.54.2
5555
GOLANGCI_LINT_BIN := golangci-lint

api/v1beta1/zz_generated.deepcopy.go

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

config/crd/bases/infrastructure.cluster.x-k8s.io_tinkerbellclusters.yaml

Lines changed: 40 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.10.0
7-
creationTimestamp: null
6+
controller-gen.kubebuilder.io/version: v0.14.0
87
name: tinkerbellclusters.infrastructure.cluster.x-k8s.io
98
spec:
109
group: infrastructure.cluster.x-k8s.io
@@ -32,24 +31,32 @@ spec:
3231
description: TinkerbellCluster is the Schema for the tinkerbellclusters API.
3332
properties:
3433
apiVersion:
35-
description: 'APIVersion defines the versioned schema of this representation
36-
of an object. Servers should convert recognized schemas to the latest
37-
internal value, and may reject unrecognized values. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources'
34+
description: |-
35+
APIVersion defines the versioned schema of this representation of an object.
36+
Servers should convert recognized schemas to the latest internal value, and
37+
may reject unrecognized values.
38+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#resources
3839
type: string
3940
kind:
40-
description: 'Kind is a string value representing the REST resource this
41-
object represents. Servers may infer this from the endpoint the client
42-
submits requests to. Cannot be updated. In CamelCase. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
41+
description: |-
42+
Kind is a string value representing the REST resource this object represents.
43+
Servers may infer this from the endpoint the client submits requests to.
44+
Cannot be updated.
45+
In CamelCase.
46+
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
4347
type: string
4448
metadata:
4549
type: object
4650
spec:
4751
description: TinkerbellClusterSpec defines the desired state of TinkerbellCluster.
4852
properties:
4953
controlPlaneEndpoint:
50-
description: "ControlPlaneEndpoint is a required field by ClusterAPI
51-
v1beta1. \n See https://cluster-api.sigs.k8s.io/developer/architecture/controllers/cluster.html
52-
for more details."
54+
description: |-
55+
ControlPlaneEndpoint is a required field by ClusterAPI v1beta1.
56+
57+
58+
See https://cluster-api.sigs.k8s.io/developer/architecture/controllers/cluster.html
59+
for more details.
5360
properties:
5461
host:
5562
description: The hostname on which the API server is serving.
@@ -64,36 +71,35 @@ spec:
6471
type: object
6572
imageLookupBaseRegistry:
6673
default: ghcr.io/tinkerbell/cluster-api-provider-tinkerbell
67-
description: ImageLookupBaseRegistry is the base Registry URL that
68-
is used for pulling images, if not set, the default will be to use
69-
ghcr.io/tinkerbell/cluster-api-provider-tinkerbell.
74+
description: |-
75+
ImageLookupBaseRegistry is the base Registry URL that is used for pulling images,
76+
if not set, the default will be to use ghcr.io/tinkerbell/cluster-api-provider-tinkerbell.
7077
type: string
7178
imageLookupFormat:
72-
description: 'ImageLookupFormat is the URL naming format to use for
73-
machine images when a machine does not specify. When set, this will
74-
be used for all cluster machines unless a machine specifies a different
75-
ImageLookupFormat. Supports substitutions for {{.BaseRegistry}},
76-
{{.OSDistro}}, {{.OSVersion}} and {{.KubernetesVersion}} with the
77-
basse URL, OS distribution, OS version, and kubernetes version,
78-
respectively. BaseRegistry will be the value in ImageLookupBaseRegistry
79-
or ghcr.io/tinkerbell/cluster-api-provider-tinkerbell (the default),
80-
OSDistro will be the value in ImageLookupOSDistro or ubuntu (the
81-
default), OSVersion will be the value in ImageLookupOSVersion or
82-
default based on the OSDistro (if known), and the kubernetes version
83-
as defined by the packages produced by kubernetes/release: v1.13.0,
84-
v1.12.5-mybuild.1, or v1.17.3. For example, the default image format
85-
of {{.BaseRegistry}}/{{.OSDistro}}-{{.OSVersion}}:{{.KubernetesVersion}}.gz
86-
will attempt to pull the image from that location. See also: https://golang.org/pkg/text/template/'
79+
description: |-
80+
ImageLookupFormat is the URL naming format to use for machine images when
81+
a machine does not specify. When set, this will be used for all cluster machines
82+
unless a machine specifies a different ImageLookupFormat. Supports substitutions
83+
for {{.BaseRegistry}}, {{.OSDistro}}, {{.OSVersion}} and {{.KubernetesVersion}} with
84+
the basse URL, OS distribution, OS version, and kubernetes version, respectively.
85+
BaseRegistry will be the value in ImageLookupBaseRegistry or ghcr.io/tinkerbell/cluster-api-provider-tinkerbell
86+
(the default), OSDistro will be the value in ImageLookupOSDistro or ubuntu (the default),
87+
OSVersion will be the value in ImageLookupOSVersion or default based on the OSDistro
88+
(if known), and the kubernetes version as defined by the packages produced by
89+
kubernetes/release: v1.13.0, v1.12.5-mybuild.1, or v1.17.3. For example, the default
90+
image format of {{.BaseRegistry}}/{{.OSDistro}}-{{.OSVersion}}:{{.KubernetesVersion}}.gz will
91+
attempt to pull the image from that location. See also: https://golang.org/pkg/text/template/
8792
type: string
8893
imageLookupOSDistro:
8994
default: ubuntu
90-
description: ImageLookupOSDistro is the name of the OS distro to use
91-
when fetching machine images, if not set it will default to ubuntu.
95+
description: |-
96+
ImageLookupOSDistro is the name of the OS distro to use when fetching machine images,
97+
if not set it will default to ubuntu.
9298
type: string
9399
imageLookupOSVersion:
94-
description: ImageLookupOSVersion is the version of the OS distribution
95-
to use when fetching machine images. If not set it will default
96-
based on ImageLookupOSDistro.
100+
description: |-
101+
ImageLookupOSVersion is the version of the OS distribution to use when fetching machine
102+
images. If not set it will default based on ImageLookupOSDistro.
97103
type: string
98104
type: object
99105
status:

0 commit comments

Comments
 (0)