diff --git a/federation/apis/federation/types.go b/federation/apis/federation/types.go index 1ef540a9c79..0e0aeb38f76 100644 --- a/federation/apis/federation/types.go +++ b/federation/apis/federation/types.go @@ -91,8 +91,8 @@ type ClusterStatus struct { Region string } -// +genclient=true -// +nonNamespaced=true +// +genclient +// +genclient:nonNamespaced // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // Information about a registered cluster in a federated kubernetes setup. Clusters are not namespaced and have unique names in the federation. diff --git a/federation/apis/federation/v1beta1/types.go b/federation/apis/federation/v1beta1/types.go index 8454a4cd92b..7451438a7dc 100644 --- a/federation/apis/federation/v1beta1/types.go +++ b/federation/apis/federation/v1beta1/types.go @@ -92,9 +92,9 @@ type ClusterStatus struct { Region string `json:"region,omitempty" protobuf:"bytes,6,opt,name=region"` } -// +genclient=true +// +genclient // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object -// +nonNamespaced=true +// +genclient:nonNamespaced // Information about a registered cluster in a federated kubernetes setup. Clusters are not namespaced and have unique names in the federation. type Cluster struct { diff --git a/pkg/api/types.go b/pkg/api/types.go index 8dcd21e1580..f44dd8b83a5 100644 --- a/pkg/api/types.go +++ b/pkg/api/types.go @@ -415,8 +415,8 @@ const ( AlphaStorageNodeAffinityAnnotation = "volume.alpha.kubernetes.io/node-affinity" ) -// +genclient=true -// +nonNamespaced=true +// +genclient +// +genclient:nonNamespaced // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type PersistentVolume struct { @@ -493,7 +493,7 @@ type PersistentVolumeList struct { Items []PersistentVolume } -// +genclient=true +// +genclient // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // PersistentVolumeClaim is a user's request for and claim to a persistent volume @@ -2377,7 +2377,7 @@ type PodStatusResult struct { Status PodStatus } -// +genclient=true +// +genclient // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // Pod is a collection of containers, used as either input (create, update) or as output (list, get). @@ -2407,7 +2407,7 @@ type PodTemplateSpec struct { Spec PodSpec } -// +genclient=true +// +genclient // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // PodTemplate describes a template for creating copies of a predefined pod. @@ -2515,7 +2515,7 @@ type ReplicationControllerCondition struct { Message string } -// +genclient=true +// +genclient // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // ReplicationController represents the configuration of a replication controller. @@ -2750,7 +2750,7 @@ type ServicePort struct { NodePort int32 } -// +genclient=true +// +genclient // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // Service is a named abstraction of software service (for example, mysql) consisting of local port @@ -2770,7 +2770,7 @@ type Service struct { Status ServiceStatus } -// +genclient=true +// +genclient // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // ServiceAccount binds together: @@ -2808,7 +2808,7 @@ type ServiceAccountList struct { Items []ServiceAccount } -// +genclient=true +// +genclient // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // Endpoints is a collection of endpoints that implement the actual service. Example: @@ -3150,8 +3150,8 @@ const ( // ResourceList is a set of (resource name, quantity) pairs. type ResourceList map[ResourceName]resource.Quantity -// +genclient=true -// +nonNamespaced=true +// +genclient +// +genclient:nonNamespaced // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // Node is a worker node in Kubernetes @@ -3213,8 +3213,8 @@ const ( NamespaceTerminating NamespacePhase = "Terminating" ) -// +genclient=true -// +nonNamespaced=true +// +genclient +// +genclient:nonNamespaced // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // A namespace provides a scope for Names. @@ -3532,7 +3532,7 @@ const ( EventTypeWarning string = "Warning" ) -// +genclient=true +// +genclient // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // Event is a report of an event somewhere in the cluster. @@ -3641,7 +3641,7 @@ type LimitRangeSpec struct { Limits []LimitRangeItem } -// +genclient=true +// +genclient // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // LimitRange sets resource usage limits for each kind of resource in a Namespace @@ -3734,7 +3734,7 @@ type ResourceQuotaStatus struct { Used ResourceList } -// +genclient=true +// +genclient // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // ResourceQuota sets aggregate quota restrictions enforced per namespace @@ -3764,7 +3764,7 @@ type ResourceQuotaList struct { Items []ResourceQuota } -// +genclient=true +// +genclient // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // Secret holds secret data of a certain type. The total bytes of the values in @@ -3884,7 +3884,7 @@ type SecretList struct { Items []Secret } -// +genclient=true +// +genclient // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // ConfigMap holds configuration data for components or applications to consume. @@ -3969,8 +3969,8 @@ type ComponentCondition struct { Error string } -// +genclient=true -// +nonNamespaced=true +// +genclient +// +genclient:nonNamespaced // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // ComponentStatus (and ComponentStatusList) holds the cluster validation info. diff --git a/pkg/apis/admissionregistration/types.go b/pkg/apis/admissionregistration/types.go index 2f74ebfa48a..888a3ebffae 100644 --- a/pkg/apis/admissionregistration/types.go +++ b/pkg/apis/admissionregistration/types.go @@ -20,8 +20,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) -// +genclient=true -// +nonNamespaced=true +// +genclient +// +genclient:nonNamespaced // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // InitializerConfiguration describes the configuration of initializers. @@ -121,8 +121,8 @@ const ( Fail FailurePolicyType = "Fail" ) -// +genclient=true -// +nonNamespaced=true +// +genclient +// +genclient:nonNamespaced // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // ExternalAdmissionHookConfiguration describes the configuration of initializers. diff --git a/pkg/apis/apps/types.go b/pkg/apis/apps/types.go index 1468f7fe03e..5e4173b0828 100644 --- a/pkg/apis/apps/types.go +++ b/pkg/apis/apps/types.go @@ -22,7 +22,7 @@ import ( "k8s.io/kubernetes/pkg/api" ) -// +genclient=true +// +genclient // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // StatefulSet represents a set of pods with consistent identities. @@ -199,7 +199,7 @@ type StatefulSetList struct { Items []StatefulSet } -// +genclient=true +// +genclient // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // ControllerRevision implements an immutable snapshot of state data. Clients diff --git a/pkg/apis/authentication/types.go b/pkg/apis/authentication/types.go index 2ed75dc1497..52cfe6bf8ca 100644 --- a/pkg/apis/authentication/types.go +++ b/pkg/apis/authentication/types.go @@ -35,9 +35,9 @@ const ( ImpersonateUserExtraHeaderPrefix = "Impersonate-Extra-" ) -// +genclient=true -// +nonNamespaced=true -// +noMethods=true +// +genclient +// +genclient:nonNamespaced +// +genclient:noVerbs // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // TokenReview attempts to authenticate a token to a known user. diff --git a/pkg/apis/authorization/types.go b/pkg/apis/authorization/types.go index f9776cdcc64..b7fb8884c7c 100644 --- a/pkg/apis/authorization/types.go +++ b/pkg/apis/authorization/types.go @@ -20,9 +20,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) -// +genclient=true -// +nonNamespaced=true -// +noMethods=true +// +genclient +// +genclient:nonNamespaced +// +genclient:noVerbs // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // SubjectAccessReview checks whether or not a user or group can perform an action. Not filling in a @@ -38,9 +38,9 @@ type SubjectAccessReview struct { Status SubjectAccessReviewStatus } -// +genclient=true -// +nonNamespaced=true -// +noMethods=true +// +genclient +// +genclient:nonNamespaced +// +genclient:noVerbs // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // SelfSubjectAccessReview checks whether or the current user can perform an action. Not filling in a @@ -57,8 +57,8 @@ type SelfSubjectAccessReview struct { Status SubjectAccessReviewStatus } -// +genclient=true -// +noMethods=true +// +genclient +// +genclient:noVerbs // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // LocalSubjectAccessReview checks whether or not a user or group can perform an action in a given namespace. diff --git a/pkg/apis/autoscaling/types.go b/pkg/apis/autoscaling/types.go index 01c6f37379e..ec9734df689 100644 --- a/pkg/apis/autoscaling/types.go +++ b/pkg/apis/autoscaling/types.go @@ -326,7 +326,7 @@ type ResourceMetricStatus struct { CurrentAverageValue resource.Quantity } -// +genclient=true +// +genclient // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // HorizontalPodAutoscaler is the configuration for a horizontal pod diff --git a/pkg/apis/batch/types.go b/pkg/apis/batch/types.go index 46d01c23e6b..7b450d4ffd1 100644 --- a/pkg/apis/batch/types.go +++ b/pkg/apis/batch/types.go @@ -21,7 +21,7 @@ import ( "k8s.io/kubernetes/pkg/api" ) -// +genclient=true +// +genclient // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // Job represents the configuration of a single job. @@ -192,7 +192,7 @@ type JobCondition struct { Message string } -// +genclient=true +// +genclient // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // CronJob represents the configuration of a single cron job. diff --git a/pkg/apis/certificates/types.go b/pkg/apis/certificates/types.go index 413f7e79756..1300380f29d 100644 --- a/pkg/apis/certificates/types.go +++ b/pkg/apis/certificates/types.go @@ -18,8 +18,8 @@ package certificates import metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" -// +genclient=true -// +nonNamespaced=true +// +genclient +// +genclient:nonNamespaced // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // Describes a certificate signing request diff --git a/pkg/apis/extensions/types.go b/pkg/apis/extensions/types.go index b4ba2247889..af93e191bc9 100644 --- a/pkg/apis/extensions/types.go +++ b/pkg/apis/extensions/types.go @@ -60,8 +60,8 @@ type ScaleStatus struct { Selector *metav1.LabelSelector } -// +genclient=true -// +noMethods=true +// +genclient +// +genclient:noVerbs // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // represents a scaling request for a resource. @@ -110,8 +110,8 @@ type CustomMetricCurrentStatusList struct { Items []CustomMetricCurrentStatus } -// +genclient=true -// +nonNamespaced=true +// +genclient +// +genclient:nonNamespaced // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // A ThirdPartyResource is a generic representation of a resource, it is used by add-ons and plugins to add new resource @@ -165,7 +165,7 @@ type ThirdPartyResourceData struct { Data []byte } -// +genclient=true +// +genclient // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type Deployment struct { @@ -519,7 +519,7 @@ type DaemonSetStatus struct { CollisionCount *int64 } -// +genclient=true +// +genclient // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // DaemonSet represents the configuration of a daemon set. @@ -578,7 +578,7 @@ type ThirdPartyResourceDataList struct { Items []ThirdPartyResourceData } -// +genclient=true +// +genclient // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // Ingress is a collection of rules that allow inbound connections to reach the @@ -747,7 +747,7 @@ type IngressBackend struct { ServicePort intstr.IntOrString } -// +genclient=true +// +genclient // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // ReplicaSet represents the configuration of a replica set. @@ -856,8 +856,8 @@ type ReplicaSetCondition struct { Message string } -// +genclient=true -// +nonNamespaced=true +// +genclient +// +genclient:nonNamespaced // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // PodSecurityPolicy governs the ability to make requests that affect the SecurityContext @@ -1081,7 +1081,7 @@ type PodSecurityPolicyList struct { Items []PodSecurityPolicy } -// +genclient=true +// +genclient // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // NetworkPolicy describes what network traffic is allowed for a set of Pods diff --git a/pkg/apis/imagepolicy/types.go b/pkg/apis/imagepolicy/types.go index c9e4335b5fe..a0523343b43 100644 --- a/pkg/apis/imagepolicy/types.go +++ b/pkg/apis/imagepolicy/types.go @@ -20,9 +20,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) -// +genclient=true -// +nonNamespaced=true -// +noMethods=true +// +genclient +// +genclient:nonNamespaced +// +genclient:noVerbs // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // ImageReview checks if the set of images in a pod are allowed. diff --git a/pkg/apis/networking/types.go b/pkg/apis/networking/types.go index 8aab38fd61a..a422b05d5c0 100644 --- a/pkg/apis/networking/types.go +++ b/pkg/apis/networking/types.go @@ -22,7 +22,7 @@ import ( "k8s.io/kubernetes/pkg/api" ) -// +genclient=true +// +genclient // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // NetworkPolicy describes what network traffic is allowed for a set of Pods diff --git a/pkg/apis/policy/types.go b/pkg/apis/policy/types.go index 71a771f7ff8..ddbf72296be 100644 --- a/pkg/apis/policy/types.go +++ b/pkg/apis/policy/types.go @@ -77,7 +77,7 @@ type PodDisruptionBudgetStatus struct { ExpectedPods int32 } -// +genclient=true +// +genclient // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // PodDisruptionBudget is an object to define the max disruption that can be caused to a collection of pods @@ -104,8 +104,8 @@ type PodDisruptionBudgetList struct { Items []PodDisruptionBudget } -// +genclient=true -// +noMethods=true +// +genclient +// +genclient:noVerbs // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // Eviction evicts a pod from its node subject to certain policies and safety constraints. diff --git a/pkg/apis/policy/v1alpha1/types.go b/pkg/apis/policy/v1alpha1/types.go index aeb4bf7e60c..7232e8b91fa 100644 --- a/pkg/apis/policy/v1alpha1/types.go +++ b/pkg/apis/policy/v1alpha1/types.go @@ -52,7 +52,7 @@ type PodDisruptionBudgetStatus struct { ExpectedPods int32 `json:"expectedPods" protobuf:"varint,4,opt,name=expectedPods"` } -// +genclient=true +// +genclient // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // PodDisruptionBudget is an object to define the max disruption that can be caused to a collection of pods diff --git a/pkg/apis/rbac/types.go b/pkg/apis/rbac/types.go index e35677ef0c1..6e5ce60fb88 100644 --- a/pkg/apis/rbac/types.go +++ b/pkg/apis/rbac/types.go @@ -87,7 +87,7 @@ type RoleRef struct { Name string } -// +genclient=true +// +genclient // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // Role is a namespaced, logical grouping of PolicyRules that can be referenced as a unit by a RoleBinding. @@ -100,7 +100,7 @@ type Role struct { Rules []PolicyRule } -// +genclient=true +// +genclient // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // RoleBinding references a role, but does not contain it. It can reference a Role in the same namespace or a ClusterRole in the global namespace. @@ -142,8 +142,8 @@ type RoleList struct { Items []Role } -// +genclient=true -// +nonNamespaced=true +// +genclient +// +genclient:nonNamespaced // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // ClusterRole is a cluster level, logical grouping of PolicyRules that can be referenced as a unit by a RoleBinding or ClusterRoleBinding. @@ -156,8 +156,8 @@ type ClusterRole struct { Rules []PolicyRule } -// +genclient=true -// +nonNamespaced=true +// +genclient +// +genclient:nonNamespaced // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // ClusterRoleBinding references a ClusterRole, but not contain it. It can reference a ClusterRole in the global namespace, diff --git a/pkg/apis/scheduling/types.go b/pkg/apis/scheduling/types.go index 55b13bfbd1a..8dab7df6656 100644 --- a/pkg/apis/scheduling/types.go +++ b/pkg/apis/scheduling/types.go @@ -18,8 +18,8 @@ package scheduling import metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" -// +genclient=true -// +nonNamespaced=true +// +genclient +// +genclient:nonNamespaced // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // PriorityClass defines the mapping from a priority class name to the priority diff --git a/pkg/apis/settings/types.go b/pkg/apis/settings/types.go index fca09ee5f8b..1087f00f805 100644 --- a/pkg/apis/settings/types.go +++ b/pkg/apis/settings/types.go @@ -21,7 +21,7 @@ import ( "k8s.io/kubernetes/pkg/api" ) -// +genclient=true +// +genclient // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // PodPreset is a policy resource that defines additional runtime diff --git a/pkg/apis/storage/types.go b/pkg/apis/storage/types.go index 7b676de7378..ded08718782 100644 --- a/pkg/apis/storage/types.go +++ b/pkg/apis/storage/types.go @@ -18,8 +18,8 @@ package storage import metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" -// +genclient=true -// +nonNamespaced=true +// +genclient +// +genclient:nonNamespaced // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // StorageClass describes a named "class" of storage offered in a cluster. diff --git a/staging/src/k8s.io/api/admissionregistration/v1alpha1/types.go b/staging/src/k8s.io/api/admissionregistration/v1alpha1/types.go index aa6b0c674f0..1b5f5be80b3 100644 --- a/staging/src/k8s.io/api/admissionregistration/v1alpha1/types.go +++ b/staging/src/k8s.io/api/admissionregistration/v1alpha1/types.go @@ -20,8 +20,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) -// +genclient=true -// +nonNamespaced=true +// +genclient +// +genclient:nonNamespaced // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // InitializerConfiguration describes the configuration of initializers. @@ -123,8 +123,8 @@ const ( Fail FailurePolicyType = "Fail" ) -// +genclient=true -// +nonNamespaced=true +// +genclient +// +genclient:nonNamespaced // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // ExternalAdmissionHookConfiguration describes the configuration of initializers. diff --git a/staging/src/k8s.io/api/apps/v1beta1/types.go b/staging/src/k8s.io/api/apps/v1beta1/types.go index 19d45c5af1a..b25d039e935 100644 --- a/staging/src/k8s.io/api/apps/v1beta1/types.go +++ b/staging/src/k8s.io/api/apps/v1beta1/types.go @@ -56,8 +56,8 @@ type ScaleStatus struct { TargetSelector string `json:"targetSelector,omitempty" protobuf:"bytes,3,opt,name=targetSelector"` } -// +genclient=true -// +noMethods=true +// +genclient +// +genclient:noVerbs // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // Scale represents a scaling request for a resource. @@ -76,7 +76,7 @@ type Scale struct { Status ScaleStatus `json:"status,omitempty" protobuf:"bytes,3,opt,name=status"` } -// +genclient=true +// +genclient // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // StatefulSet represents a set of pods with consistent identities. @@ -253,7 +253,7 @@ type StatefulSetList struct { Items []StatefulSet `json:"items" protobuf:"bytes,2,rep,name=items"` } -// +genclient=true +// +genclient // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // Deployment enables declarative updates for Pods and ReplicaSets. @@ -487,7 +487,7 @@ type DeploymentList struct { Items []Deployment `json:"items" protobuf:"bytes,2,rep,name=items"` } -// +genclient=true +// +genclient // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // ControllerRevision implements an immutable snapshot of state data. Clients diff --git a/staging/src/k8s.io/api/apps/v1beta2/types.go b/staging/src/k8s.io/api/apps/v1beta2/types.go index 90a23fde9f3..5eb1197db82 100644 --- a/staging/src/k8s.io/api/apps/v1beta2/types.go +++ b/staging/src/k8s.io/api/apps/v1beta2/types.go @@ -57,7 +57,7 @@ type ScaleStatus struct { TargetSelector string `json:"targetSelector,omitempty" protobuf:"bytes,3,opt,name=targetSelector"` } -// +genclient=true +// +genclient // +noMethods=true // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object @@ -78,7 +78,7 @@ type Scale struct { Status ScaleStatus `json:"status,omitempty" protobuf:"bytes,3,opt,name=status"` } -// +genclient=true +// +genclient // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // WIP: This is not ready to be used and we plan to make breaking changes to it. @@ -261,7 +261,7 @@ type StatefulSetList struct { Items []StatefulSet `json:"items" protobuf:"bytes,2,rep,name=items"` } -// +genclient=true +// +genclient // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // WIP: This is not ready to be used and we plan to make breaking changes to it. diff --git a/staging/src/k8s.io/api/authentication/v1/types.go b/staging/src/k8s.io/api/authentication/v1/types.go index 0beb4ac7e12..b6d30bbe613 100644 --- a/staging/src/k8s.io/api/authentication/v1/types.go +++ b/staging/src/k8s.io/api/authentication/v1/types.go @@ -37,9 +37,9 @@ const ( ImpersonateUserExtraHeaderPrefix = "Impersonate-Extra-" ) -// +genclient=true -// +nonNamespaced=true -// +noMethods=true +// +genclient +// +genclient:nonNamespaced +// +genclient:noVerbs // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // TokenReview attempts to authenticate a token to a known user. diff --git a/staging/src/k8s.io/api/authentication/v1beta1/types.go b/staging/src/k8s.io/api/authentication/v1beta1/types.go index 7d7ca2811c3..a90949dc37d 100644 --- a/staging/src/k8s.io/api/authentication/v1beta1/types.go +++ b/staging/src/k8s.io/api/authentication/v1beta1/types.go @@ -22,9 +22,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) -// +genclient=true -// +nonNamespaced=true -// +noMethods=true +// +genclient +// +genclient:nonNamespaced +// +genclient:noVerbs // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // TokenReview attempts to authenticate a token to a known user. diff --git a/staging/src/k8s.io/api/authorization/v1/types.go b/staging/src/k8s.io/api/authorization/v1/types.go index a18ba391893..25d817ffc0b 100644 --- a/staging/src/k8s.io/api/authorization/v1/types.go +++ b/staging/src/k8s.io/api/authorization/v1/types.go @@ -22,9 +22,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) -// +genclient=true -// +nonNamespaced=true -// +noMethods=true +// +genclient +// +genclient:nonNamespaced +// +genclient:noVerbs // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // SubjectAccessReview checks whether or not a user or group can perform an action. @@ -41,9 +41,9 @@ type SubjectAccessReview struct { Status SubjectAccessReviewStatus `json:"status,omitempty" protobuf:"bytes,3,opt,name=status"` } -// +genclient=true -// +nonNamespaced=true -// +noMethods=true +// +genclient +// +genclient:nonNamespaced +// +genclient:noVerbs // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // SelfSubjectAccessReview checks whether or the current user can perform an action. Not filling in a @@ -62,8 +62,8 @@ type SelfSubjectAccessReview struct { Status SubjectAccessReviewStatus `json:"status,omitempty" protobuf:"bytes,3,opt,name=status"` } -// +genclient=true -// +noMethods=true +// +genclient +// +genclient:noVerbs // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // LocalSubjectAccessReview checks whether or not a user or group can perform an action in a given namespace. diff --git a/staging/src/k8s.io/api/authorization/v1beta1/types.go b/staging/src/k8s.io/api/authorization/v1beta1/types.go index 370b01d7e04..ca970060326 100644 --- a/staging/src/k8s.io/api/authorization/v1beta1/types.go +++ b/staging/src/k8s.io/api/authorization/v1beta1/types.go @@ -22,9 +22,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) -// +genclient=true -// +nonNamespaced=true -// +noMethods=true +// +genclient +// +genclient:nonNamespaced +// +genclient:noVerbs // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // SubjectAccessReview checks whether or not a user or group can perform an action. @@ -41,9 +41,9 @@ type SubjectAccessReview struct { Status SubjectAccessReviewStatus `json:"status,omitempty" protobuf:"bytes,3,opt,name=status"` } -// +genclient=true -// +nonNamespaced=true -// +noMethods=true +// +genclient +// +genclient:nonNamespaced +// +genclient:noVerbs // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // SelfSubjectAccessReview checks whether or the current user can perform an action. Not filling in a @@ -62,8 +62,8 @@ type SelfSubjectAccessReview struct { Status SubjectAccessReviewStatus `json:"status,omitempty" protobuf:"bytes,3,opt,name=status"` } -// +genclient=true -// +noMethods=true +// +genclient +// +genclient:noVerbs // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // LocalSubjectAccessReview checks whether or not a user or group can perform an action in a given namespace. diff --git a/staging/src/k8s.io/api/autoscaling/v1/types.go b/staging/src/k8s.io/api/autoscaling/v1/types.go index 3b3390cfcfc..a18c3730c7e 100644 --- a/staging/src/k8s.io/api/autoscaling/v1/types.go +++ b/staging/src/k8s.io/api/autoscaling/v1/types.go @@ -72,7 +72,7 @@ type HorizontalPodAutoscalerStatus struct { CurrentCPUUtilizationPercentage *int32 `json:"currentCPUUtilizationPercentage,omitempty" protobuf:"varint,5,opt,name=currentCPUUtilizationPercentage"` } -// +genclient=true +// +genclient // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // configuration of a horizontal pod autoscaler. diff --git a/staging/src/k8s.io/api/autoscaling/v2alpha1/types.go b/staging/src/k8s.io/api/autoscaling/v2alpha1/types.go index dbea917aa02..6cfb371efe8 100644 --- a/staging/src/k8s.io/api/autoscaling/v2alpha1/types.go +++ b/staging/src/k8s.io/api/autoscaling/v2alpha1/types.go @@ -275,7 +275,7 @@ type ResourceMetricStatus struct { CurrentAverageValue resource.Quantity `json:"currentAverageValue" protobuf:"bytes,3,name=currentAverageValue"` } -// +genclient=true +// +genclient // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // HorizontalPodAutoscaler is the configuration for a horizontal pod diff --git a/staging/src/k8s.io/api/batch/v1/types.go b/staging/src/k8s.io/api/batch/v1/types.go index f1e7ae09548..7124e0719f0 100644 --- a/staging/src/k8s.io/api/batch/v1/types.go +++ b/staging/src/k8s.io/api/batch/v1/types.go @@ -21,7 +21,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) -// +genclient=true +// +genclient // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // Job represents the configuration of a single job. diff --git a/staging/src/k8s.io/api/batch/v2alpha1/types.go b/staging/src/k8s.io/api/batch/v2alpha1/types.go index 04510e98e0e..451df40e637 100644 --- a/staging/src/k8s.io/api/batch/v2alpha1/types.go +++ b/staging/src/k8s.io/api/batch/v2alpha1/types.go @@ -51,7 +51,7 @@ type JobTemplateSpec struct { Spec batchv1.JobSpec `json:"spec,omitempty" protobuf:"bytes,2,opt,name=spec"` } -// +genclient=true +// +genclient // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // CronJob represents the configuration of a single cron job. diff --git a/staging/src/k8s.io/api/certificates/v1beta1/types.go b/staging/src/k8s.io/api/certificates/v1beta1/types.go index 386c08bf3ba..cc33043ee41 100644 --- a/staging/src/k8s.io/api/certificates/v1beta1/types.go +++ b/staging/src/k8s.io/api/certificates/v1beta1/types.go @@ -22,8 +22,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) -// +genclient=true -// +nonNamespaced=true +// +genclient +// +genclient:nonNamespaced // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // Describes a certificate signing request diff --git a/staging/src/k8s.io/api/core/v1/types.go b/staging/src/k8s.io/api/core/v1/types.go index e2d97f613f0..a70eb82e154 100644 --- a/staging/src/k8s.io/api/core/v1/types.go +++ b/staging/src/k8s.io/api/core/v1/types.go @@ -464,8 +464,8 @@ const ( AlphaStorageNodeAffinityAnnotation = "volume.alpha.kubernetes.io/node-affinity" ) -// +genclient=true -// +nonNamespaced=true +// +genclient +// +genclient:nonNamespaced // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // PersistentVolume (PV) is a storage resource provisioned by an administrator. @@ -566,7 +566,7 @@ type PersistentVolumeList struct { Items []PersistentVolume `json:"items" protobuf:"bytes,2,rep,name=items"` } -// +genclient=true +// +genclient // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // PersistentVolumeClaim is a user's request for and claim to a persistent volume @@ -2677,7 +2677,7 @@ type PodStatusResult struct { Status PodStatus `json:"status,omitempty" protobuf:"bytes,2,opt,name=status"` } -// +genclient=true +// +genclient // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // Pod is a collection of containers that can run on a host. This resource is created @@ -2731,7 +2731,7 @@ type PodTemplateSpec struct { Spec PodSpec `json:"spec,omitempty" protobuf:"bytes,2,opt,name=spec"` } -// +genclient=true +// +genclient // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // PodTemplate describes a template for creating copies of a predefined pod. @@ -2855,7 +2855,7 @@ type ReplicationControllerCondition struct { Message string `json:"message,omitempty" protobuf:"bytes,5,opt,name=message"` } -// +genclient=true +// +genclient // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // ReplicationController represents the configuration of a replication controller. @@ -3109,7 +3109,7 @@ type ServicePort struct { NodePort int32 `json:"nodePort,omitempty" protobuf:"varint,5,opt,name=nodePort"` } -// +genclient=true +// +genclient // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // Service is a named abstraction of software service (for example, mysql) consisting of local port @@ -3155,7 +3155,7 @@ type ServiceList struct { Items []Service `json:"items" protobuf:"bytes,2,rep,name=items"` } -// +genclient=true +// +genclient // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // ServiceAccount binds together: @@ -3204,7 +3204,7 @@ type ServiceAccountList struct { Items []ServiceAccount `json:"items" protobuf:"bytes,2,rep,name=items"` } -// +genclient=true +// +genclient // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // Endpoints is a collection of endpoints that implement the actual service. Example: @@ -3587,8 +3587,8 @@ const ( // ResourceList is a set of (resource name, quantity) pairs. type ResourceList map[ResourceName]resource.Quantity -// +genclient=true -// +nonNamespaced=true +// +genclient +// +genclient:nonNamespaced // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // Node is a worker node in Kubernetes. @@ -3662,8 +3662,8 @@ const ( NamespaceTerminating NamespacePhase = "Terminating" ) -// +genclient=true -// +nonNamespaced=true +// +genclient +// +genclient:nonNamespaced // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // Namespace provides a scope for Names. @@ -4057,7 +4057,7 @@ const ( EventTypeWarning string = "Warning" ) -// +genclient=true +// +genclient // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // Event is a report of an event somewhere in the cluster. @@ -4171,7 +4171,7 @@ type LimitRangeSpec struct { Limits []LimitRangeItem `json:"limits" protobuf:"bytes,1,rep,name=limits"` } -// +genclient=true +// +genclient // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // LimitRange sets resource usage limits for each kind of resource in a Namespace. @@ -4272,7 +4272,7 @@ type ResourceQuotaStatus struct { Used ResourceList `json:"used,omitempty" protobuf:"bytes,2,rep,name=used,casttype=ResourceList,castkey=ResourceName"` } -// +genclient=true +// +genclient // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // ResourceQuota sets aggregate quota restrictions enforced per namespace @@ -4309,7 +4309,7 @@ type ResourceQuotaList struct { Items []ResourceQuota `json:"items" protobuf:"bytes,2,rep,name=items"` } -// +genclient=true +// +genclient // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // Secret holds secret data of a certain type. The total bytes of the values in @@ -4439,7 +4439,7 @@ type SecretList struct { Items []Secret `json:"items" protobuf:"bytes,2,rep,name=items"` } -// +genclient=true +// +genclient // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // ConfigMap holds configuration data for pods to consume. @@ -4496,8 +4496,8 @@ type ComponentCondition struct { Error string `json:"error,omitempty" protobuf:"bytes,4,opt,name=error"` } -// +genclient=true -// +nonNamespaced=true +// +genclient +// +genclient:nonNamespaced // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // ComponentStatus (and ComponentStatusList) holds the cluster validation info. diff --git a/staging/src/k8s.io/api/extensions/v1beta1/types.go b/staging/src/k8s.io/api/extensions/v1beta1/types.go index 7530caaee3b..2ca11ed746c 100644 --- a/staging/src/k8s.io/api/extensions/v1beta1/types.go +++ b/staging/src/k8s.io/api/extensions/v1beta1/types.go @@ -50,8 +50,8 @@ type ScaleStatus struct { TargetSelector string `json:"targetSelector,omitempty" protobuf:"bytes,3,opt,name=targetSelector"` } -// +genclient=true -// +noMethods=true +// +genclient +// +genclient:noVerbs // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // represents a scaling request for a resource. @@ -100,8 +100,8 @@ type CustomMetricCurrentStatusList struct { Items []CustomMetricCurrentStatus `json:"items" protobuf:"bytes,1,rep,name=items"` } -// +genclient=true -// +nonNamespaced=true +// +genclient +// +genclient:nonNamespaced // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // A ThirdPartyResource is a generic representation of a resource, it is used by add-ons and plugins to add new resource @@ -157,7 +157,7 @@ type ThirdPartyResourceData struct { Data []byte `json:"data,omitempty" protobuf:"bytes,2,opt,name=data"` } -// +genclient=true +// +genclient // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // Deployment enables declarative updates for Pods and ReplicaSets. @@ -524,7 +524,7 @@ type DaemonSetStatus struct { CollisionCount *int64 `json:"collisionCount,omitempty" protobuf:"varint,9,opt,name=collisionCount"` } -// +genclient=true +// +genclient // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // DaemonSet represents the configuration of a daemon set. @@ -590,7 +590,7 @@ type ThirdPartyResourceDataList struct { Items []ThirdPartyResourceData `json:"items" protobuf:"bytes,2,rep,name=items"` } -// +genclient=true +// +genclient // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // Ingress is a collection of rules that allow inbound connections to reach the @@ -759,7 +759,7 @@ type IngressBackend struct { ServicePort intstr.IntOrString `json:"servicePort" protobuf:"bytes,2,opt,name=servicePort"` } -// +genclient=true +// +genclient // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // ReplicaSet represents the configuration of a ReplicaSet. @@ -886,8 +886,8 @@ type ReplicaSetCondition struct { Message string `json:"message,omitempty" protobuf:"bytes,5,opt,name=message"` } -// +genclient=true -// +nonNamespaced=true +// +genclient +// +genclient:nonNamespaced // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // Pod Security Policy governs the ability to make requests that affect the Security Context diff --git a/staging/src/k8s.io/api/imagepolicy/v1alpha1/types.go b/staging/src/k8s.io/api/imagepolicy/v1alpha1/types.go index b90711dd172..258b5cd75bd 100644 --- a/staging/src/k8s.io/api/imagepolicy/v1alpha1/types.go +++ b/staging/src/k8s.io/api/imagepolicy/v1alpha1/types.go @@ -20,9 +20,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) -// +genclient=true -// +nonNamespaced=true -// +noMethods=true +// +genclient +// +genclient:nonNamespaced +// +genclient:noVerbs // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // ImageReview checks if the set of images in a pod are allowed. diff --git a/staging/src/k8s.io/api/networking/v1/types.go b/staging/src/k8s.io/api/networking/v1/types.go index 55e57436e17..1a6ea7b96a6 100644 --- a/staging/src/k8s.io/api/networking/v1/types.go +++ b/staging/src/k8s.io/api/networking/v1/types.go @@ -22,7 +22,7 @@ import ( "k8s.io/apimachinery/pkg/util/intstr" ) -// +genclient=true +// +genclient // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // NetworkPolicy describes what network traffic is allowed for a set of Pods diff --git a/staging/src/k8s.io/api/policy/v1beta1/types.go b/staging/src/k8s.io/api/policy/v1beta1/types.go index e6dce5add96..a69a5720756 100644 --- a/staging/src/k8s.io/api/policy/v1beta1/types.go +++ b/staging/src/k8s.io/api/policy/v1beta1/types.go @@ -74,7 +74,7 @@ type PodDisruptionBudgetStatus struct { ExpectedPods int32 `json:"expectedPods" protobuf:"varint,6,opt,name=expectedPods"` } -// +genclient=true +// +genclient // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // PodDisruptionBudget is an object to define the max disruption that can be caused to a collection of pods @@ -97,8 +97,8 @@ type PodDisruptionBudgetList struct { Items []PodDisruptionBudget `json:"items" protobuf:"bytes,2,rep,name=items"` } -// +genclient=true -// +noMethods=true +// +genclient +// +genclient:noVerbs // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // Eviction evicts a pod from its node subject to certain policies and safety constraints. diff --git a/staging/src/k8s.io/api/rbac/v1alpha1/types.go b/staging/src/k8s.io/api/rbac/v1alpha1/types.go index e4618fe4d1f..06fa6ce8e8f 100644 --- a/staging/src/k8s.io/api/rbac/v1alpha1/types.go +++ b/staging/src/k8s.io/api/rbac/v1alpha1/types.go @@ -99,7 +99,7 @@ type RoleRef struct { Name string `json:"name" protobuf:"bytes,3,opt,name=name"` } -// +genclient=true +// +genclient // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // Role is a namespaced, logical grouping of PolicyRules that can be referenced as a unit by a RoleBinding. @@ -113,7 +113,7 @@ type Role struct { Rules []PolicyRule `json:"rules" protobuf:"bytes,2,rep,name=rules"` } -// +genclient=true +// +genclient // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // RoleBinding references a role, but does not contain it. It can reference a Role in the same namespace or a ClusterRole in the global namespace. @@ -159,8 +159,8 @@ type RoleList struct { Items []Role `json:"items" protobuf:"bytes,2,rep,name=items"` } -// +genclient=true -// +nonNamespaced=true +// +genclient +// +genclient:nonNamespaced // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // ClusterRole is a cluster level, logical grouping of PolicyRules that can be referenced as a unit by a RoleBinding or ClusterRoleBinding. @@ -174,8 +174,8 @@ type ClusterRole struct { Rules []PolicyRule `json:"rules" protobuf:"bytes,2,rep,name=rules"` } -// +genclient=true -// +nonNamespaced=true +// +genclient +// +genclient:nonNamespaced // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // ClusterRoleBinding references a ClusterRole, but not contain it. It can reference a ClusterRole in the global namespace, diff --git a/staging/src/k8s.io/api/rbac/v1beta1/types.go b/staging/src/k8s.io/api/rbac/v1beta1/types.go index 0d9a9aaf3c0..30f95a77405 100644 --- a/staging/src/k8s.io/api/rbac/v1beta1/types.go +++ b/staging/src/k8s.io/api/rbac/v1beta1/types.go @@ -97,7 +97,7 @@ type RoleRef struct { Name string `json:"name" protobuf:"bytes,3,opt,name=name"` } -// +genclient=true +// +genclient // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // Role is a namespaced, logical grouping of PolicyRules that can be referenced as a unit by a RoleBinding. @@ -111,7 +111,7 @@ type Role struct { Rules []PolicyRule `json:"rules" protobuf:"bytes,2,rep,name=rules"` } -// +genclient=true +// +genclient // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // RoleBinding references a role, but does not contain it. It can reference a Role in the same namespace or a ClusterRole in the global namespace. @@ -157,8 +157,8 @@ type RoleList struct { Items []Role `json:"items" protobuf:"bytes,2,rep,name=items"` } -// +genclient=true -// +nonNamespaced=true +// +genclient +// +genclient:nonNamespaced // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // ClusterRole is a cluster level, logical grouping of PolicyRules that can be referenced as a unit by a RoleBinding or ClusterRoleBinding. @@ -172,8 +172,8 @@ type ClusterRole struct { Rules []PolicyRule `json:"rules" protobuf:"bytes,2,rep,name=rules"` } -// +genclient=true -// +nonNamespaced=true +// +genclient +// +genclient:nonNamespaced // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // ClusterRoleBinding references a ClusterRole, but not contain it. It can reference a ClusterRole in the global namespace, diff --git a/staging/src/k8s.io/api/scheduling/v1alpha1/types.go b/staging/src/k8s.io/api/scheduling/v1alpha1/types.go index 22a061d1bee..bca0f3471f2 100644 --- a/staging/src/k8s.io/api/scheduling/v1alpha1/types.go +++ b/staging/src/k8s.io/api/scheduling/v1alpha1/types.go @@ -20,8 +20,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) -// +genclient=true -// +nonNamespaced=true +// +genclient +// +genclient:nonNamespaced // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // PriorityClass defines mapping from a priority class name to the priority diff --git a/staging/src/k8s.io/api/settings/v1alpha1/types.go b/staging/src/k8s.io/api/settings/v1alpha1/types.go index c972b2b0163..506aacf4a9c 100644 --- a/staging/src/k8s.io/api/settings/v1alpha1/types.go +++ b/staging/src/k8s.io/api/settings/v1alpha1/types.go @@ -21,7 +21,7 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) -// +genclient=true +// +genclient // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // PodPreset is a policy resource that defines additional runtime diff --git a/staging/src/k8s.io/api/storage/v1/types.go b/staging/src/k8s.io/api/storage/v1/types.go index 0fc15c1f3db..caa71907108 100644 --- a/staging/src/k8s.io/api/storage/v1/types.go +++ b/staging/src/k8s.io/api/storage/v1/types.go @@ -20,8 +20,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) -// +genclient=true -// +nonNamespaced=true +// +genclient +// +genclient:nonNamespaced // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // StorageClass describes the parameters for a class of storage for diff --git a/staging/src/k8s.io/api/storage/v1beta1/types.go b/staging/src/k8s.io/api/storage/v1beta1/types.go index a5dedb3ad34..7a15aa0f2ea 100644 --- a/staging/src/k8s.io/api/storage/v1beta1/types.go +++ b/staging/src/k8s.io/api/storage/v1beta1/types.go @@ -20,8 +20,8 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) -// +genclient=true -// +nonNamespaced=true +// +genclient +// +genclient:nonNamespaced // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // StorageClass describes the parameters for a class of storage for diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/types.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/types.go index 85a914cbd46..59240fbd008 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/types.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/types.go @@ -113,8 +113,8 @@ type CustomResourceDefinitionStatus struct { // a CustomResourceDefinition const CustomResourceCleanupFinalizer = "customresourcecleanup.apiextensions.k8s.io" -// +genclient=true -// +nonNamespaced=true +// +genclient +// +genclient:nonNamespaced // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // CustomResourceDefinition represents a resource that should be exposed on the API server. Its name MUST be in the format diff --git a/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/types.go b/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/types.go index d9aa7e3f9bc..75b41065072 100644 --- a/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/types.go +++ b/staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1/types.go @@ -113,8 +113,8 @@ type CustomResourceDefinitionStatus struct { // a CustomResourceDefinition const CustomResourceCleanupFinalizer = "customresourcecleanup.apiextensions.k8s.io" -// +genclient=true -// +nonNamespaced=true +// +genclient +// +genclient:nonNamespaced // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // CustomResourceDefinition represents a resource that should be exposed on the API server. Its name MUST be in the format diff --git a/staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/types.go b/staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/types.go index e72ef47b91a..1dd68fe6fa8 100644 --- a/staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/types.go +++ b/staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/types.go @@ -111,8 +111,8 @@ type APIServiceStatus struct { Conditions []APIServiceCondition } -// +genclient=true -// +nonNamespaced=true +// +genclient +// +genclient:nonNamespaced // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // APIService represents a server for a particular GroupVersion. diff --git a/staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1/types.go b/staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1/types.go index 0aeef6e216c..66238bc29fa 100644 --- a/staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1/types.go +++ b/staging/src/k8s.io/kube-aggregator/pkg/apis/apiregistration/v1beta1/types.go @@ -119,8 +119,8 @@ type APIServiceStatus struct { Conditions []APIServiceCondition `json:"conditions,omitempty" patchStrategy:"merge" patchMergeKey:"type" protobuf:"bytes,1,rep,name=conditions"` } -// +genclient=true -// +nonNamespaced=true +// +genclient +// +genclient:nonNamespaced // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // APIService represents a server for a particular GroupVersion. diff --git a/staging/src/k8s.io/kube-gen/cmd/client-gen/generators/client_generator.go b/staging/src/k8s.io/kube-gen/cmd/client-gen/generators/client_generator.go index de1e5ee8fcb..c80019cdd0b 100644 --- a/staging/src/k8s.io/kube-gen/cmd/client-gen/generators/client_generator.go +++ b/staging/src/k8s.io/kube-gen/cmd/client-gen/generators/client_generator.go @@ -342,7 +342,7 @@ func Packages(context *generator.Context, arguments *args.GeneratorArgs) generat } } else { // User has not specified any override for this group version. - // filter out types which dont have genclient=true. + // filter out types which dont have genclient. if tags := util.MustParseClientGenTags(t.SecondClosestCommentLines); !tags.GenerateClient { continue } diff --git a/staging/src/k8s.io/kube-gen/cmd/client-gen/main.go b/staging/src/k8s.io/kube-gen/cmd/client-gen/main.go index 073123cab9f..01823c1a0b6 100644 --- a/staging/src/k8s.io/kube-gen/cmd/client-gen/main.go +++ b/staging/src/k8s.io/kube-gen/cmd/client-gen/main.go @@ -51,7 +51,7 @@ var ( "settings/", "networking/", }, "group/versions that client-gen will generate clients for. At most one version per group is allowed. Specified in the format \"group1/version1,group2/version2...\".") - includedTypesOverrides = flag.StringSlice("included-types-overrides", []string{}, "list of group/version/type for which client should be generated. By default, client is generated for all types which have genclient=true in types.go. This overrides that. For each groupVersion in this list, only the types mentioned here will be included. The default check of genclient=true will be used for other group versions.") + includedTypesOverrides = flag.StringSlice("included-types-overrides", []string{}, "list of group/version/type for which client should be generated. By default, client is generated for all types which have genclient in types.go. This overrides that. For each groupVersion in this list, only the types mentioned here will be included. The default check of genclient will be used for other group versions.") basePath = flag.String("input-base", "k8s.io/kubernetes/pkg/apis", "base path to look for the api group.") clientsetName = flag.StringP("clientset-name", "n", "internalclientset", "the name of the generated clientset package.") clientsetAPIPath = flag.StringP("clientset-api-path", "", "", "the value of default API path.") diff --git a/staging/src/k8s.io/kube-gen/cmd/lister-gen/generators/lister.go b/staging/src/k8s.io/kube-gen/cmd/lister-gen/generators/lister.go index 44000b93e7a..d850f7031c0 100644 --- a/staging/src/k8s.io/kube-gen/cmd/lister-gen/generators/lister.go +++ b/staging/src/k8s.io/kube-gen/cmd/lister-gen/generators/lister.go @@ -167,7 +167,7 @@ func Packages(context *generator.Context, arguments *args.GeneratorArgs) generat func objectMetaForPackage(p *types.Package) (*types.Type, bool, error) { generatingForPackage := false for _, t := range p.Types { - // filter out types which dont have genclient=true. + // filter out types which dont have genclient. if !util.MustParseClientGenTags(t.SecondClosestCommentLines).GenerateClient { continue } diff --git a/staging/src/k8s.io/metrics/pkg/apis/metrics/types.go b/staging/src/k8s.io/metrics/pkg/apis/metrics/types.go index 6002aada3f1..08912fb68ed 100644 --- a/staging/src/k8s.io/metrics/pkg/apis/metrics/types.go +++ b/staging/src/k8s.io/metrics/pkg/apis/metrics/types.go @@ -21,10 +21,10 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) -// +genclient=true +// +genclient // +resourceName=nodes -// +readonly=true -// +nonNamespaced=true +// +genclient:readonly +// +genclient:nonNamespaced // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // resource usage metrics of a node. @@ -54,9 +54,9 @@ type NodeMetricsList struct { Items []NodeMetrics } -// +genclient=true +// +genclient // +resourceName=pods -// +readonly=true +// +genclient:readonly // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // resource usage metrics of a pod. diff --git a/staging/src/k8s.io/metrics/pkg/apis/metrics/v1alpha1/types.go b/staging/src/k8s.io/metrics/pkg/apis/metrics/v1alpha1/types.go index e2cb2d3ae1a..64d70682455 100644 --- a/staging/src/k8s.io/metrics/pkg/apis/metrics/v1alpha1/types.go +++ b/staging/src/k8s.io/metrics/pkg/apis/metrics/v1alpha1/types.go @@ -21,10 +21,10 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" ) -// +genclient=true +// +genclient // +resourceName=nodes -// +readonly=true -// +nonNamespaced=true +// +genclient:readonly +// +genclient:nonNamespaced // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // resource usage metrics of a node. @@ -54,9 +54,9 @@ type NodeMetricsList struct { Items []NodeMetrics `json:"items" protobuf:"bytes,2,rep,name=items"` } -// +genclient=true +// +genclient // +resourceName=pods -// +readonly=true +// +genclient:readonly // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // resource usage metrics of a pod. diff --git a/staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/types.go b/staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/types.go index 7a6ba05c09d..fc5a6ee2c02 100644 --- a/staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/types.go +++ b/staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/types.go @@ -34,7 +34,7 @@ type FlunderSpec struct { type FlunderStatus struct { } -// +genclient=true +// +genclient // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type Flunder struct { @@ -45,8 +45,8 @@ type Flunder struct { Status FlunderStatus } -// +genclient=true -// +nonNamespaced=true +// +genclient +// +genclient:nonNamespaced // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type Fischer struct { @@ -57,7 +57,7 @@ type Fischer struct { DisallowedFlunders []string } -// +nonNamespaced=true +// +genclient:nonNamespaced // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // FischerList is a list of Fischer objects. diff --git a/staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/v1alpha1/types.go b/staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/v1alpha1/types.go index 7f8b2031758..31c8ed331d9 100644 --- a/staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/v1alpha1/types.go +++ b/staging/src/k8s.io/sample-apiserver/pkg/apis/wardle/v1alpha1/types.go @@ -34,7 +34,7 @@ type FlunderSpec struct { type FlunderStatus struct { } -// +genclient=true +// +genclient // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type Flunder struct { @@ -45,8 +45,8 @@ type Flunder struct { Status FlunderStatus `json:"status,omitempty" protobuf:"bytes,3,opt,name=status"` } -// +genclient=true -// +nonNamespaced=true +// +genclient +// +genclient:nonNamespaced // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object type Fischer struct { @@ -57,7 +57,7 @@ type Fischer struct { DisallowedFlunders []string `json:"disallowedFlunders,omitempty" protobuf:"bytes,2,rep,name=disallowedFlunders"` } -// +nonNamespaced=true +// +genclient:nonNamespaced // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // FischerList is a list of Fischer objects.