Skip to content

Commit

Permalink
Bump controller-tools to v0.14.0
Browse files Browse the repository at this point in the history 
https://github.com/kubernetes-sigs/controller-tools/releases/tag/v0.14.0

Signed-off-by: Tom Wieczorek <[email protected]>
  • Loading branch information
@twz123
twz123 committed Jan 12, 2024
1 parent d8ef4c6 commit fb02476
Show file tree
Hide file tree
Showing 7 changed files with 154 additions and 126 deletions.
3 changes: 1 addition & 2 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,7 @@ pkg/apis/autopilot/v1beta2/.controller-gen.stamp: gen_output_dir = autopilot
pkg/apis/%/.controller-gen.stamp: .k0sbuild.docker-image.k0s hack/tools/boilerplate.go.txt hack/tools/Makefile.variables
rm -rf 'static/manifests/$(gen_output_dir)/CustomResourceDefinition'
rm -f -- '$(dir $@)'zz_*.go
CGO_ENABLED=0 $(GO) install sigs.k8s.io/controller-tools/cmd/controller-gen@v$(controller-gen_version)
$(GO_ENV) controller-gen \
CGO_ENABLED=0 $(GO) run sigs.k8s.io/controller-tools/cmd/controller-gen@v$(controller-gen_version) \
crd \
paths="./$(dir $@)..." \
output:crd:artifacts:config=./static/manifests/$(gen_output_dir)/CustomResourceDefinition \
Expand Down
2 changes: 1 addition & 1 deletion hack/tools/Makefile.variables
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
controller-gen_version = 0.13.0
controller-gen_version = 0.14.0
go-bindata_version = 3.23.0+incompatible
golangci-lint_version = 1.55.2
24 changes: 15 additions & 9 deletions ...ic/manifests/autopilot/CustomResourceDefinition/autopilot.k0sproject.io_controlnodes.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.13.0
controller-gen.kubebuilder.io/version: v0.14.0
name: controlnodes.autopilot.k0sproject.io
spec:
group: autopilot.k0sproject.io
Expand All @@ -17,18 +17,24 @@ spec:
- name: v1beta2
schema:
openAPIV3Schema:
description: ControlNode is a node which behaves as a controller, able to
receive autopilot signaling updates.
description: |-
ControlNode is a node which behaves as a controller, able to receive autopilot
signaling updates.
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
Expand Down
74 changes: 40 additions & 34 deletions static/manifests/autopilot/CustomResourceDefinition/autopilot.k0sproject.io_plans.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.13.0
controller-gen.kubebuilder.io/version: v0.14.0
name: plans.autopilot.k0sproject.io
spec:
group: autopilot.k0sproject.io
Expand All @@ -24,27 +24,34 @@ spec:
name: v1beta2
schema:
openAPIV3Schema:
description: Plan provides all details of what to execute as a part of the
plan, and the current status of its execution.
description: |-
Plan provides all details of what to execute as a part of the plan, and
the current status of its execution.
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: Spec defines how the plan behaves.
properties:
commands:
description: Commands are a collection of all of the commands that
need to be executed in order for this plan to transition to Completed.
description: |-
Commands are a collection of all of the commands that need to be executed
in order for this plan to transition to Completed.
items:
description: PlanCommand is a command that can be run within a `Plan`
properties:
Expand All @@ -66,9 +73,9 @@ spec:
required:
- url
type: object
description: Platforms is a map of PlanResourceUrls to platform
identifiers, allowing a single k0s airgap version to have
multiple Url resources based on platform.
description: |-
Platforms is a map of PlanResourceUrls to platform identifiers, allowing a single k0s airgap
version to have multiple Url resources based on platform.
type: object
version:
description: Version is the version that `AirgapUpdate`
Expand Down Expand Up @@ -115,10 +122,9 @@ spec:
properties:
concurrent:
default: 1
description: Concurrent specifies the number of
concurrent target executions that can be performed
within this target. (ie. '2' == at most have 2
execute at the same time)
description: |-
Concurrent specifies the number of concurrent target executions that can be performed
within this target. (ie. '2' == at most have 2 execute at the same time)
type: integer
type: object
required:
Expand Down Expand Up @@ -151,9 +157,9 @@ spec:
required:
- url
type: object
description: Platforms is a map of PlanResourceUrls to platform
identifiers, allowing a single k0s version to have multiple
URL resources based on platform.
description: |-
Platforms is a map of PlanResourceUrls to platform identifiers, allowing a single k0s version
to have multiple URL resources based on platform.
type: object
targets:
description: Targets defines how the controllers/workers
Expand Down Expand Up @@ -201,10 +207,9 @@ spec:
properties:
concurrent:
default: 1
description: Concurrent specifies the number
of concurrent target executions that can be
performed within this target. (ie. '2' ==
at most have 2 execute at the same time)
description: |-
Concurrent specifies the number of concurrent target executions that can be performed
within this target. (ie. '2' == at most have 2 execute at the same time)
type: integer
type: object
required:
Expand Down Expand Up @@ -252,10 +257,9 @@ spec:
properties:
concurrent:
default: 1
description: Concurrent specifies the number
of concurrent target executions that can be
performed within this target. (ie. '2' ==
at most have 2 execute at the same time)
description: |-
Concurrent specifies the number of concurrent target executions that can be performed
within this target. (ie. '2' == at most have 2 execute at the same time)
type: integer
type: object
required:
Expand Down Expand Up @@ -288,8 +292,9 @@ spec:
description: Status is the most recently observed status of the plan.
properties:
commands:
description: Commands are a collection of status's for each of the
commands defined in the plan, maintained in their index order.
description: |-
Commands are a collection of status's for each of the commands defined in the plan,
maintained in their index order.
items:
description: PlanCommandStatus is the status of a known command.
properties:
Expand Down Expand Up @@ -394,9 +399,10 @@ spec:
type: object
type: array
state:
description: State is the current state of the plan. This value typically
mirrors the status of the current command execution to allow for
querying a single field to determine the plan status.
description: |-
State is the current state of the plan. This value typically mirrors the status
of the current command execution to allow for querying a single field to determine
the plan status.
type: string
required:
- commands
Expand Down
48 changes: 24 additions & 24 deletions ...c/manifests/autopilot/CustomResourceDefinition/autopilot.k0sproject.io_updateconfigs.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.13.0
controller-gen.kubebuilder.io/version: v0.14.0
name: updateconfigs.autopilot.k0sproject.io
spec:
group: autopilot.k0sproject.io
Expand All @@ -19,14 +19,19 @@ spec:
openAPIV3Schema:
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
Expand All @@ -42,9 +47,9 @@ spec:
config
properties:
commands:
description: Commands are a collection of all of the commands
that need to be executed in order for this plan to transition
to Completed.
description: |-
Commands are a collection of all of the commands that need to be executed
in order for this plan to transition to Completed.
items:
description: AutopilotPlanCommand is a command that can be run
within a `Plan`
Expand Down Expand Up @@ -95,10 +100,9 @@ spec:
properties:
concurrent:
default: 1
description: Concurrent specifies the number
of concurrent target executions that can be
performed within this target. (ie. '2' ==
at most have 2 execute at the same time)
description: |-
Concurrent specifies the number of concurrent target executions that can be performed
within this target. (ie. '2' == at most have 2 execute at the same time)
type: integer
type: object
required:
Expand Down Expand Up @@ -162,11 +166,9 @@ spec:
properties:
concurrent:
default: 1
description: Concurrent specifies the number
of concurrent target executions that can
be performed within this target. (ie.
'2' == at most have 2 execute at the same
time)
description: |-
Concurrent specifies the number of concurrent target executions that can be performed
within this target. (ie. '2' == at most have 2 execute at the same time)
type: integer
type: object
required:
Expand Down Expand Up @@ -215,11 +217,9 @@ spec:
properties:
concurrent:
default: 1
description: Concurrent specifies the number
of concurrent target executions that can
be performed within this target. (ie.
'2' == at most have 2 execute at the same
time)
description: |-
Concurrent specifies the number of concurrent target executions that can be performed
within this target. (ie. '2' == at most have 2 execute at the same time)
type: integer
type: object
required:
Expand Down
19 changes: 12 additions & 7 deletions static/manifests/helm/CustomResourceDefinition/helm.k0sproject.io_charts.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.13.0
controller-gen.kubebuilder.io/version: v0.14.0
name: charts.helm.k0sproject.io
spec:
group: helm.k0sproject.io
Expand All @@ -20,14 +20,19 @@ spec:
description: Chart is the Schema for the charts 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
Expand Down
Loading

0 comments on commit fb02476

Please sign in to comment.