Skip to content

Commit

Permalink
Merge pull request rancher#45504 from jakefhyde/45503-bump-controller…
Browse files Browse the repository at this point in the history
…-gen

45503 bump controller gen
  • Loading branch information
jakefhyde authored May 18, 2024
2 parents 1437306 + d8fceaf commit 989139e
Show file tree
Hide file tree
Showing 10 changed files with 254 additions and 222 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/verify-generated-code-changes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
run: ./.github/scripts/check-for-go-mod-changes.sh
-
name: Install controller-gen
run: go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.12.0
run: go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.14.0
-
name: Verify auto-generated changes
run: ./.github/scripts/check-for-auto-generated-changes.sh
2 changes: 1 addition & 1 deletion Dockerfile.dapper
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ RUN if [ "${ARCH}" == "amd64" ]; then \
fi

# Tool for CRD generation.
ENV CONTROLLER_GEN_VERSION v0.12.0
ENV CONTROLLER_GEN_VERSION v0.14.0
RUN go install sigs.k8s.io/controller-tools/cmd/controller-gen@${CONTROLLER_GEN_VERSION}

# YAML processor for release configuration.
Expand Down
29 changes: 18 additions & 11 deletions pkg/crds/yaml/generated/catalog.cattle.io_uiplugins.yaml
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.12.0
controller-gen.kubebuilder.io/version: v0.14.0
name: uiplugins.catalog.cattle.io
spec:
group: catalog.cattle.io
Expand All @@ -29,14 +29,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 @@ -60,13 +65,15 @@ spec:
type: string
noAuth:
default: false
description: NoAuth a flag that tells if the plugin should be
accessible without authentication. Defaults to false.
description: |-
NoAuth a flag that tells if the plugin should be accessible without authentication.
Defaults to false.
type: boolean
noCache:
default: false
description: NoCache a flag that tells if the plugin should be
cached or not. Defaults to false.
description: |-
NoCache a flag that tells if the plugin should be cached or not.
Defaults to false.
type: boolean
version:
description: Version of the plugin.
Expand Down
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.12.0
controller-gen.kubebuilder.io/version: v0.14.0
name: clusterproxyconfigs.management.cattle.io
spec:
group: management.cattle.io
Expand All @@ -17,24 +17,28 @@ spec:
- name: v3
schema:
openAPIV3Schema:
description: ClusterProxyConfig determines which downstream requests will
be proxied to the downstream cluster for requests that contain service account
tokens. Objects of this type are created in the namespace of the target
cluster. If no object exists, the feature will be disabled by default.
description: |-
ClusterProxyConfig determines which downstream requests will be proxied to the downstream cluster for requests that contain service account tokens.
Objects of this type are created in the namespace of the target cluster. If no object exists, the feature will be disabled by default.
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
enabled:
description: Enabled indicates whether downstream proxy requests for service
account tokens is enabled.
type: boolean
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
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.12.0
controller-gen.kubebuilder.io/version: v0.14.0
name: clusterroletemplatebindings.management.cattle.io
spec:
group: management.cattle.io
Expand All @@ -17,17 +17,21 @@ spec:
- name: v3
schema:
openAPIV3Schema:
description: ClusterRoleTemplateBinding is the object representing membership
of a subject in a cluster with permissions specified by a given role template.
description: |-
ClusterRoleTemplateBinding is the object representing membership of a subject in a cluster with permissions
specified by a given role template.
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
clusterName:
description: ClusterName is the metadata.name of the cluster to which
a subject is added. Must match the namespace. Immutable.
description: |-
ClusterName is the metadata.name of the cluster to which a subject is added.
Must match the namespace. Immutable.
type: string
groupName:
description: GroupName is the name of the group subject added to the cluster.
Expand All @@ -38,9 +42,12 @@ spec:
added to the cluster. Immutable.
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
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.12.0
controller-gen.kubebuilder.io/version: v0.14.0
name: globalrolebindings.management.cattle.io
spec:
group: management.cattle.io
Expand All @@ -20,9 +20,11 @@ spec:
description: GlobalRoleBinding binds a given subject user or group to a GlobalRole.
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
globalRoleName:
description: GlobalRoleName is the name of the Global Role that the subject
Expand All @@ -33,9 +35,12 @@ spec:
to be bound. Immutable.
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 989139e

Please sign in to comment.