karmada-io
/
karmada
mirror of https://github.com/karmada-io/karmada.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4315 from zhzhuang-zju/crdgen 

generate Embedded ObjectMeta in the CRDs
This commit is contained in:
karmada-bot 2023-12-13 17:31:10 +08:00 committed by GitHub
parent 85a905f955 798f9169fe
commit a777c3a450
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 63 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
charts/karmada-operator/crds/operator.karmada.io_karmadas.yaml
View File

@ -252,6 +252,23 @@ spec:
that will be copied into the PVC when creating that will be copied into the PVC when creating
it. No other fields are allowed and will be it. No other fields are allowed and will be
rejected during validation. rejected during validation.
properties:
annotations:
additionalProperties:
type: string
type: object
finalizers:
items:
type: string
type: array
labels:
additionalProperties:
type: string
type: object
name:
type: string
namespace:
type: string
type: object type: object
spec: spec:
description: The specification for the PersistentVolumeClaim. description: The specification for the PersistentVolumeClaim.

3
hack/update-crdgen.sh
View File

@ -33,4 +33,5 @@ controller-gen crd paths=./pkg/apis/work/... output:crd:dir=./charts/karmada/_cr
controller-gen crd paths=./pkg/apis/autoscaling/... output:crd:dir=./charts/karmada/_crds/bases/autoscaling controller-gen crd paths=./pkg/apis/autoscaling/... output:crd:dir=./charts/karmada/_crds/bases/autoscaling
controller-gen crd paths=./pkg/apis/networking/... output:crd:dir=./charts/karmada/_crds/bases/networking controller-gen crd paths=./pkg/apis/networking/... output:crd:dir=./charts/karmada/_crds/bases/networking
controller-gen crd paths=./examples/customresourceinterpreter/apis/... output:crd:dir=./examples/customresourceinterpreter/apis/ controller-gen crd paths=./examples/customresourceinterpreter/apis/... output:crd:dir=./examples/customresourceinterpreter/apis/
controller-gen crd paths=./operator/pkg/apis/operator/... output:crd:dir=./charts/karmada-operator/crds controller-gen crd:generateEmbeddedObjectMeta=true paths=./operator/pkg/apis/operator/... output:crd:dir=./charts/karmada-operator/crds
controller-gen crd:generateEmbeddedObjectMeta=true paths=./operator/pkg/apis/operator/... output:crd:dir=./operator/config/crds

67
operator/config/crds/operator.karmada.io_karmadas.yaml
View File

@ -135,7 +135,8 @@ spec:
defined in spec.resourceClaims, that are used by defined in spec.resourceClaims, that are used by
this container. \n This is an alpha field and requires this container. \n This is an alpha field and requires
enabling the DynamicResourceAllocation feature gate. enabling the DynamicResourceAllocation feature gate.
\n This field is immutable." \n This field is immutable. It can only be set for
containers."
items: items:
description: ResourceClaim references one entry description: ResourceClaim references one entry
in PodSpec.ResourceClaims. in PodSpec.ResourceClaims.
@ -174,7 +175,8 @@ spec:
of compute resources required. If Requests is omitted of compute resources required. If Requests is omitted
for a container, it defaults to Limits if that is for a container, it defaults to Limits if that is
explicitly specified, otherwise to an implementation-defined explicitly specified, otherwise to an implementation-defined
value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' value. Requests cannot exceed Limits. More info:
https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
type: object type: object
type: object type: object
serverCertSANs: serverCertSANs:
@ -211,7 +213,7 @@ spec:
specified here and the sum of memory limits specified here and the sum of memory limits
of all containers in a pod. The default is nil of all containers in a pod. The default is nil
which means that the limit is undefined. More which means that the limit is undefined. More
info: http://kubernetes.io/docs/user-guide/volumes#emptydir' info: https://kubernetes.io/docs/concepts/storage/volumes#emptydir'
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$ pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true x-kubernetes-int-or-string: true
type: object type: object
@ -250,6 +252,23 @@ spec:
that will be copied into the PVC when creating that will be copied into the PVC when creating
it. No other fields are allowed and will be it. No other fields are allowed and will be
rejected during validation. rejected during validation.
properties:
annotations:
additionalProperties:
type: string
type: object
finalizers:
items:
type: string
type: array
labels:
additionalProperties:
type: string
type: object
name:
type: string
namespace:
type: string
type: object type: object
spec: spec:
description: The specification for the PersistentVolumeClaim. description: The specification for the PersistentVolumeClaim.
@ -385,7 +404,8 @@ spec:
that are used by this container. \n that are used by this container. \n
This is an alpha field and requires This is an alpha field and requires
enabling the DynamicResourceAllocation enabling the DynamicResourceAllocation
feature gate. \n This field is immutable." feature gate. \n This field is immutable.
It can only be set for containers."
items: items:
description: ResourceClaim references description: ResourceClaim references
one entry in PodSpec.ResourceClaims. one entry in PodSpec.ResourceClaims.
@ -427,7 +447,8 @@ spec:
If Requests is omitted for a container, If Requests is omitted for a container,
it defaults to Limits if that is explicitly it defaults to Limits if that is explicitly
specified, otherwise to an implementation-defined specified, otherwise to an implementation-defined
value. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' value. Requests cannot exceed Limits.
More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
type: object type: object
type: object type: object
selector: selector:
@ -580,7 +601,7 @@ spec:
in spec.resourceClaims, that are used by this container. in spec.resourceClaims, that are used by this container.
\n This is an alpha field and requires enabling the \n This is an alpha field and requires enabling the
DynamicResourceAllocation feature gate. \n This field DynamicResourceAllocation feature gate. \n This field
is immutable." is immutable. It can only be set for containers."
items: items:
description: ResourceClaim references one entry in PodSpec.ResourceClaims. description: ResourceClaim references one entry in PodSpec.ResourceClaims.
properties: properties:
@ -618,7 +639,7 @@ spec:
compute resources required. If Requests is omitted for compute resources required. If Requests is omitted for
a container, it defaults to Limits if that is explicitly a container, it defaults to Limits if that is explicitly
specified, otherwise to an implementation-defined value. specified, otherwise to an implementation-defined value.
More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' Requests cannot exceed Limits. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
type: object type: object
type: object type: object
serviceSubnet: serviceSubnet:
@ -706,7 +727,7 @@ spec:
in spec.resourceClaims, that are used by this container. in spec.resourceClaims, that are used by this container.
\n This is an alpha field and requires enabling the \n This is an alpha field and requires enabling the
DynamicResourceAllocation feature gate. \n This field DynamicResourceAllocation feature gate. \n This field
is immutable." is immutable. It can only be set for containers."
items: items:
description: ResourceClaim references one entry in PodSpec.ResourceClaims. description: ResourceClaim references one entry in PodSpec.ResourceClaims.
properties: properties:
@ -744,7 +765,7 @@ spec:
compute resources required. If Requests is omitted for compute resources required. If Requests is omitted for
a container, it defaults to Limits if that is explicitly a container, it defaults to Limits if that is explicitly
specified, otherwise to an implementation-defined value. specified, otherwise to an implementation-defined value.
More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' Requests cannot exceed Limits. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
type: object type: object
type: object type: object
type: object type: object
@ -835,7 +856,7 @@ spec:
in spec.resourceClaims, that are used by this container. in spec.resourceClaims, that are used by this container.
\n This is an alpha field and requires enabling the \n This is an alpha field and requires enabling the
DynamicResourceAllocation feature gate. \n This field DynamicResourceAllocation feature gate. \n This field
is immutable." is immutable. It can only be set for containers."
items: items:
description: ResourceClaim references one entry in PodSpec.ResourceClaims. description: ResourceClaim references one entry in PodSpec.ResourceClaims.
properties: properties:
@ -873,7 +894,7 @@ spec:
compute resources required. If Requests is omitted for compute resources required. If Requests is omitted for
a container, it defaults to Limits if that is explicitly a container, it defaults to Limits if that is explicitly
specified, otherwise to an implementation-defined value. specified, otherwise to an implementation-defined value.
More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' Requests cannot exceed Limits. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
type: object type: object
type: object type: object
type: object type: object
@ -940,7 +961,7 @@ spec:
in spec.resourceClaims, that are used by this container. in spec.resourceClaims, that are used by this container.
\n This is an alpha field and requires enabling the \n This is an alpha field and requires enabling the
DynamicResourceAllocation feature gate. \n This field DynamicResourceAllocation feature gate. \n This field
is immutable." is immutable. It can only be set for containers."
items: items:
description: ResourceClaim references one entry in PodSpec.ResourceClaims. description: ResourceClaim references one entry in PodSpec.ResourceClaims.
properties: properties:
@ -978,7 +999,7 @@ spec:
compute resources required. If Requests is omitted for compute resources required. If Requests is omitted for
a container, it defaults to Limits if that is explicitly a container, it defaults to Limits if that is explicitly
specified, otherwise to an implementation-defined value. specified, otherwise to an implementation-defined value.
More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' Requests cannot exceed Limits. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
type: object type: object
type: object type: object
type: object type: object
@ -1045,7 +1066,7 @@ spec:
in spec.resourceClaims, that are used by this container. in spec.resourceClaims, that are used by this container.
\n This is an alpha field and requires enabling the \n This is an alpha field and requires enabling the
DynamicResourceAllocation feature gate. \n This field DynamicResourceAllocation feature gate. \n This field
is immutable." is immutable. It can only be set for containers."
items: items:
description: ResourceClaim references one entry in PodSpec.ResourceClaims. description: ResourceClaim references one entry in PodSpec.ResourceClaims.
properties: properties:
@ -1083,7 +1104,7 @@ spec:
compute resources required. If Requests is omitted for compute resources required. If Requests is omitted for
a container, it defaults to Limits if that is explicitly a container, it defaults to Limits if that is explicitly
specified, otherwise to an implementation-defined value. specified, otherwise to an implementation-defined value.
More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' Requests cannot exceed Limits. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
type: object type: object
type: object type: object
type: object type: object
@ -1157,7 +1178,7 @@ spec:
in spec.resourceClaims, that are used by this container. in spec.resourceClaims, that are used by this container.
\n This is an alpha field and requires enabling the \n This is an alpha field and requires enabling the
DynamicResourceAllocation feature gate. \n This field DynamicResourceAllocation feature gate. \n This field
is immutable." is immutable. It can only be set for containers."
items: items:
description: ResourceClaim references one entry in PodSpec.ResourceClaims. description: ResourceClaim references one entry in PodSpec.ResourceClaims.
properties: properties:
@ -1195,7 +1216,7 @@ spec:
compute resources required. If Requests is omitted for compute resources required. If Requests is omitted for
a container, it defaults to Limits if that is explicitly a container, it defaults to Limits if that is explicitly
specified, otherwise to an implementation-defined value. specified, otherwise to an implementation-defined value.
More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' Requests cannot exceed Limits. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
type: object type: object
type: object type: object
type: object type: object
@ -1262,7 +1283,7 @@ spec:
in spec.resourceClaims, that are used by this container. in spec.resourceClaims, that are used by this container.
\n This is an alpha field and requires enabling the \n This is an alpha field and requires enabling the
DynamicResourceAllocation feature gate. \n This field DynamicResourceAllocation feature gate. \n This field
is immutable." is immutable. It can only be set for containers."
items: items:
description: ResourceClaim references one entry in PodSpec.ResourceClaims. description: ResourceClaim references one entry in PodSpec.ResourceClaims.
properties: properties:
@ -1300,7 +1321,7 @@ spec:
compute resources required. If Requests is omitted for compute resources required. If Requests is omitted for
a container, it defaults to Limits if that is explicitly a container, it defaults to Limits if that is explicitly
specified, otherwise to an implementation-defined value. specified, otherwise to an implementation-defined value.
More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' Requests cannot exceed Limits. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
type: object type: object
type: object type: object
type: object type: object
@ -1367,7 +1388,7 @@ spec:
in spec.resourceClaims, that are used by this container. in spec.resourceClaims, that are used by this container.
\n This is an alpha field and requires enabling the \n This is an alpha field and requires enabling the
DynamicResourceAllocation feature gate. \n This field DynamicResourceAllocation feature gate. \n This field
is immutable." is immutable. It can only be set for containers."
items: items:
description: ResourceClaim references one entry in PodSpec.ResourceClaims. description: ResourceClaim references one entry in PodSpec.ResourceClaims.
properties: properties:
@ -1405,7 +1426,7 @@ spec:
compute resources required. If Requests is omitted for compute resources required. If Requests is omitted for
a container, it defaults to Limits if that is explicitly a container, it defaults to Limits if that is explicitly
specified, otherwise to an implementation-defined value. specified, otherwise to an implementation-defined value.
More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' Requests cannot exceed Limits. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
type: object type: object
type: object type: object
type: object type: object
@ -1515,7 +1536,7 @@ spec:
in spec.resourceClaims, that are used by this container. in spec.resourceClaims, that are used by this container.
\n This is an alpha field and requires enabling the \n This is an alpha field and requires enabling the
DynamicResourceAllocation feature gate. \n This field DynamicResourceAllocation feature gate. \n This field
is immutable." is immutable. It can only be set for containers."
items: items:
description: ResourceClaim references one entry in PodSpec.ResourceClaims. description: ResourceClaim references one entry in PodSpec.ResourceClaims.
properties: properties:
@ -1553,7 +1574,7 @@ spec:
compute resources required. If Requests is omitted for compute resources required. If Requests is omitted for
a container, it defaults to Limits if that is explicitly a container, it defaults to Limits if that is explicitly
specified, otherwise to an implementation-defined value. specified, otherwise to an implementation-defined value.
More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/' Requests cannot exceed Limits. More info: https://kubernetes.io/docs/concepts/configuration/manage-resources-containers/'
type: object type: object
type: object type: object
type: object type: object