Skip to content

Commit

Permalink
fix: upgrade controller-gen to v0.14.0
Browse files Browse the repository at this point in the history 
Signed-off-by: Tom <[email protected]>
  • Loading branch information
@Flying-Tom
Flying-Tom committed Aug 5, 2024
1 parent 1b03ae6 commit 3ad5018
Show file tree
Hide file tree
Showing 12 changed files with 3,620 additions and 3,937 deletions.
2 changes: 1 addition & 1 deletion Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ gen-crd: init-codegen ## Generate WebhookConfiguration, ClusterRole and CustomRe
hack/update-crdgen.sh


PACKAGE := kurator.dev
PACKAGE := kurator.dev/kurator
GOPATH_SHIM := ${PWD}/.gopath
PACKAGE_SHIM := $(GOPATH_SHIM)/src/$(PACKAGE)

Expand Down
2 changes: 1 addition & 1 deletion Makefile.tools.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ informer-gen@v := k8s.io/code-generator/cmd/[email protected]
lister-gen@v := k8s.io/code-generator/cmd/[email protected]
register-gen@v := k8s.io/code-generator/cmd/[email protected]
deepcopy-gen@v := k8s.io/code-generator/cmd/[email protected]
controller-gen@v := sigs.k8s.io/controller-tools/cmd/controller-gen@v0.8.0
controller-gen@v := sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0
kustomize@v := sigs.k8s.io/kustomize/kustomize/[email protected]
jb@v := github.com/jsonnet-bundler/jsonnet-bundler/cmd/[email protected]
gojsontoyaml@v := github.com/brancz/[email protected]
Expand Down
31 changes: 15 additions & 16 deletions manifests/charts/cluster-operator/crds/cluster.kurator.dev_attachedclusters.yaml
View file
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.8.0
creationTimestamp: null
controller-gen.kubebuilder.io/version: v0.14.0
name: attachedclusters.cluster.kurator.dev
spec:
group: cluster.kurator.dev
Expand All @@ -29,14 +28,19 @@ spec:
not created by kurator.
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 @@ -48,8 +52,9 @@ spec:
properties:
key:
default: value
description: Key is the key of the secret. If no key is specified,
the secret's default key is `value`.
description: |-
Key is the key of the secret.
If no key is specified, the secret's default key is `value`.
type: string
name:
description: Name is the name of the secret.
Expand All @@ -71,9 +76,3 @@ spec:
storage: true
subresources:
status: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []
169 changes: 91 additions & 78 deletions manifests/charts/cluster-operator/crds/cluster.kurator.dev_clusters.yaml
View file

Large diffs are not rendered by default.

120 changes: 64 additions & 56 deletions manifests/charts/cluster-operator/crds/infrastructure.cluster.x-k8s.io_customclusters.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.8.0
creationTimestamp: null
controller-gen.kubebuilder.io/version: v0.14.0
labels:
cluster.x-k8s.io/v1beta1: v1alpha1
name: customclusters.infrastructure.cluster.x-k8s.io
Expand All @@ -30,14 +29,19 @@ spec:
of Cluster 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 Expand Up @@ -69,9 +73,9 @@ spec:
type: string
type: array
loadBalancerDomainName:
description: LoadBalancerDomainName is a variable used to set
the endpoint for a Kubernetes cluster when a load balancer (LB)
is enabled. The default value is ControlPlaneConfig.Address.
description: |-
LoadBalancerDomainName is a variable used to set the endpoint for a Kubernetes cluster
when a load balancer (LB) is enabled. The default value is ControlPlaneConfig.Address.
type: string
required:
- address
Expand All @@ -84,44 +88,53 @@ spec:
description: API version of the referent.
type: string
fieldPath:
description: 'If referring to a piece of an object instead of
an entire object, this string should contain a valid JSON/Go
field access statement, such as desiredState.manifest.containers[2].
For example, if the object reference is to a container within
a pod, this would take on a value like: "spec.containers{name}"
(where "name" refers to the name of the container that triggered
the event) or if no container name is specified "spec.containers[2]"
(container with index 2 in this pod). This syntax is chosen
only to have some well-defined way of referencing a part of
an object. TODO: this design is not final and this field is
subject to change in the future.'
description: |-
If referring to a piece of an object instead of an entire object, this string
should contain a valid JSON/Go field access statement, such as desiredState.manifest.containers[2].
For example, if the object reference is to a container within a pod, this would take on a value like:
"spec.containers{name}" (where "name" refers to the name of the container that triggered
the event) or if no container name is specified "spec.containers[2]" (container with
index 2 in this pod). This syntax is chosen only to have some well-defined way of
referencing a part of an object.
TODO: this design is not final and this field is subject to change in the future.
type: string
kind:
description: 'Kind of the referent. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds'
description: |-
Kind of the referent.
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#types-kinds
type: string
name:
description: 'Name of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names'
description: |-
Name of the referent.
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
type: string
namespace:
description: 'Namespace of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/'
description: |-
Namespace of the referent.
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/namespaces/
type: string
resourceVersion:
description: 'Specific resourceVersion to which this reference
is made, if any. More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency'
description: |-
Specific resourceVersion to which this reference is made, if any.
More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#concurrency-control-and-consistency
type: string
uid:
description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
description: |-
UID of the referent.
More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids
type: string
type: object
x-kubernetes-map-type: atomic
required:
- cni
type: object
status:
description: Current status of the kurator cluster
properties:
apiEndpoint:
description: 'APIEndpoint is the endpoint to communicate with the
apiserver. Format should be: `https://host:port`'
description: |-
APIEndpoint is the endpoint to communicate with the apiserver.
Format should be: `https://host:port`
type: string
conditions:
description: Conditions defines current service state of the cluster.
Expand All @@ -130,37 +143,37 @@ spec:
operational state.
properties:
lastTransitionTime:
description: Last time the condition transitioned from one status
to another. This should be when the underlying condition changed.
If that is not known, then using the time when the API field
changed is acceptable.
description: |-
Last time the condition transitioned from one status to another.
This should be when the underlying condition changed. If that is not known, then using the time when
the API field changed is acceptable.
format: date-time
type: string
message:
description: A human readable message indicating details about
the transition. This field may be empty.
description: |-
A human readable message indicating details about the transition.
This field may be empty.
type: string
reason:
description: The reason for the condition's last transition
in CamelCase. The specific API may choose whether or not this
field is considered a guaranteed API. This field may not be
empty.
description: |-
The reason for the condition's last transition in CamelCase.
The specific API may choose whether or not this field is considered a guaranteed API.
This field may not be empty.
type: string
severity:
description: Severity provides an explicit classification of
Reason code, so the users or machines can immediately understand
the current situation and act accordingly. The Severity field
MUST be set only when Status=False.
description: |-
Severity provides an explicit classification of Reason code, so the users or machines can immediately
understand the current situation and act accordingly.
The Severity field MUST be set only when Status=False.
type: string
status:
description: Status of the condition, one of True, False, Unknown.
type: string
type:
description: Type of condition in CamelCase or in foo.example.com/CamelCase.
Many .condition.type values are consistent across resources
like Available, but because arbitrary conditions can be useful
(see .node.status.conditions), the ability to deconflict is
important.
description: |-
Type of condition in CamelCase or in foo.example.com/CamelCase.
Many .condition.type values are consistent across resources like Available, but because arbitrary conditions
can be useful (see .node.status.conditions), the ability to deconflict is important.
type: string
required:
- lastTransitionTime
Expand All @@ -173,7 +186,8 @@ spec:
the credential to access this cluster.
type: string
phase:
description: Phase represents the current phase of customCluster actuation.
description: |-
Phase represents the current phase of customCluster actuation.
E.g. Running, Succeed, Terminating, Failed etc.
type: string
type: object
Expand All @@ -182,9 +196,3 @@ spec:
storage: true
subresources:
status: {}
status:
acceptedNames:
kind: ""
plural: ""
conditions: []
storedVersions: []
Loading

0 comments on commit 3ad5018

Please sign in to comment.