Merge pull request #1817 from mrueg/prep-release-2.6.0

k8s-ci-robot · web-flow · commit bc3b98558b4a · 2022-08-24T09:38:03.000-07:00
*: Cut v2.6.0
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,20 @@
+## v2.6.0 / 2022-08-26
+* [FEATURE]     Add local storage labels to kube_persistentvolume_info #1814 @nabokihms
+* [FEATURE]     Add support for StateSet and Info metrics for Custom-Resource State #1777 @chrischdi
+* [FEATURE]     Add support for Rolebinding resource metrics #1799 @kaitoii11
+* [FEATURE]     Add new kube_horizontalpodautoscaler_status_target_metric #1725 @tanguyfalconnet
+* [FEATURE]     Add support for Role and Clusterrole resource metrics #1759 @kaitoii11
+* [FEATURE]     Add support for the ServiceAccount resource metrics #1773 @Serializator
+* [FEATURE]     Add metric for pod tolerations #1769 @Serializator
+* [FEATURE]     Add new kube_endpoint_address metric #1761 @bavarianbidi
+* [FEATURE]     Support reading the timestamp fields of custom resources #1766 @dontan001
+* [ENHANCEMENT] Migrate to structured logging #1807 @dmpe
+* [ENHANCEMENT] Switch registry vanity domain from k8s.gcr.io to registry.k8s.io #1750 @mrueg
+* [ENHANCEMENT] Graduate new endpoint metrics to stable #1812 @bavarianbidi
+* [BUGFIX]      Fix label name for kube_pod_nodeselector #1756 @yosshi825
+* [BUGFIX]      Fix Custom-Resource State Metrics not to contain underscores #1754 @chrischdi
+* [BUGFIX]      Fix kube_node_status_allocatable unit doc #1760 @jumbosushi
+
 ## v2.5.0 / 2022-06-03
 
 * [FEATURE]     Add experimental Custom-Resource State Metrics #1710 @iamnoah
diff --git a/README.md b/README.md
@@ -70,10 +70,10 @@ At most, 5 kube-state-metrics and 5 [kubernetes releases](https://github.com/kub
 
 | kube-state-metrics |  **Kubernetes 1.20** | **Kubernetes 1.21** | **Kubernetes 1.22** | **Kubernetes 1.23** | **Kubernetes 1.24** |
 |--------------------|:--------------------:|:---------------------:|:-------------------:|:-------------------:|:-------------------:|
-| **v2.2.4**         |          ✓           |           ✓           |          ✓          |          ✓          |          -          |
 | **v2.3.0**         |          ✓           |           ✓           |          ✓          |          ✓          |          -          |
 | **v2.4.2**         |         -/✓          |          -/✓          |          ✓          |          ✓          |          -          |
 | **v2.5.0**         |         -/✓          |          -/✓          |          ✓          |          ✓          |          ✓          |
+| **v2.6.0**         |         -/✓          |          -/✓          |          ✓          |          ✓          |          ✓          |
 | **master**         |         -/✓          |          -/✓          |          ✓          |          ✓          |          ✓          |
 
 - `✓` Fully supported version range.
@@ -90,7 +90,7 @@ release.
 #### Container Image
 
 The latest container image can be found at:
-* `registry.k8s.io/kube-state-metrics/kube-state-metrics:v2.5.0` (arch: `amd64`, `arm`, `arm64`, `ppc64le` and `s390x`)
+* `registry.k8s.io/kube-state-metrics/kube-state-metrics:v2.6.0` (arch: `amd64`, `arm`, `arm64`, `ppc64le` and `s390x`)
 
 ### Metrics Documentation
 
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.5.0
+2.6.0
diff --git a/docs/persistentvolume-metrics.md b/docs/persistentvolume-metrics.md
@@ -7,6 +7,6 @@
 | kube_persistentvolume_status_phase | Gauge | | | `persistentvolume`=&lt;pv-name&gt; <br>`phase`=&lt;Bound\|Failed\|Pending\|Available\|Released&gt; | STABLE |
 | kube_persistentvolume_claim_ref | Gauge | | | `persistentvolume`=&lt;pv-name&gt; <br>`claim_namespace`=&lt;<namespace>&gt; <br>`name`=&lt;<name>&gt; | STABLE |
 | kube_persistentvolume_labels | Gauge | | | `persistentvolume`=&lt;persistentvolume-name&gt; <br> `label_PERSISTENTVOLUME_LABEL`=&lt;PERSISTENTVOLUME_LABEL&gt; | STABLE |
-| kube_persistentvolume_info | Gauge | | | `persistentvolume`=&lt;pv-name&gt; <br> `storageclass`=&lt;storageclass-name&gt; <br> `gce_persistent_disk_name`=&lt;pd-name&gt; <br> `ebs_volume_id`=&lt;ebs-volume-id&gt; <br> `azure_disk_name`=&lt;azure-disk-name&gt; <br> `fc_wwids`=&lt;fc-wwids-comma-separated&gt; <br> `fc_lun`=&lt;fc-lun&gt; <br> `fc_target_wwns`=&lt;fc-target-wwns-comma-separated&gt; <br> `iscsi_target_portal`=&lt;iscsi-target-portal&gt; <br> `iscsi_iqn`=&lt;iscsi-iqn&gt; <br> `iscsi_lun`=&lt;iscsi-lun&gt; <br> `iscsi_initiator_name`=&lt;iscsi-initiator-name&gt; <br> `nfs_server`=&lt;nfs-server&gt; <br> `nfs_path`=&lt;nfs-path&gt; <br> `csi_driver`=&lt;csi-driver&gt; <br> `csi_volume_handle`=&lt;csi-volume-handle&gt; | STABLE |
+| kube_persistentvolume_info | Gauge | | | `persistentvolume`=&lt;pv-name&gt; <br> `storageclass`=&lt;storageclass-name&gt; <br> `gce_persistent_disk_name`=&lt;pd-name&gt; <br> `host_path`=&lt;path-of-a-host-volume&gt; <br> `host_path_type`=&lt;host-mount-type&gt; <br> `ebs_volume_id`=&lt;ebs-volume-id&gt; <br> `azure_disk_name`=&lt;azure-disk-name&gt; <br> `fc_wwids`=&lt;fc-wwids-comma-separated&gt; <br> `fc_lun`=&lt;fc-lun&gt; <br> `fc_target_wwns`=&lt;fc-target-wwns-comma-separated&gt; <br> `iscsi_target_portal`=&lt;iscsi-target-portal&gt; <br> `iscsi_iqn`=&lt;iscsi-iqn&gt; <br> `iscsi_lun`=&lt;iscsi-lun&gt; <br> `iscsi_initiator_name`=&lt;iscsi-initiator-name&gt; <br> `local_path`=&lt;path-of-a-local-volume&gt; <br> `local_fs`=&lt;local-volume-fs-type&gt; <br> `nfs_server`=&lt;nfs-server&gt; <br> `nfs_path`=&lt;nfs-path&gt; <br> `csi_driver`=&lt;csi-driver&gt; <br> `csi_volume_handle`=&lt;csi-volume-handle&gt; | STABLE |
 | kube_persistentvolume_created | Gauge | Unix Creation Timestamp | seconds | `persistentvolume`=&lt;persistentvolume-name&gt; <br> | EXPERIMENTAL |
 
diff --git a/examples/autosharding/cluster-role-binding.yaml b/examples/autosharding/cluster-role-binding.yaml
@@ -4,7 +4,7 @@ metadata:
   labels:
     app.kubernetes.io/component: exporter
     app.kubernetes.io/name: kube-state-metrics
-    app.kubernetes.io/version: 2.5.0
+    app.kubernetes.io/version: 2.6.0
   name: kube-state-metrics
 roleRef:
   apiGroup: rbac.authorization.k8s.io
diff --git a/examples/autosharding/cluster-role.yaml b/examples/autosharding/cluster-role.yaml
@@ -4,7 +4,7 @@ metadata:
   labels:
     app.kubernetes.io/component: exporter
     app.kubernetes.io/name: kube-state-metrics
-    app.kubernetes.io/version: 2.5.0
+    app.kubernetes.io/version: 2.6.0
   name: kube-state-metrics
 rules:
 - apiGroups:
diff --git a/examples/autosharding/role-binding.yaml b/examples/autosharding/role-binding.yaml
@@ -4,7 +4,7 @@ metadata:
   labels:
     app.kubernetes.io/component: exporter
     app.kubernetes.io/name: kube-state-metrics
-    app.kubernetes.io/version: 2.5.0
+    app.kubernetes.io/version: 2.6.0
   name: kube-state-metrics
   namespace: kube-system
 roleRef:
diff --git a/examples/autosharding/role.yaml b/examples/autosharding/role.yaml
@@ -4,7 +4,7 @@ metadata:
   labels:
     app.kubernetes.io/component: exporter
     app.kubernetes.io/name: kube-state-metrics
-    app.kubernetes.io/version: 2.5.0
+    app.kubernetes.io/version: 2.6.0
   name: kube-state-metrics
   namespace: kube-system
 rules:
diff --git a/examples/autosharding/service-account.yaml b/examples/autosharding/service-account.yaml
@@ -5,6 +5,6 @@ metadata:
   labels:
     app.kubernetes.io/component: exporter
     app.kubernetes.io/name: kube-state-metrics
-    app.kubernetes.io/version: 2.5.0
+    app.kubernetes.io/version: 2.6.0
   name: kube-state-metrics
   namespace: kube-system
diff --git a/examples/autosharding/service.yaml b/examples/autosharding/service.yaml
@@ -4,7 +4,7 @@ metadata:
   labels:
     app.kubernetes.io/component: exporter
     app.kubernetes.io/name: kube-state-metrics
-    app.kubernetes.io/version: 2.5.0
+    app.kubernetes.io/version: 2.6.0
   name: kube-state-metrics
   namespace: kube-system
 spec:
diff --git a/examples/autosharding/statefulset.yaml b/examples/autosharding/statefulset.yaml
@@ -4,7 +4,7 @@ metadata:
   labels:
     app.kubernetes.io/component: exporter
     app.kubernetes.io/name: kube-state-metrics
-    app.kubernetes.io/version: 2.5.0
+    app.kubernetes.io/version: 2.6.0
   name: kube-state-metrics
   namespace: kube-system
 spec:
@@ -18,7 +18,7 @@ spec:
       labels:
         app.kubernetes.io/component: exporter
         app.kubernetes.io/name: kube-state-metrics
-        app.kubernetes.io/version: 2.5.0
+        app.kubernetes.io/version: 2.6.0
     spec:
       automountServiceAccountToken: true
       containers:
@@ -34,7 +34,7 @@ spec:
           valueFrom:
             fieldRef:
               fieldPath: metadata.namespace
-        image: registry.k8s.io/kube-state-metrics/kube-state-metrics:v2.5.0
+        image: registry.k8s.io/kube-state-metrics/kube-state-metrics:v2.6.0
         livenessProbe:
           httpGet:
             path: /healthz
diff --git a/examples/standard/cluster-role-binding.yaml b/examples/standard/cluster-role-binding.yaml
@@ -4,7 +4,7 @@ metadata:
   labels:
     app.kubernetes.io/component: exporter
     app.kubernetes.io/name: kube-state-metrics
-    app.kubernetes.io/version: 2.5.0
+    app.kubernetes.io/version: 2.6.0
   name: kube-state-metrics
 roleRef:
   apiGroup: rbac.authorization.k8s.io
diff --git a/examples/standard/cluster-role.yaml b/examples/standard/cluster-role.yaml
@@ -4,7 +4,7 @@ metadata:
   labels:
     app.kubernetes.io/component: exporter
     app.kubernetes.io/name: kube-state-metrics
-    app.kubernetes.io/version: 2.5.0
+    app.kubernetes.io/version: 2.6.0
   name: kube-state-metrics
 rules:
 - apiGroups:
diff --git a/examples/standard/deployment.yaml b/examples/standard/deployment.yaml
@@ -4,7 +4,7 @@ metadata:
   labels:
     app.kubernetes.io/component: exporter
     app.kubernetes.io/name: kube-state-metrics
-    app.kubernetes.io/version: 2.5.0
+    app.kubernetes.io/version: 2.6.0
   name: kube-state-metrics
   namespace: kube-system
 spec:
@@ -17,11 +17,11 @@ spec:
       labels:
         app.kubernetes.io/component: exporter
         app.kubernetes.io/name: kube-state-metrics
-        app.kubernetes.io/version: 2.5.0
+        app.kubernetes.io/version: 2.6.0
     spec:
       automountServiceAccountToken: true
       containers:
-      - image: registry.k8s.io/kube-state-metrics/kube-state-metrics:v2.5.0
+      - image: registry.k8s.io/kube-state-metrics/kube-state-metrics:v2.6.0
         livenessProbe:
           httpGet:
             path: /healthz
diff --git a/examples/standard/service-account.yaml b/examples/standard/service-account.yaml
@@ -5,6 +5,6 @@ metadata:
   labels:
     app.kubernetes.io/component: exporter
     app.kubernetes.io/name: kube-state-metrics
-    app.kubernetes.io/version: 2.5.0
+    app.kubernetes.io/version: 2.6.0
   name: kube-state-metrics
   namespace: kube-system
diff --git a/examples/standard/service.yaml b/examples/standard/service.yaml
@@ -4,7 +4,7 @@ metadata:
   labels:
     app.kubernetes.io/component: exporter
     app.kubernetes.io/name: kube-state-metrics
-    app.kubernetes.io/version: 2.5.0
+    app.kubernetes.io/version: 2.6.0
   name: kube-state-metrics
   namespace: kube-system
 spec:
diff --git a/internal/store/persistentvolume.go b/internal/store/persistentvolume.go
@@ -164,7 +164,17 @@ func persistentVolumeMetricFamilies(allowAnnotationsList, allowLabelsList []stri
 			metric.Gauge,
 			"",
 			wrapPersistentVolumeFunc(func(p *v1.PersistentVolume) *metric.Family {
-				var gcePDDiskName, ebsVolumeID, azureDiskName, fcWWIDs, fcLun, fcTargetWWNs, iscsiTargetPortal, iscsiIQN, iscsiLun, iscsiInitiatorName, nfsServer, nfsPath, csiDriver, csiVolumeHandle string
+				var (
+					gcePDDiskName,
+					ebsVolumeID,
+					azureDiskName,
+					fcWWIDs, fcLun, fcTargetWWNs,
+					iscsiTargetPortal, iscsiIQN, iscsiLun, iscsiInitiatorName,
+					nfsServer, nfsPath,
+					csiDriver, csiVolumeHandle,
+					localFS, localPath,
+					hostPath, hostPathType string
+				)
 
 				switch {
 				case p.Spec.PersistentVolumeSource.GCEPersistentDisk != nil:
@@ -202,6 +212,16 @@ func persistentVolumeMetricFamilies(allowAnnotationsList, allowLabelsList []stri
 				case p.Spec.PersistentVolumeSource.CSI != nil:
 					csiDriver = p.Spec.PersistentVolumeSource.CSI.Driver
 					csiVolumeHandle = p.Spec.PersistentVolumeSource.CSI.VolumeHandle
+				case p.Spec.PersistentVolumeSource.Local != nil:
+					localPath = p.Spec.PersistentVolumeSource.Local.Path
+					if p.Spec.PersistentVolumeSource.Local.FSType != nil {
+						localFS = *p.Spec.PersistentVolumeSource.Local.FSType
+					}
+				case p.Spec.PersistentVolumeSource.HostPath != nil:
+					hostPath = p.Spec.PersistentVolumeSource.HostPath.Path
+					if p.Spec.PersistentVolumeSource.HostPath.Type != nil {
+						hostPathType = string(*p.Spec.PersistentVolumeSource.HostPath.Type)
+					}
 				}
 
 				return &metric.Family{
@@ -223,6 +243,10 @@ func persistentVolumeMetricFamilies(allowAnnotationsList, allowLabelsList []stri
 								"nfs_path",
 								"csi_driver",
 								"csi_volume_handle",
+								"local_path",
+								"local_fs",
+								"host_path",
+								"host_path_type",
 							},
 							LabelValues: []string{
 								p.Spec.StorageClassName,
@@ -240,6 +264,10 @@ func persistentVolumeMetricFamilies(allowAnnotationsList, allowLabelsList []stri
 								nfsPath,
 								csiDriver,
 								csiVolumeHandle,
+								localPath,
+								localFS,
+								hostPath,
+								hostPathType,
 							},
 							Value: 1,
 						},
diff --git a/internal/store/persistentvolume_test.go b/internal/store/persistentvolume_test.go
