fixes

kubernetes-sigs · Sep 12, 2023 · cf76710 · cf76710
1 parent 4e8c13f
commit cf76710
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 39 deletions.
diff --git a/apis/v1beta1/vspherecluster_types.go b/apis/v1beta1/vspherecluster_types.go
@@ -110,7 +110,7 @@ type VSphereClusterStatus struct {
 // +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp",description="Time duration since creation of Machine"
 
 // VSphereCluster is the Schema for the vsphereclusters API
-// +Metrics:gvk:namePrefix="capv_vspherecluster"
+// +Metrics:gvk:namePrefix="capi_vspherecluster"
 // +Metrics:labelFromPath:name="name",JSONPath=".metadata.name"
 // +Metrics:labelFromPath:name="namespace",JSONPath=".metadata.namespace"
 // +Metrics:labelFromPath:name="uid",JSONPath=".metadata.uid"

diff --git a/apis/v1beta1/vsphereclusteridentity_types.go b/apis/v1beta1/vsphereclusteridentity_types.go
@@ -86,7 +86,7 @@ func (c *VSphereClusterIdentity) SetConditions(conditions clusterv1.Conditions)
 // +kubebuilder:subresource:status
 
 // VSphereClusterIdentity defines the account to be used for reconciling clusters
-// +Metrics:gvk:namePrefix="capv_vsphereclusteridentity"
+// +Metrics:gvk:namePrefix="capi_vsphereclusteridentity"
 // +Metrics:labelFromPath:name="name",JSONPath=".metadata.name"
 // +Metrics:labelFromPath:name="namespace",JSONPath=".metadata.namespace"
 // +Metrics:labelFromPath:name="uid",JSONPath=".metadata.uid"

diff --git a/apis/v1beta1/vspheredeploymentzone_types.go b/apis/v1beta1/vspheredeploymentzone_types.go
@@ -92,7 +92,7 @@ type VSphereDeploymentZoneStatus struct {
 // +kubebuilder:subresource:status
 
 // VSphereDeploymentZone is the Schema for the vspheredeploymentzones API
-// +Metrics:gvk:namePrefix="capv_vspheredeploymentzone"
+// +Metrics:gvk:namePrefix="capi_vspheredeploymentzone"
 // +Metrics:labelFromPath:name="name",JSONPath=".metadata.name"
 // +Metrics:labelFromPath:name="namespace",JSONPath=".metadata.namespace"
 // +Metrics:labelFromPath:name="uid",JSONPath=".metadata.uid"

diff --git a/apis/v1beta1/vspherefailuredomain_types.go b/apis/v1beta1/vspherefailuredomain_types.go
@@ -95,7 +95,7 @@ type FailureDomainHosts struct {
 // +kubebuilder:resource:path=vspherefailuredomains,scope=Cluster,categories=cluster-api
 
 // VSphereFailureDomain is the Schema for the vspherefailuredomains API
-// +Metrics:gvk:namePrefix="capv_vspherefailuredomain"
+// +Metrics:gvk:namePrefix="capi_vspherefailuredomain"
 // +Metrics:labelFromPath:name="name",JSONPath=".metadata.name"
 // +Metrics:labelFromPath:name="namespace",JSONPath=".metadata.namespace"
 // +Metrics:labelFromPath:name="uid",JSONPath=".metadata.uid"

diff --git a/apis/v1beta1/vspheremachine_types.go b/apis/v1beta1/vspheremachine_types.go
@@ -78,7 +78,7 @@ type VSphereMachineStatus struct {
 	Ready bool `json:"ready"`
 
 	// Addresses contains the VSphere instance associated addresses.
-	// +Metrics:info:name="addresses",help="Address information about a vspheremachine.",labelsFromPath={address:".address",type:".type"}
+	// +Metrics:info:name="status_addresses",help="Address information about a vspheremachine.",labelsFromPath={address:".address",type:".type"}
 	Addresses []clusterv1.MachineAddress `json:"addresses,omitempty"`
 
 	// Network returns the network status for each of the machine's configured
@@ -142,7 +142,7 @@ type VSphereMachineStatus struct {
 // +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp",description="Time duration since creation of Machine"
 
 // VSphereMachine is the Schema for the vspheremachines API
-// +Metrics:gvk:namePrefix="capv_vspheremachine"
+// +Metrics:gvk:namePrefix="capi_vspheremachine"
 // +Metrics:labelFromPath:name="name",JSONPath=".metadata.name"
 // +Metrics:labelFromPath:name="namespace",JSONPath=".metadata.namespace"
 // +Metrics:labelFromPath:name="uid",JSONPath=".metadata.uid"

diff --git a/apis/v1beta1/vspherevm_types.go b/apis/v1beta1/vspherevm_types.go
@@ -104,7 +104,7 @@ type VSphereVMStatus struct {
 	// This field is required at runtime for other controllers that read
 	// this CRD as unstructured data.
 	// +optional
-	// +Metrics:info:name="addresses",help="Address information about a vspherevm.",labelsFromPath={address:"."}
+	// +Metrics:info:name="status_addresses",help="Address information about a vspherevm.",labelsFromPath={address:"."}
 	Addresses []string `json:"addresses,omitempty"`
 
 	// CloneMode is the type of clone operation used to clone this VM. Since
@@ -190,7 +190,7 @@ type VSphereVMStatus struct {
 // +kubebuilder:subresource:status
 
 // VSphereVM is the Schema for the vspherevms API
-// +Metrics:gvk:namePrefix="capv_vspherevm"
+// +Metrics:gvk:namePrefix="capi_vspherevm"
 // +Metrics:labelFromPath:name="name",JSONPath=".metadata.name"
 // +Metrics:labelFromPath:name="namespace",JSONPath=".metadata.namespace"
 // +Metrics:labelFromPath:name="uid",JSONPath=".metadata.uid"

diff --git a/config/metrics/crd-metrics-config.yaml b/config/metrics/crd-metrics-config.yaml
@@ -21,7 +21,7 @@ spec:
       uid:
       - metadata
       - uid
-    metricNamePrefix: capv_vspherecluster
+    metricNamePrefix: capi_vspherecluster
     metrics:
     - each:
         info:
@@ -142,7 +142,7 @@ spec:
       uid:
       - metadata
       - uid
-    metricNamePrefix: capv_vsphereclusteridentity
+    metricNamePrefix: capi_vsphereclusteridentity
     metrics:
     - each:
         info:
@@ -252,7 +252,7 @@ spec:
       uid:
       - metadata
       - uid
-    metricNamePrefix: capv_vspheredeploymentzone
+    metricNamePrefix: capi_vspheredeploymentzone
     metrics:
     - each:
         info:
@@ -362,7 +362,7 @@ spec:
       uid:
       - metadata
       - uid
-    metricNamePrefix: capv_vspherefailuredomain
+    metricNamePrefix: capi_vspherefailuredomain
     metrics:
     - each:
         info:
@@ -437,22 +437,8 @@ spec:
       uid:
       - metadata
       - uid
-    metricNamePrefix: capv_vspheremachine
+    metricNamePrefix: capi_vspheremachine
     metrics:
-    - each:
-        info:
-          labelFromKey: ""
-          labelsFromPath:
-            address:
-            - address
-            type:
-            - type
-          path:
-          - status
-          - addresses
-        type: Info
-      help: Address information about a vspheremachine.
-      name: addresses
     - each:
         info:
           labelFromKey: ""
@@ -506,6 +492,20 @@ spec:
         type: Info
       help: Owner references.
       name: owner
+    - each:
+        info:
+          labelFromKey: ""
+          labelsFromPath:
+            address:
+            - address
+            type:
+            - type
+          path:
+          - status
+          - addresses
+        type: Info
+      help: Address information about a vspheremachine.
+      name: status_addresses
     - each:
         stateSet:
           labelName: status
@@ -561,19 +561,8 @@ spec:
       uid:
       - metadata
       - uid
-    metricNamePrefix: capv_vspherevm
+    metricNamePrefix: capi_vspherevm
     metrics:
-    - each:
-        info:
-          labelFromKey: ""
-          labelsFromPath:
-            address: []
-          path:
-          - status
-          - addresses
-        type: Info
-      help: Address information about a vspherevm.
-      name: addresses
     - each:
         info:
           labelFromKey: ""
@@ -638,6 +627,17 @@ spec:
         type: Info
       help: Owner references.
       name: owner
+    - each:
+        info:
+          labelFromKey: ""
+          labelsFromPath:
+            address: []
+          path:
+          - status
+          - addresses
+        type: Info
+      help: Address information about a vspherevm.
+      name: status_addresses
     - each:
         stateSet:
           labelName: status