Skip to content

Commit

Permalink
fix: controller-gen panic on go 1.22 (apecloud#7456)
Browse files Browse the repository at this point in the history
  • Loading branch information
sophon-zt authored Jun 11, 2024
1 parent 4549949 commit 322d1b5
Show file tree
Hide file tree
Showing 56 changed files with 73,339 additions and 80,496 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,7 @@ ENVTEST ?= $(LOCALBIN)/setup-envtest

## Tool Versions
KUSTOMIZE_VERSION ?= v5.1.1
CONTROLLER_TOOLS_VERSION ?= v0.12.1
CONTROLLER_TOOLS_VERSION ?= v0.14.0
CUE_VERSION ?= v0.4.3

KUSTOMIZE_INSTALL_SCRIPT ?= "$(GITHUB_PROXY)https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"
Expand Down
10 changes: 6 additions & 4 deletions apis/apps/v1alpha1/zz_generated.deepcopy.go

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

1 change: 0 additions & 1 deletion apis/apps/v1beta1/zz_generated.deepcopy.go

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

1 change: 0 additions & 1 deletion apis/dataprotection/v1alpha1/zz_generated.deepcopy.go

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

1 change: 0 additions & 1 deletion apis/experimental/v1alpha1/zz_generated.deepcopy.go

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

1 change: 0 additions & 1 deletion apis/extensions/v1alpha1/zz_generated.deepcopy.go

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

1 change: 0 additions & 1 deletion apis/storage/v1alpha1/zz_generated.deepcopy.go

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

1 change: 0 additions & 1 deletion apis/workloads/legacy/zz_generated.deepcopy.go

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

1 change: 0 additions & 1 deletion apis/workloads/v1alpha1/zz_generated.deepcopy.go

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

723 changes: 354 additions & 369 deletions config/crd/bases/apps.kubeblocks.io_backuppolicytemplates.yaml

Large diffs are not rendered by default.

8,169 changes: 3,849 additions & 4,320 deletions config/crd/bases/apps.kubeblocks.io_clusterdefinitions.yaml

Large diffs are not rendered by default.

13,107 changes: 5,875 additions & 7,232 deletions config/crd/bases/apps.kubeblocks.io_clusters.yaml

Large diffs are not rendered by default.

2,694 changes: 1,276 additions & 1,418 deletions config/crd/bases/apps.kubeblocks.io_clusterversions.yaml

Large diffs are not rendered by default.

13,845 changes: 7,248 additions & 6,597 deletions config/crd/bases/apps.kubeblocks.io_componentdefinitions.yaml

Large diffs are not rendered by default.

5,453 changes: 2,646 additions & 2,807 deletions config/crd/bases/apps.kubeblocks.io_components.yaml

Large diffs are not rendered by default.

56 changes: 33 additions & 23 deletions config/crd/bases/apps.kubeblocks.io_componentversions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
kind: CustomResourceDefinition
metadata:
annotations:
controller-gen.kubebuilder.io/version: v0.12.1
controller-gen.kubebuilder.io/version: v0.14.0
labels:
app.kubernetes.io/name: kubeblocks
name: componentversions.apps.kubeblocks.io
Expand Down Expand Up @@ -37,14 +37,19 @@ spec:
description: ComponentVersion is the Schema for the componentversions 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 All @@ -59,11 +64,16 @@ spec:
between a set of component definitions and a set of releases.
properties:
compDefs:
description: "CompDefs specifies names for the component definitions
associated with this ComponentVersion. Each name in the list
can represent an exact name, or a name prefix. \n For example:
\n - \"mysql-8.0.30-v1alpha1\": Matches the exact name \"mysql-8.0.30-v1alpha1\"
- \"mysql-8.0.30\": Matches all names starting with \"mysql-8.0.30\""
description: |-
CompDefs specifies names for the component definitions associated with this ComponentVersion.
Each name in the list can represent an exact name, or a name prefix.
For example:
- "mysql-8.0.30-v1alpha1": Matches the exact name "mysql-8.0.30-v1alpha1"
- "mysql-8.0.30": Matches all names starting with "mysql-8.0.30"
items:
type: string
maxItems: 128
Expand Down Expand Up @@ -110,17 +120,17 @@ spec:
- message: Image name may not exceed maximum length of 256 characters
rule: self.all(key, size(self[key]) <= 256)
name:
description: Name is a unique identifier for this release. Cannot
be updated.
description: |-
Name is a unique identifier for this release.
Cannot be updated.
maxLength: 32
type: string
serviceVersion:
description: ServiceVersion defines the version of the well-known
service that the component provides. The version should follow
the syntax and semantics of the "Semantic Versioning" specification
(http://semver.org/). If the release is used, it will serve
as the service version for component instances, overriding
the one defined in the component definition. Cannot be updated.
description: |-
ServiceVersion defines the version of the well-known service that the component provides.
The version should follow the syntax and semantics of the "Semantic Versioning" specification (http://semver.org/).
If the release is used, it will serve as the service version for component instances, overriding the one defined in the component definition.
Cannot be updated.
maxLength: 32
type: string
required:
Expand All @@ -147,9 +157,9 @@ spec:
format: int64
type: integer
phase:
description: Phase valid values are ``, `Available`, 'Unavailable`.
Available is ComponentVersion become available, and can be used
for co-related objects.
description: |-
Phase valid values are ``, `Available`, 'Unavailable`.
Available is ComponentVersion become available, and can be used for co-related objects.
enum:
- Available
- Unavailable
Expand Down
Loading

0 comments on commit 322d1b5

Please sign in to comment.