Skip to content

Commit 4e8c13f

Browse files
chrischdichrischdi
committed
move metadata markers to the top
1 parent e9806cf commit 4e8c13f

File tree

6 files changed

+24
-24
lines changed

6 files changed

+24
-24
lines changed

‎apis/v1beta1/vspherecluster_types.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,13 +114,13 @@ type VSphereClusterStatus struct {
114114
// +Metrics:labelFromPath:name="name",JSONPath=".metadata.name"
115115
// +Metrics:labelFromPath:name="namespace",JSONPath=".metadata.namespace"
116116
// +Metrics:labelFromPath:name="uid",JSONPath=".metadata.uid"
117+
// +Metrics:gauge:name="created",JSONPath=".metadata.creationTimestamp",help="Unix creation timestamp."
118+
// +Metrics:info:name="annotation_paused",JSONPath=.metadata.annotations['cluster\.x-k8s\.io/paused'],help="Whether the vspherecluster is paused and any of its resources will not be processed by the controllers.",labelsFromPath={paused_value:"."}
119+
// +Metrics:info:name="owner",JSONPath=".metadata.ownerReferences",help="Owner references.",labelsFromPath={owner_is_controller:".controller",owner_kind:".kind",owner_name:".name",owner_uid:".uid"}
117120
// +Metrics:labelFromPath:name="cluster_name",JSONPath=.metadata.labels.cluster\.x-k8s\.io/cluster-name
118121
// +Metrics:info:name="info",help="Information about a vspherecluster.",labelsFromPath={status_vsphere_version:.status.vCenterVersion,spec_server:.spec.server,identity_reference_kind:".spec.identityRef.kind",identity_reference_name:".spec.identityRef.name"}
119122
type VSphereCluster struct {
120-
metav1.TypeMeta `json:",inline"`
121-
// +Metrics:gauge:name="created",JSONPath=".creationTimestamp",help="Unix creation timestamp."
122-
// +Metrics:info:name="annotation_paused",JSONPath=.annotations['cluster\.x-k8s\.io/paused'],help="Whether the vspherecluster is paused and any of its resources will not be processed by the controllers.",labelsFromPath={paused_value:"."}
123-
// +Metrics:info:name="owner",JSONPath=".ownerReferences",help="Owner references.",labelsFromPath={owner_is_controller:".controller",owner_kind:".kind",owner_name:".name",owner_uid:".uid"}
123+
metav1.TypeMeta `json:",inline"`
124124
metav1.ObjectMeta `json:"metadata,omitempty"`
125125

126126
Spec VSphereClusterSpec `json:"spec,omitempty"`

‎apis/v1beta1/vsphereclusteridentity_types.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,13 +90,13 @@ func (c *VSphereClusterIdentity) SetConditions(conditions clusterv1.Conditions)
9090
// +Metrics:labelFromPath:name="name",JSONPath=".metadata.name"
9191
// +Metrics:labelFromPath:name="namespace",JSONPath=".metadata.namespace"
9292
// +Metrics:labelFromPath:name="uid",JSONPath=".metadata.uid"
93+
// +Metrics:gauge:name="created",JSONPath=".metadata.creationTimestamp",help="Unix creation timestamp."
94+
// +Metrics:info:name="annotation_paused",JSONPath=.metadata.annotations['cluster\.x-k8s\.io/paused'],help="Whether the vsphereclusteridentity is paused and any of its resources will not be processed by the controllers.",labelsFromPath={paused_value:"."}
95+
// +Metrics:info:name="owner",JSONPath=".metadata.ownerReferences",help="Owner references.",labelsFromPath={owner_is_controller:".controller",owner_kind:".kind",owner_name:".name",owner_uid:".uid"}
9396
// +Metrics:labelFromPath:name="cluster_name",JSONPath=.metadata.labels.cluster\.x-k8s\.io/cluster-name
9497
// +Metrics:info:name="info",help="Information about a vsphereclusteridentity.",labelsFromPath={name:.metadata.name}
9598
type VSphereClusterIdentity struct {
96-
metav1.TypeMeta `json:",inline"`
97-
// +Metrics:gauge:name="created",JSONPath=".creationTimestamp",help="Unix creation timestamp."
98-
// +Metrics:info:name="annotation_paused",JSONPath=.annotations['cluster\.x-k8s\.io/paused'],help="Whether the vsphereclusteridentity is paused and any of its resources will not be processed by the controllers.",labelsFromPath={paused_value:"."}
99-
// +Metrics:info:name="owner",JSONPath=".ownerReferences",help="Owner references.",labelsFromPath={owner_is_controller:".controller",owner_kind:".kind",owner_name:".name",owner_uid:".uid"}
99+
metav1.TypeMeta `json:",inline"`
100100
metav1.ObjectMeta `json:"metadata,omitempty"`
101101

102102
Spec VSphereClusterIdentitySpec `json:"spec,omitempty"`

‎apis/v1beta1/vspheredeploymentzone_types.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,13 +96,13 @@ type VSphereDeploymentZoneStatus struct {
9696
// +Metrics:labelFromPath:name="name",JSONPath=".metadata.name"
9797
// +Metrics:labelFromPath:name="namespace",JSONPath=".metadata.namespace"
9898
// +Metrics:labelFromPath:name="uid",JSONPath=".metadata.uid"
99+
// +Metrics:gauge:name="created",JSONPath=".metadata.creationTimestamp",help="Unix creation timestamp."
100+
// +Metrics:info:name="annotation_paused",JSONPath=.metadata.annotations['cluster\.x-k8s\.io/paused'],help="Whether the vspheredeploymentzone is paused and any of its resources will not be processed by the controllers.",labelsFromPath={paused_value:"."}
101+
// +Metrics:info:name="owner",JSONPath=".metadata.ownerReferences",help="Owner references.",labelsFromPath={owner_is_controller:".controller",owner_kind:".kind",owner_name:".name",owner_uid:".uid"}
99102
// +Metrics:labelFromPath:name="cluster_name",JSONPath=.metadata.labels.cluster\.x-k8s\.io/cluster-name
100103
// +Metrics:info:name="info",help="Information about a vspheredeploymentzone.",labelsFromPath={name:.metadata.name}
101104
type VSphereDeploymentZone struct {
102-
metav1.TypeMeta `json:",inline"`
103-
// +Metrics:gauge:name="created",JSONPath=".creationTimestamp",help="Unix creation timestamp."
104-
// +Metrics:info:name="annotation_paused",JSONPath=.annotations['cluster\.x-k8s\.io/paused'],help="Whether the vspheredeploymentzone is paused and any of its resources will not be processed by the controllers.",labelsFromPath={paused_value:"."}
105-
// +Metrics:info:name="owner",JSONPath=".ownerReferences",help="Owner references.",labelsFromPath={owner_is_controller:".controller",owner_kind:".kind",owner_name:".name",owner_uid:".uid"}
105+
metav1.TypeMeta `json:",inline"`
106106
metav1.ObjectMeta `json:"metadata,omitempty"`
107107

108108
Spec VSphereDeploymentZoneSpec `json:"spec,omitempty"`

‎apis/v1beta1/vspherefailuredomain_types.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -99,13 +99,13 @@ type FailureDomainHosts struct {
9999
// +Metrics:labelFromPath:name="name",JSONPath=".metadata.name"
100100
// +Metrics:labelFromPath:name="namespace",JSONPath=".metadata.namespace"
101101
// +Metrics:labelFromPath:name="uid",JSONPath=".metadata.uid"
102+
// +Metrics:gauge:name="created",JSONPath=".metadata.creationTimestamp",help="Unix creation timestamp."
103+
// +Metrics:info:name="annotation_paused",JSONPath=.metadata.annotations['cluster\.x-k8s\.io/paused'],help="Whether the vspherefailuredomain is paused and any of its resources will not be processed by the controllers.",labelsFromPath={paused_value:"."}
104+
// +Metrics:info:name="owner",JSONPath=".metadata.ownerReferences",help="Owner references.",labelsFromPath={owner_is_controller:".controller",owner_kind:".kind",owner_name:".name",owner_uid:".uid"}
102105
// +Metrics:labelFromPath:name="cluster_name",JSONPath=.metadata.labels.cluster\.x-k8s\.io/cluster-name
103106
// +Metrics:info:name="info",help="Information about a vspherefailuredomain.",labelsFromPath={name:.metadata.name}
104107
type VSphereFailureDomain struct {
105-
metav1.TypeMeta `json:",inline"`
106-
// +Metrics:gauge:name="created",JSONPath=".creationTimestamp",help="Unix creation timestamp."
107-
// +Metrics:info:name="annotation_paused",JSONPath=.annotations['cluster\.x-k8s\.io/paused'],help="Whether the vspherefailuredomain is paused and any of its resources will not be processed by the controllers.",labelsFromPath={paused_value:"."}
108-
// +Metrics:info:name="owner",JSONPath=".ownerReferences",help="Owner references.",labelsFromPath={owner_is_controller:".controller",owner_kind:".kind",owner_name:".name",owner_uid:".uid"}
108+
metav1.TypeMeta `json:",inline"`
109109
metav1.ObjectMeta `json:"metadata,omitempty"`
110110

111111
Spec VSphereFailureDomainSpec `json:"spec,omitempty"`

‎apis/v1beta1/vspheremachine_types.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -146,13 +146,13 @@ type VSphereMachineStatus struct {
146146
// +Metrics:labelFromPath:name="name",JSONPath=".metadata.name"
147147
// +Metrics:labelFromPath:name="namespace",JSONPath=".metadata.namespace"
148148
// +Metrics:labelFromPath:name="uid",JSONPath=".metadata.uid"
149+
// +Metrics:gauge:name="created",JSONPath=".metadata.creationTimestamp",help="Unix creation timestamp."
150+
// +Metrics:info:name="annotation_paused",JSONPath=.metadata.annotations['cluster\.x-k8s\.io/paused'],help="Whether the vspheremachine is paused and any of its resources will not be processed by the controllers.",labelsFromPath={paused_value:"."}
151+
// +Metrics:info:name="owner",JSONPath=".metadata.ownerReferences",help="Owner references.",labelsFromPath={owner_is_controller:".controller",owner_kind:".kind",owner_name:".name",owner_uid:".uid"}
149152
// +Metrics:labelFromPath:name="cluster_name",JSONPath=.metadata.labels.cluster\.x-k8s\.io/cluster-name
150153
// +Metrics:info:name="info",help="Information about a vspheremachine.",labelsFromPath={provider_id:.spec.providerID}
151154
type VSphereMachine struct {
152-
metav1.TypeMeta `json:",inline"`
153-
// +Metrics:gauge:name="created",JSONPath=".creationTimestamp",help="Unix creation timestamp."
154-
// +Metrics:info:name="annotation_paused",JSONPath=.annotations['cluster\.x-k8s\.io/paused'],help="Whether the vspheremachine is paused and any of its resources will not be processed by the controllers.",labelsFromPath={paused_value:"."}
155-
// +Metrics:info:name="owner",JSONPath=".ownerReferences",help="Owner references.",labelsFromPath={owner_is_controller:".controller",owner_kind:".kind",owner_name:".name",owner_uid:".uid"}
155+
metav1.TypeMeta `json:",inline"`
156156
metav1.ObjectMeta `json:"metadata,omitempty"`
157157

158158
Spec VSphereMachineSpec `json:"spec,omitempty"`

‎apis/v1beta1/vspherevm_types.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -194,13 +194,13 @@ type VSphereVMStatus struct {
194194
// +Metrics:labelFromPath:name="name",JSONPath=".metadata.name"
195195
// +Metrics:labelFromPath:name="namespace",JSONPath=".metadata.namespace"
196196
// +Metrics:labelFromPath:name="uid",JSONPath=".metadata.uid"
197+
// +Metrics:gauge:name="created",JSONPath=".metadata.creationTimestamp",help="Unix creation timestamp."
198+
// +Metrics:info:name="annotation_paused",JSONPath=.metadata.annotations['cluster\.x-k8s\.io/paused'],help="Whether the vspherevm is paused and any of its resources will not be processed by the controllers.",labelsFromPath={paused_value:"."}
199+
// +Metrics:info:name="owner",JSONPath=".metadata.ownerReferences",help="Owner references.",labelsFromPath={owner_is_controller:".controller",owner_kind:".kind",owner_name:".name",owner_uid:".uid"}
197200
// +Metrics:labelFromPath:name="cluster_name",JSONPath=.metadata.labels.cluster\.x-k8s\.io/cluster-name
198201
// +Metrics:info:name="info",help="Information about a vspherevm.",labelsFromPath={status_clonemode:.status.cloneMode,bootstrap_reference_kind:".spec.bootstrapRef.kind",bootstrap_reference_name:".spec.bootstrapRef.name",status_vmref:".status.vmRef"}
199202
type VSphereVM struct {
200-
metav1.TypeMeta `json:",inline"`
201-
// +Metrics:gauge:name="created",JSONPath=".creationTimestamp",help="Unix creation timestamp."
202-
// +Metrics:info:name="annotation_paused",JSONPath=.annotations['cluster\.x-k8s\.io/paused'],help="Whether the vspherevm is paused and any of its resources will not be processed by the controllers.",labelsFromPath={paused_value:"."}
203-
// +Metrics:info:name="owner",JSONPath=".ownerReferences",help="Owner references.",labelsFromPath={owner_is_controller:".controller",owner_kind:".kind",owner_name:".name",owner_uid:".uid"}
203+
metav1.TypeMeta `json:",inline"`
204204
metav1.ObjectMeta `json:"metadata,omitempty"`
205205

206206
Spec VSphereVMSpec `json:"spec,omitempty"`

0 commit comments

Comments
 (0)