Skip to content

Commit

Permalink
Bump sigs.k8s.io/controller-tools from 0.10.0 to 0.14.0 (#351)
Browse files Browse the repository at this point in the history
## 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.
  • Loading branch information
mergify[bot] authored Mar 7, 2024
2 parents 5289599 + 9e94253 commit 16c4563
Show file tree
Hide file tree
Showing 8 changed files with 220 additions and 227 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion api/v1beta1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -32,24 +31,32 @@ 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
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.
Expand All @@ -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:
Expand Down
Loading

0 comments on commit 16c4563

Please sign in to comment.