update hack/update-codegen

Signed-off-by: Iceber Gu <[email protected]>

Author: Iceber

hack/tools.go

@@ -1,9 +1,11 @@
-//+build tools
+//go:build tools
+// +build tools
 
 package hack
 
 import (
 	_ "k8s.io/code-generator"
+	_ "k8s.io/kube-openapi/cmd/openapi-gen"
 	_ "k8s.io/kubernetes/cmd/preferredimports"
 	_ "sigs.k8s.io/controller-tools/cmd/controller-gen"
 )

hack/update-codegen.sh

@@ -13,7 +13,7 @@ GO111MODULE=on go install k8s.io/code-generator/cmd/conversion-gen
 GO111MODULE=on go install k8s.io/code-generator/cmd/client-gen
 GO111MODULE=on go install k8s.io/code-generator/cmd/lister-gen
 GO111MODULE=on go install k8s.io/code-generator/cmd/informer-gen
-GO111MODULE=on go install k8s.io/code-generator/cmd/openapi-gen
+GO111MODULE=on go install k8s.io/kube-openapi/cmd/openapi-gen
 
 GOPATH=$(go env GOPATH | awk -F ':' '{print $1}')
 export PATH=$PATH:$GOPATH/bin
@@ -29,26 +29,26 @@ cd "${API_ROOT}"
 echo "Generating with deepcopy-gen"
 deepcopy-gen \
     --go-header-file="${REPO_ROOT}/hack/boilerplate.go.txt" \
-    --input-dirs="./cluster/v1alpha2" \
-    --output-file-base="zz_generated.deepcopy"
+    --bounding-dirs="cluster/v1alpha2" \
+    --output-file="zz_generated.deepcopy.go"
 deepcopy-gen \
     --go-header-file="${REPO_ROOT}/hack/boilerplate.go.txt" \
-    --input-dirs="./policy/v1alpha1" \
-    --output-file-base="zz_generated.deepcopy"
+    --bounding-dirs="policy/v1alpha1" \
+    --output-file="zz_generated.deepcopy.go"
 deepcopy-gen \
     --go-header-file="${REPO_ROOT}/hack/boilerplate.go.txt" \
-    --input-dirs="./clusterpedia/v1beta1" \
-    --output-file-base="zz_generated.deepcopy"
+    --bounding-dirs="clusterpedia/v1beta1" \
+    --output-file="zz_generated.deepcopy.go"
 deepcopy-gen \
     --go-header-file="${REPO_ROOT}/hack/boilerplate.go.txt" \
-    --input-dirs="./clusterpedia" \
-    --output-file-base="zz_generated.deepcopy"
+    --bounding-dirs="clusterpedia" \
+    --output-file="zz_generated.deepcopy.go"
 
 echo "Generating with conversion-gen"
 conversion-gen \
     --go-header-file="${REPO_ROOT}/hack/boilerplate.go.txt" \
-    --input-dirs="./clusterpedia/v1beta1" \
-    --output-file-base="zz_generated.conversion"
+    --base-peer-dirs="./clusterpedia/v1beta1" \
+    --output-file="zz_generated.conversion.go"
 
 echo "change directory: ${REPO_ROOT}"
 cd "${REPO_ROOT}"
@@ -74,30 +74,35 @@ client-gen \
     --go-header-file="hack/boilerplate.go.txt" \
     --input-base="github.com/clusterpedia-io/api" \
     --input="cluster/v1alpha2,policy/v1alpha1" \
-    --output-package="github.com/clusterpedia-io/clusterpedia/pkg/generated/clientset" \
+    --output-dir="pkg/generated/clientset" \
+    --output-pkg="github.com/clusterpedia-io/clusterpedia/pkg/generated/clientset" \
     --clientset-name="versioned" \
     --plural-exceptions="ClusterSyncResources:ClusterSyncResources"
 
 echo "Generating with lister-gen"
 lister-gen \
     --go-header-file="hack/boilerplate.go.txt" \
-    --input-dirs="github.com/clusterpedia-io/api/cluster/v1alpha2,github.com/clusterpedia-io/api/policy/v1alpha1" \
-    --output-package="github.com/clusterpedia-io/clusterpedia/pkg/generated/listers" \
-    --plural-exceptions="ClusterSyncResources:ClusterSyncResources"
+    --output-dir="pkg/generated/listers" \
+    --output-pkg="github.com/clusterpedia-io/clusterpedia/pkg/generated/listers" \
+    --plural-exceptions="ClusterSyncResources:ClusterSyncResources" \
+    github.com/clusterpedia-io/api/cluster/v1alpha2 github.com/clusterpedia-io/api/policy/v1alpha1
+
 
 echo "Generating with informer-gen"
 informer-gen \
     --go-header-file="hack/boilerplate.go.txt" \
-    --input-dirs="github.com/clusterpedia-io/api/cluster/v1alpha2,github.com/clusterpedia-io/api/policy/v1alpha1" \
     --versioned-clientset-package="github.com/clusterpedia-io/clusterpedia/pkg/generated/clientset/versioned" \
     --listers-package="github.com/clusterpedia-io/clusterpedia/pkg/generated/listers" \
-    --output-package="github.com/clusterpedia-io/clusterpedia/pkg/generated/informers" \
-    --plural-exceptions="ClusterSyncResources:ClusterSyncResources"
+    --output-dir="pkg/generated/informers" \
+    --output-pkg="github.com/clusterpedia-io/clusterpedia/pkg/generated/informers" \
+    --plural-exceptions="ClusterSyncResources:ClusterSyncResources" \
+    github.com/clusterpedia-io/api/cluster/v1alpha2 github.com/clusterpedia-io/api/policy/v1alpha1
 
 echo "Generating with openapi-gen"
 openapi-gen \
-    --go-header-file hack/boilerplate.go.txt \
-    --input-dirs="github.com/clusterpedia-io/clusterpedia/pkg/apis/pedia/v1alpha1,github.com/clusterpedia-io/api/cluster/v1alpha2,github.com/clusterpedia-io/api/policy/v1alpha1,github.com/clusterpedia-io/api/clusterpedia/v1beta1" \
-    --input-dirs "k8s.io/apimachinery/pkg/apis/meta/v1,k8s.io/apimachinery/pkg/runtime,k8s.io/apimachinery/pkg/version" \
-    --output-package=github.com/clusterpedia-io/clusterpedia/pkg/generated/openapi \
-    -O zz_generated.openapi
+    --go-header-file="hack/boilerplate.go.txt" \
+    --output-dir="pkg/generated/openapi" \
+    --output-pkg="github.com/clusterpedia-io/clusterpedia/pkg/generated/openapi" \
+    --output-file="zz_generated.openapi.go" \
+    github.com/clusterpedia-io/api/cluster/v1alpha2 github.com/clusterpedia-io/api/policy/v1alpha1 github.com/clusterpedia-io/api/clusterpedia/v1beta1 \
+    k8s.io/apimachinery/pkg/apis/meta/v1 k8s.io/apimachinery/pkg/runtime k8s.io/apimachinery/pkg/version

kustomize/crds/cluster.clusterpedia.io_clustersyncresources.yaml

@@ -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.15.0
   name: clustersyncresources.cluster.clusterpedia.io
 spec:
   group: cluster.clusterpedia.io
@@ -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

kustomize/crds/cluster.clusterpedia.io_pediaclusters.yaml

@@ -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.15.0
   name: pediaclusters.cluster.clusterpedia.io
 spec:
   group: cluster.clusterpedia.io
@@ -45,14 +45,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
@@ -110,42 +115,42 @@ spec:
               conditions:
                 items:
                   description: "Condition contains details for one aspect of the current
-                    state of this API Resource. --- This struct is intended for direct
-                    use as an array at the field path .status.conditions.  For example,
-                    \n type FooStatus struct{ // Represents the observations of a
-                    foo's current state. // Known .status.conditions.type are: \"Available\",
-                    \"Progressing\", and \"Degraded\" // +patchMergeKey=type // +patchStrategy=merge
-                    // +listType=map // +listMapKey=type Conditions []metav1.Condition
-                    `json:\"conditions,omitempty\" patchStrategy:\"merge\" patchMergeKey:\"type\"
-                    protobuf:\"bytes,1,rep,name=conditions\"` \n // other fields }"
+                    state of this API Resource.\n---\nThis struct is intended for
+                    direct use as an array at the field path .status.conditions.  For
+                    example,\n\n\n\ttype FooStatus struct{\n\t    // Represents the
+                    observations of a foo's current state.\n\t    // Known .status.conditions.type
+                    are: \"Available\", \"Progressing\", and \"Degraded\"\n\t    //
+                    +patchMergeKey=type\n\t    // +patchStrategy=merge\n\t    // +listType=map\n\t
+                    \   // +listMapKey=type\n\t    Conditions []metav1.Condition `json:\"conditions,omitempty\"
+                    patchStrategy:\"merge\" patchMergeKey:\"type\" protobuf:\"bytes,1,rep,name=conditions\"`\n\n\n\t
+                    \   // other fields\n\t}"
                   properties:
                     lastTransitionTime:
-                      description: lastTransitionTime is the 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: |-
+                        lastTransitionTime is the 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: message is a human readable message indicating
-                        details about the transition. This may be an empty string.
+                      description: |-
+                        message is a human readable message indicating details about the transition.
+                        This may be an empty string.
                       maxLength: 32768
                       type: string
                     observedGeneration:
-                      description: observedGeneration represents the .metadata.generation
-                        that the condition was set based upon. For instance, if .metadata.generation
-                        is currently 12, but the .status.conditions[x].observedGeneration
-                        is 9, the condition is out of date with respect to the current
-                        state of the instance.
+                      description: |-
+                        observedGeneration represents the .metadata.generation that the condition was set based upon.
+                        For instance, if .metadata.generation is currently 12, but the .status.conditions[x].observedGeneration is 9, the condition is out of date
+                        with respect to the current state of the instance.
                       format: int64
                       minimum: 0
                       type: integer
                     reason:
-                      description: reason contains a programmatic identifier indicating
-                        the reason for the condition's last transition. Producers
-                        of specific condition types may define expected values and
-                        meanings for this field, and whether the values are considered
-                        a guaranteed API. The value should be a CamelCase string.
+                      description: |-
+                        reason contains a programmatic identifier indicating the reason for the condition's last transition.
+                        Producers of specific condition types may define expected values and meanings for this field,
+                        and whether the values are considered a guaranteed API.
+                        The value should be a CamelCase string.
                         This field may not be empty.
                       maxLength: 1024
                       minLength: 1
@@ -159,11 +164,12 @@ spec:
                       - 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. The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
+                      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.
+                        The regex it matches is (dns1123SubdomainFmt/)?(qualifiedNameFmt)
                       maxLength: 316
                       pattern: ^([a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*/)?(([A-Za-z0-9][-A-Za-z0-9_.]*)?[A-Za-z0-9])$
                       type: string