Skip to content

Commit 9cf257a

Browse files
authored
Merge branch 'kubernetes:main' into main
2 parents afc7bbc + 662afca commit 9cf257a

File tree

12 files changed

+150
-99
lines changed

12 files changed

+150
-99
lines changed

.github/workflows/ci.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
3333

3434
- name: Set up Go 1.x
35-
uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5.2.0
35+
uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
3636
with:
3737
go-version: ${{ env.GO_VERSION }}
3838
id: go
@@ -54,7 +54,7 @@ jobs:
5454
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
5555

5656
- name: Set up Go 1.x
57-
uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5.2.0
57+
uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
5858
with:
5959
go-version: ${{ env.GO_VERSION }}
6060
id: go
@@ -75,7 +75,7 @@ jobs:
7575
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
7676

7777
- name: Set up Go 1.x
78-
uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5.2.0
78+
uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
7979
with:
8080
go-version: ${{ env.GO_VERSION }}
8181
id: go
@@ -96,7 +96,7 @@ jobs:
9696
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
9797

9898
- name: Set up Go 1.x
99-
uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5.2.0
99+
uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
100100
with:
101101
go-version: ${{ env.GO_VERSION }}
102102
id: go
@@ -117,7 +117,7 @@ jobs:
117117
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
118118

119119
- name: Set up Go 1.x
120-
uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5.2.0
120+
uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
121121
with:
122122
go-version: ${{ env.GO_VERSION }}
123123
id: go
@@ -153,7 +153,7 @@ jobs:
153153
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
154154

155155
- name: Set up Go 1.x
156-
uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5.2.0
156+
uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
157157
with:
158158
go-version: ${{ env.GO_VERSION }}
159159
id: go
@@ -184,7 +184,7 @@ jobs:
184184
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
185185

186186
- name: Set up Go 1.x
187-
uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5.2.0
187+
uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
188188
with:
189189
go-version: ${{ env.GO_VERSION }}
190190
id: go
@@ -205,7 +205,7 @@ jobs:
205205
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
206206

207207
- name: Set up Go 1.x
208-
uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5.2.0
208+
uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
209209
with:
210210
go-version: ${{ env.GO_VERSION }}
211211
id: go

.github/workflows/govulncheck.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1919
name: Checkout code
2020
- name: Set up Go 1.x
21-
uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5.2.0
21+
uses: actions/setup-go@f111f3307d8850f501ac008e886eec1fd1932a34 # v5.3.0
2222
with:
2323
go-version: ${{ env.GO_VERSION }}
2424
- name: Install govulncheck binary

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ Generally, it is recommended to use the latest release of kube-state-metrics. If
8484
| **v2.12.0** | v1.29 |
8585
| **v2.13.0** | v1.30 |
8686
| **v2.14.0** | v1.31 |
87-
| **main** | v1.31 |
87+
| **main** | v1.32 |
8888

8989
#### Resource group version compatibility
9090

data.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ compat:
1616
- version: "v2.14.0"
1717
kubernetes: "1.31"
1818
- version: "main"
19-
kubernetes: "1.31"
19+
kubernetes: "1.32"

docs/metrics/service/service-metrics.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
| Metric name | Metric type | Description | Unit (where applicable) | Labels/tags | Status |
44
| ----------------------------------------- | ----------- | ------------------------------------------------------------------------------------------------------------------------- | ----------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------ |
55
| kube_service_annotations | Gauge | Kubernetes annotations converted to Prometheus labels controlled via [--metric-annotations-allowlist](../../developer/cli-arguments.md) | | `service`=&lt;service-name&gt; <br> `namespace`=&lt;service-namespace&gt; <br> `uid`=&lt;service-uid&gt; <br> `annotation_SERVICE_ANNOTATION`=&lt;SERVICE_ANNOTATION&gt; | EXPERIMENTAL |
6-
| kube_service_info | Gauge | Information about service | | `service`=&lt;service-name&gt; <br> `namespace`=&lt;service-namespace&gt; <br> `uid`=&lt;service-uid&gt; <br> `cluster_ip`=&lt;service cluster ip&gt; <br> `external_name`=&lt;service external name&gt; <br> `load_balancer_ip`=&lt;service load balancer ip&gt; | STABLE |
6+
| kube_service_info | Gauge | Information about service | | `service`=&lt;service-name&gt; <br> `namespace`=&lt;service-namespace&gt; <br> `uid`=&lt;service-uid&gt; <br> `cluster_ip`=&lt;service cluster ip&gt; <br> `external_name`=&lt;service external name&gt; <br> `external_traffic_policy`=&lt;service external traffic policy&gt; <br> `load_balancer_ip`=&lt;service load balancer ip&gt; | STABLE |
77
| kube_service_labels | Gauge | Kubernetes labels converted to Prometheus labels controlled via [--metric-labels-allowlist](../../developer/cli-arguments.md) | | `service`=&lt;service-name&gt; <br> `namespace`=&lt;service-namespace&gt; <br> `uid`=&lt;service-uid&gt; <br> `label_SERVICE_LABEL`=&lt;SERVICE_LABEL&gt; | STABLE |
88
| kube_service_created | Gauge | Unix creation timestamp | seconds | `service`=&lt;service-name&gt; <br> `namespace`=&lt;service-namespace&gt; <br> `uid`=&lt;service-uid&gt; | STABLE |
99
| kube_service_spec_type | Gauge | Type about service | | `service`=&lt;service-name&gt; <br> `namespace`=&lt;service-namespace&gt; <br> `uid`=&lt;service-uid&gt; <br> `type`=&lt;ClusterIP\|NodePort\|LoadBalancer\|ExternalName&gt; | STABLE |

go.mod

Lines changed: 17 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module k8s.io/kube-state-metrics/v2
33
go 1.23.0
44

55
require (
6-
github.com/KimMachineGun/automemlimit v0.6.1
6+
github.com/KimMachineGun/automemlimit v0.7.0
77
github.com/dgryski/go-jump v0.0.0-20211018200510-ba001c3ffce0
88
github.com/fsnotify/fsnotify v1.8.0
99
github.com/go-logr/logr v1.4.2
@@ -12,44 +12,39 @@ require (
1212
github.com/oklog/run v1.1.0
1313
github.com/prometheus/client_golang v1.20.5
1414
github.com/prometheus/client_model v0.6.1
15-
github.com/prometheus/common v0.61.0
15+
github.com/prometheus/common v0.62.0
1616
github.com/prometheus/exporter-toolkit v0.13.2
1717
github.com/robfig/cron/v3 v3.0.1
1818
github.com/spf13/cobra v1.8.1
1919
github.com/spf13/viper v1.19.0
2020
github.com/stretchr/testify v1.10.0
2121
gopkg.in/yaml.v3 v3.0.1
22-
k8s.io/api v0.31.3
23-
k8s.io/apimachinery v0.31.3
24-
k8s.io/client-go v0.31.3
25-
k8s.io/component-base v0.31.3
22+
k8s.io/api v0.32.1
23+
k8s.io/apimachinery v0.32.1
24+
k8s.io/client-go v0.32.1
25+
k8s.io/component-base v0.32.1
2626
k8s.io/klog/v2 v2.130.1
27-
k8s.io/sample-controller v0.31.3
27+
k8s.io/sample-controller v0.32.1
2828
k8s.io/utils v0.0.0-20241104163129-6fe5fd82f078
2929
)
3030

3131
require (
3232
github.com/beorn7/perks v1.0.1 // indirect
3333
github.com/blang/semver/v4 v4.0.0 // indirect
3434
github.com/cespare/xxhash/v2 v2.3.0 // indirect
35-
github.com/cilium/ebpf v0.9.1 // indirect
36-
github.com/containerd/cgroups/v3 v3.0.1 // indirect
3735
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
3836
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
39-
github.com/docker/go-units v0.4.0 // indirect
4037
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
4138
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
42-
github.com/go-openapi/jsonpointer v0.19.6 // indirect
39+
github.com/go-openapi/jsonpointer v0.21.0 // indirect
4340
github.com/go-openapi/jsonreference v0.20.2 // indirect
44-
github.com/go-openapi/swag v0.22.4 // indirect
45-
github.com/godbus/dbus/v5 v5.0.4 // indirect
41+
github.com/go-openapi/swag v0.23.0 // indirect
4642
github.com/gogo/protobuf v1.3.2 // indirect
4743
github.com/golang/protobuf v1.5.4 // indirect
4844
github.com/google/gnostic-models v0.6.8 // indirect
4945
github.com/google/gofuzz v1.2.0 // indirect
5046
github.com/google/uuid v1.6.0 // indirect
5147
github.com/hashicorp/hcl v1.0.0 // indirect
52-
github.com/imdario/mergo v0.3.6 // indirect
5348
github.com/inconshreveable/mousetrap v1.1.0 // indirect
5449
github.com/josharian/intern v1.0.0 // indirect
5550
github.com/jpillora/backoff v1.0.0 // indirect
@@ -64,38 +59,38 @@ require (
6459
github.com/modern-go/reflect2 v1.0.2 // indirect
6560
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
6661
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect
67-
github.com/opencontainers/runtime-spec v1.0.2 // indirect
6862
github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 // indirect
6963
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
7064
github.com/pkg/errors v0.9.1 // indirect
7165
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
7266
github.com/prometheus/procfs v0.15.1 // indirect
7367
github.com/sagikazarmark/locafero v0.4.0 // indirect
7468
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
75-
github.com/sirupsen/logrus v1.9.3 // indirect
7669
github.com/sourcegraph/conc v0.3.0 // indirect
7770
github.com/spf13/afero v1.11.0 // indirect
7871
github.com/spf13/cast v1.6.0 // indirect
7972
github.com/spf13/pflag v1.0.5 // indirect
8073
github.com/subosito/gotenv v1.6.0 // indirect
8174
github.com/x448/float16 v0.8.4 // indirect
75+
go.opentelemetry.io/otel v1.28.0 // indirect
76+
go.opentelemetry.io/otel/trace v1.28.0 // indirect
8277
go.uber.org/multierr v1.11.0 // indirect
8378
golang.org/x/crypto v0.31.0 // indirect
8479
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
85-
golang.org/x/net v0.32.0 // indirect
80+
golang.org/x/net v0.33.0 // indirect
8681
golang.org/x/oauth2 v0.24.0 // indirect
8782
golang.org/x/sync v0.10.0 // indirect
8883
golang.org/x/sys v0.28.0 // indirect
8984
golang.org/x/term v0.27.0 // indirect
9085
golang.org/x/text v0.21.0 // indirect
91-
golang.org/x/time v0.5.0 // indirect
92-
google.golang.org/protobuf v1.35.2 // indirect
86+
golang.org/x/time v0.7.0 // indirect
87+
google.golang.org/protobuf v1.36.1 // indirect
9388
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
9489
gopkg.in/inf.v0 v0.9.1 // indirect
9590
gopkg.in/ini.v1 v1.67.0 // indirect
9691
gopkg.in/yaml.v2 v2.4.0 // indirect
97-
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
98-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
99-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
92+
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
93+
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
94+
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
10095
sigs.k8s.io/yaml v1.4.0 // indirect
10196
)

0 commit comments

Comments
 (0)