Merge remote-tracking branch 'origin/master' into release-1.34

This commit is contained in:
Kubernetes Release Robot
2025-08-08 22:19:58 +00:00
4 changed files with 494 additions and 14 deletions

View File

@@ -24,6 +24,12 @@ rules:
branch: release-1.33
dirs:
- staging/src/k8s.io/apimachinery
- name: release-1.34
go: 1.24.5
source:
branch: release-1.34
dirs:
- staging/src/k8s.io/apimachinery
library: true
- destination: api
branches:
@@ -62,6 +68,15 @@ rules:
branch: release-1.33
dirs:
- staging/src/k8s.io/api
- name: release-1.34
go: 1.24.5
dependencies:
- repository: apimachinery
branch: release-1.34
source:
branch: release-1.34
dirs:
- staging/src/k8s.io/api
library: true
- destination: client-go
branches:
@@ -124,6 +139,21 @@ rules:
# assumes GO111MODULE=on
go build -mod=mod ./...
go test -mod=mod ./...
- name: release-1.34
go: 1.24.5
dependencies:
- repository: apimachinery
branch: release-1.34
- repository: api
branch: release-1.34
source:
branch: release-1.34
dirs:
- staging/src/k8s.io/client-go
smoke-test: |
# assumes GO111MODULE=on
go build -mod=mod ./...
go test -mod=mod ./...
library: true
- destination: code-generator
branches:
@@ -162,6 +192,15 @@ rules:
branch: release-1.33
dirs:
- staging/src/k8s.io/code-generator
- name: release-1.34
go: 1.24.5
dependencies:
- repository: apimachinery
branch: release-1.34
source:
branch: release-1.34
dirs:
- staging/src/k8s.io/code-generator
- destination: component-base
branches:
- name: master
@@ -215,6 +254,19 @@ rules:
branch: release-1.33
dirs:
- staging/src/k8s.io/component-base
- name: release-1.34
go: 1.24.5
dependencies:
- repository: apimachinery
branch: release-1.34
- repository: api
branch: release-1.34
- repository: client-go
branch: release-1.34
source:
branch: release-1.34
dirs:
- staging/src/k8s.io/component-base
library: true
- destination: component-helpers
branches:
@@ -269,6 +321,19 @@ rules:
branch: release-1.33
dirs:
- staging/src/k8s.io/component-helpers
- name: release-1.34
go: 1.24.5
dependencies:
- repository: apimachinery
branch: release-1.34
- repository: api
branch: release-1.34
- repository: client-go
branch: release-1.34
source:
branch: release-1.34
dirs:
- staging/src/k8s.io/component-helpers
library: true
- destination: kms
branches:
@@ -307,6 +372,15 @@ rules:
branch: release-1.33
dirs:
- staging/src/k8s.io/kms
- name: release-1.34
go: 1.24.5
dependencies:
- repository: apimachinery
branch: release-1.34
source:
branch: release-1.34
dirs:
- staging/src/k8s.io/kms
library: true
- destination: apiserver
branches:
@@ -377,6 +451,23 @@ rules:
branch: release-1.33
dirs:
- staging/src/k8s.io/apiserver
- name: release-1.34
go: 1.24.5
dependencies:
- repository: apimachinery
branch: release-1.34
- repository: api
branch: release-1.34
- repository: client-go
branch: release-1.34
- repository: component-base
branch: release-1.34
- repository: kms
branch: release-1.34
source:
branch: release-1.34
dirs:
- staging/src/k8s.io/apiserver
library: true
- destination: kube-aggregator
branches:
@@ -463,6 +554,27 @@ rules:
branch: release-1.33
dirs:
- staging/src/k8s.io/kube-aggregator
- name: release-1.34
go: 1.24.5
dependencies:
- repository: apimachinery
branch: release-1.34
- repository: api
branch: release-1.34
- repository: client-go
branch: release-1.34
- repository: apiserver
branch: release-1.34
- repository: component-base
branch: release-1.34
- repository: kms
branch: release-1.34
- repository: code-generator
branch: release-1.34
source:
branch: release-1.34
dirs:
- staging/src/k8s.io/kube-aggregator
- destination: sample-apiserver
branches:
- name: master
@@ -568,6 +680,32 @@ rules:
smoke-test: |
# assumes GO111MODULE=on
go build -mod=mod .
- name: release-1.34
go: 1.24.5
dependencies:
- repository: apimachinery
branch: release-1.34
- repository: api
branch: release-1.34
- repository: client-go
branch: release-1.34
- repository: apiserver
branch: release-1.34
- repository: code-generator
branch: release-1.34
- repository: kms
branch: release-1.34
- repository: component-base
branch: release-1.34
source:
branch: release-1.34
dirs:
- staging/src/k8s.io/sample-apiserver
required-packages:
- k8s.io/code-generator
smoke-test: |
# assumes GO111MODULE=on
go build -mod=mod .
- destination: sample-controller
branches:
- name: master
@@ -649,6 +787,26 @@ rules:
smoke-test: |
# assumes GO111MODULE=on
go build -mod=mod .
- name: release-1.34
go: 1.24.5
dependencies:
- repository: apimachinery
branch: release-1.34
- repository: api
branch: release-1.34
- repository: client-go
branch: release-1.34
- repository: code-generator
branch: release-1.34
source:
branch: release-1.34
dirs:
- staging/src/k8s.io/sample-controller
required-packages:
- k8s.io/code-generator
smoke-test: |
# assumes GO111MODULE=on
go build -mod=mod .
- destination: apiextensions-apiserver
branches:
- name: master
@@ -742,6 +900,29 @@ rules:
- staging/src/k8s.io/apiextensions-apiserver
required-packages:
- k8s.io/code-generator
- name: release-1.34
go: 1.24.5
dependencies:
- repository: apimachinery
branch: release-1.34
- repository: api
branch: release-1.34
- repository: client-go
branch: release-1.34
- repository: apiserver
branch: release-1.34
- repository: code-generator
branch: release-1.34
- repository: component-base
branch: release-1.34
- repository: kms
branch: release-1.34
source:
branch: release-1.34
dirs:
- staging/src/k8s.io/apiextensions-apiserver
required-packages:
- k8s.io/code-generator
- destination: metrics
branches:
- name: master
@@ -803,6 +984,21 @@ rules:
branch: release-1.33
dirs:
- staging/src/k8s.io/metrics
- name: release-1.34
go: 1.24.5
dependencies:
- repository: apimachinery
branch: release-1.34
- repository: api
branch: release-1.34
- repository: client-go
branch: release-1.34
- repository: code-generator
branch: release-1.34
source:
branch: release-1.34
dirs:
- staging/src/k8s.io/metrics
library: true
- destination: cli-runtime
branches:
@@ -857,6 +1053,19 @@ rules:
branch: release-1.33
dirs:
- staging/src/k8s.io/cli-runtime
- name: release-1.34
go: 1.24.5
dependencies:
- repository: api
branch: release-1.34
- repository: apimachinery
branch: release-1.34
- repository: client-go
branch: release-1.34
source:
branch: release-1.34
dirs:
- staging/src/k8s.io/cli-runtime
library: true
- destination: sample-cli-plugin
branches:
@@ -919,6 +1128,21 @@ rules:
branch: release-1.33
dirs:
- staging/src/k8s.io/sample-cli-plugin
- name: release-1.34
go: 1.24.5
dependencies:
- repository: api
branch: release-1.34
- repository: apimachinery
branch: release-1.34
- repository: cli-runtime
branch: release-1.34
- repository: client-go
branch: release-1.34
source:
branch: release-1.34
dirs:
- staging/src/k8s.io/sample-cli-plugin
- destination: kube-proxy
branches:
- name: master
@@ -980,6 +1204,21 @@ rules:
branch: release-1.33
dirs:
- staging/src/k8s.io/kube-proxy
- name: release-1.34
go: 1.24.5
dependencies:
- repository: apimachinery
branch: release-1.34
- repository: component-base
branch: release-1.34
- repository: api
branch: release-1.34
- repository: client-go
branch: release-1.34
source:
branch: release-1.34
dirs:
- staging/src/k8s.io/kube-proxy
library: true
- destination: cri-api
branches:
@@ -1006,6 +1245,12 @@ rules:
branch: release-1.33
dirs:
- staging/src/k8s.io/cri-api
- name: release-1.34
go: 1.24.5
source:
branch: release-1.34
dirs:
- staging/src/k8s.io/cri-api
library: true
- destination: cri-client
branches:
@@ -1076,6 +1321,23 @@ rules:
branch: release-1.33
dirs:
- staging/src/k8s.io/cri-client
- name: release-1.34
go: 1.24.5
dependencies:
- repository: api
branch: release-1.34
- repository: apimachinery
branch: release-1.34
- repository: client-go
branch: release-1.34
- repository: component-base
branch: release-1.34
- repository: cri-api
branch: release-1.34
source:
branch: release-1.34
dirs:
- staging/src/k8s.io/cri-client
library: true
- destination: kubelet
branches:
@@ -1162,6 +1424,27 @@ rules:
branch: release-1.33
dirs:
- staging/src/k8s.io/kubelet
- name: release-1.34
go: 1.24.5
dependencies:
- repository: apimachinery
branch: release-1.34
- repository: apiserver
branch: release-1.34
- repository: api
branch: release-1.34
- repository: client-go
branch: release-1.34
- repository: cri-api
branch: release-1.34
- repository: component-base
branch: release-1.34
- repository: kms
branch: release-1.34
source:
branch: release-1.34
dirs:
- staging/src/k8s.io/kubelet
library: true
- destination: kube-scheduler
branches:
@@ -1224,6 +1507,21 @@ rules:
branch: release-1.33
dirs:
- staging/src/k8s.io/kube-scheduler
- name: release-1.34
go: 1.24.5
dependencies:
- repository: apimachinery
branch: release-1.34
- repository: component-base
branch: release-1.34
- repository: api
branch: release-1.34
- repository: client-go
branch: release-1.34
source:
branch: release-1.34
dirs:
- staging/src/k8s.io/kube-scheduler
library: true
- destination: controller-manager
branches:
@@ -1302,6 +1600,25 @@ rules:
branch: release-1.33
dirs:
- staging/src/k8s.io/controller-manager
- name: release-1.34
go: 1.24.5
dependencies:
- repository: api
branch: release-1.34
- repository: apimachinery
branch: release-1.34
- repository: client-go
branch: release-1.34
- repository: component-base
branch: release-1.34
- repository: apiserver
branch: release-1.34
- repository: kms
branch: release-1.34
source:
branch: release-1.34
dirs:
- staging/src/k8s.io/controller-manager
library: true
- destination: cloud-provider
branches:
@@ -1396,6 +1713,29 @@ rules:
branch: release-1.33
dirs:
- staging/src/k8s.io/cloud-provider
- name: release-1.34
go: 1.24.5
dependencies:
- repository: api
branch: release-1.34
- repository: apimachinery
branch: release-1.34
- repository: apiserver
branch: release-1.34
- repository: client-go
branch: release-1.34
- repository: component-base
branch: release-1.34
- repository: controller-manager
branch: release-1.34
- repository: component-helpers
branch: release-1.34
- repository: kms
branch: release-1.34
source:
branch: release-1.34
dirs:
- staging/src/k8s.io/cloud-provider
library: true
- destination: kube-controller-manager
branches:
@@ -1498,6 +1838,31 @@ rules:
branch: release-1.33
dirs:
- staging/src/k8s.io/kube-controller-manager
- name: release-1.34
go: 1.24.5
dependencies:
- repository: apimachinery
branch: release-1.34
- repository: apiserver
branch: release-1.34
- repository: component-base
branch: release-1.34
- repository: api
branch: release-1.34
- repository: client-go
branch: release-1.34
- repository: controller-manager
branch: release-1.34
- repository: cloud-provider
branch: release-1.34
- repository: component-helpers
branch: release-1.34
- repository: kms
branch: release-1.34
source:
branch: release-1.34
dirs:
- staging/src/k8s.io/kube-controller-manager
library: true
- destination: cluster-bootstrap
branches:
@@ -1544,6 +1909,17 @@ rules:
branch: release-1.33
dirs:
- staging/src/k8s.io/cluster-bootstrap
- name: release-1.34
go: 1.24.5
dependencies:
- repository: apimachinery
branch: release-1.34
- repository: api
branch: release-1.34
source:
branch: release-1.34
dirs:
- staging/src/k8s.io/cluster-bootstrap
library: true
- destination: csi-translation-lib
branches:
@@ -1590,6 +1966,17 @@ rules:
branch: release-1.33
dirs:
- staging/src/k8s.io/csi-translation-lib
- name: release-1.34
go: 1.24.5
dependencies:
- repository: api
branch: release-1.34
- repository: apimachinery
branch: release-1.34
source:
branch: release-1.34
dirs:
- staging/src/k8s.io/csi-translation-lib
library: true
- destination: mount-utils
branches:
@@ -1616,6 +2003,12 @@ rules:
branch: release-1.33
dirs:
- staging/src/k8s.io/mount-utils
- name: release-1.34
go: 1.24.5
source:
branch: release-1.34
dirs:
- staging/src/k8s.io/mount-utils
library: true
- destination: kubectl
branches:
@@ -1710,6 +2103,29 @@ rules:
branch: release-1.33
dirs:
- staging/src/k8s.io/kubectl
- name: release-1.34
go: 1.24.5
dependencies:
- repository: api
branch: release-1.34
- repository: apimachinery
branch: release-1.34
- repository: cli-runtime
branch: release-1.34
- repository: client-go
branch: release-1.34
- repository: code-generator
branch: release-1.34
- repository: component-base
branch: release-1.34
- repository: component-helpers
branch: release-1.34
- repository: metrics
branch: release-1.34
source:
branch: release-1.34
dirs:
- staging/src/k8s.io/kubectl
library: true
- destination: pod-security-admission
branches:
@@ -1788,6 +2204,25 @@ rules:
branch: release-1.33
dirs:
- staging/src/k8s.io/pod-security-admission
- name: release-1.34
go: 1.24.5
dependencies:
- repository: api
branch: release-1.34
- repository: apimachinery
branch: release-1.34
- repository: apiserver
branch: release-1.34
- repository: client-go
branch: release-1.34
- repository: component-base
branch: release-1.34
- repository: kms
branch: release-1.34
source:
branch: release-1.34
dirs:
- staging/src/k8s.io/pod-security-admission
library: true
- destination: dynamic-resource-allocation
branches:
@@ -1890,6 +2325,31 @@ rules:
branch: release-1.33
dirs:
- staging/src/k8s.io/dynamic-resource-allocation
- name: release-1.34
go: 1.24.5
dependencies:
- repository: apimachinery
branch: release-1.34
- repository: apiserver
branch: release-1.34
- repository: api
branch: release-1.34
- repository: client-go
branch: release-1.34
- repository: cri-api
branch: release-1.34
- repository: component-base
branch: release-1.34
- repository: component-helpers
branch: release-1.34
- repository: kms
branch: release-1.34
- repository: kubelet
branch: release-1.34
source:
branch: release-1.34
dirs:
- staging/src/k8s.io/dynamic-resource-allocation
- destination: endpointslice
branches:
- name: master
@@ -1951,6 +2411,21 @@ rules:
branch: release-1.33
dirs:
- staging/src/k8s.io/endpointslice
- name: release-1.34
go: 1.24.5
dependencies:
- repository: api
branch: release-1.34
- repository: apimachinery
branch: release-1.34
- repository: client-go
branch: release-1.34
- repository: component-base
branch: release-1.34
source:
branch: release-1.34
dirs:
- staging/src/k8s.io/endpointslice
- destination: externaljwt
branches:
- name: master
@@ -1970,6 +2445,12 @@ rules:
branch: release-1.33
dirs:
- staging/src/k8s.io/externaljwt
- name: release-1.34
go: 1.24.5
source:
branch: release-1.34
dirs:
- staging/src/k8s.io/externaljwt
recursive-delete-patterns:
- '*/.gitattributes'
default-go-version: 1.24.5

View File

@@ -72,10 +72,9 @@ var (
)
objectCounts = compbasemetrics.NewGaugeVec(
&compbasemetrics.GaugeOpts{
Name: "apiserver_storage_objects",
Help: "Number of stored objects at the time of last check split by kind. In case of a fetching error, the value will be -1.",
StabilityLevel: compbasemetrics.STABLE,
DeprecatedVersion: "1.34.0",
Name: "apiserver_storage_objects",
Help: "[DEPRECATED, consider using apiserver_resource_objects instead] Number of stored objects at the time of last check split by kind. In case of a fetching error, the value will be -1.",
StabilityLevel: compbasemetrics.STABLE,
},
[]string{"resource"},
)

View File

@@ -250,7 +250,7 @@ apiserver_resource_objects{group="foo",resource="bar"} 10
# HELP apiserver_resource_size_estimate_bytes [ALPHA] Estimated size of stored objects in database. Estimate is based on sum of last observed sizes of serialized objects. In case of a fetching error, the value will be -1.
# TYPE apiserver_resource_size_estimate_bytes gauge
apiserver_resource_size_estimate_bytes{group="foo",resource="bar"} -1
# HELP apiserver_storage_objects [STABLE] Number of stored objects at the time of last check split by kind. In case of a fetching error, the value will be -1.
# HELP apiserver_storage_objects [STABLE] [DEPRECATED, consider using apiserver_resource_objects instead] Number of stored objects at the time of last check split by kind. In case of a fetching error, the value will be -1.
# TYPE apiserver_storage_objects gauge
apiserver_storage_objects{resource="bar.foo"} 10
`,
@@ -265,7 +265,7 @@ apiserver_resource_objects{group="foo",resource="bar"} 10
# HELP apiserver_resource_size_estimate_bytes [ALPHA] Estimated size of stored objects in database. Estimate is based on sum of last observed sizes of serialized objects. In case of a fetching error, the value will be -1.
# TYPE apiserver_resource_size_estimate_bytes gauge
apiserver_resource_size_estimate_bytes{group="foo",resource="bar"} 100
# HELP apiserver_storage_objects [STABLE] Number of stored objects at the time of last check split by kind. In case of a fetching error, the value will be -1.
# HELP apiserver_storage_objects [STABLE] [DEPRECATED, consider using apiserver_resource_objects instead] Number of stored objects at the time of last check split by kind. In case of a fetching error, the value will be -1.
# TYPE apiserver_storage_objects gauge
apiserver_storage_objects{resource="bar.foo"} 10
`,
@@ -280,7 +280,7 @@ apiserver_resource_objects{group="foo",resource="bar"} 0
# HELP apiserver_resource_size_estimate_bytes [ALPHA] Estimated size of stored objects in database. Estimate is based on sum of last observed sizes of serialized objects. In case of a fetching error, the value will be -1.
# TYPE apiserver_resource_size_estimate_bytes gauge
apiserver_resource_size_estimate_bytes{group="foo",resource="bar"} 0
# HELP apiserver_storage_objects [STABLE] Number of stored objects at the time of last check split by kind. In case of a fetching error, the value will be -1.
# HELP apiserver_storage_objects [STABLE] [DEPRECATED, consider using apiserver_resource_objects instead] Number of stored objects at the time of last check split by kind. In case of a fetching error, the value will be -1.
# TYPE apiserver_storage_objects gauge
apiserver_storage_objects{resource="bar.foo"} 0
`,
@@ -292,7 +292,7 @@ apiserver_storage_objects{resource="bar.foo"} 0
want: `# HELP apiserver_resource_objects [ALPHA] Number of stored objects at the time of last check split by kind. In case of a fetching error, the value will be -1.
# TYPE apiserver_resource_objects gauge
apiserver_resource_objects{group="foo",resource="bar"} -1
# HELP apiserver_storage_objects [STABLE] Number of stored objects at the time of last check split by kind. In case of a fetching error, the value will be -1.
# HELP apiserver_storage_objects [STABLE] [DEPRECATED, consider using apiserver_resource_objects instead] Number of stored objects at the time of last check split by kind. In case of a fetching error, the value will be -1.
# TYPE apiserver_storage_objects gauge
apiserver_storage_objects{resource="bar.foo"} -1
# HELP apiserver_resource_size_estimate_bytes [ALPHA] Estimated size of stored objects in database. Estimate is based on sum of last observed sizes of serialized objects. In case of a fetching error, the value will be -1.
@@ -325,7 +325,7 @@ func TestDeleteStoreStats(t *testing.T) {
# TYPE apiserver_resource_size_estimate_bytes gauge
apiserver_resource_size_estimate_bytes{group="foo1",resource="bar1"} -1
apiserver_resource_size_estimate_bytes{group="foo2",resource="bar2"} 200
# HELP apiserver_storage_objects [STABLE] Number of stored objects at the time of last check split by kind. In case of a fetching error, the value will be -1.
# HELP apiserver_storage_objects [STABLE] [DEPRECATED, consider using apiserver_resource_objects instead] Number of stored objects at the time of last check split by kind. In case of a fetching error, the value will be -1.
# TYPE apiserver_storage_objects gauge
apiserver_storage_objects{resource="bar1.foo1"} 10
apiserver_storage_objects{resource="bar2.foo2"} 20
@@ -339,7 +339,7 @@ apiserver_storage_objects{resource="bar2.foo2"} 20
expectedMetrics = `# HELP apiserver_resource_size_estimate_bytes [ALPHA] Estimated size of stored objects in database. Estimate is based on sum of last observed sizes of serialized objects. In case of a fetching error, the value will be -1.
# TYPE apiserver_resource_size_estimate_bytes gauge
apiserver_resource_size_estimate_bytes{group="foo2",resource="bar2"} 200
# HELP apiserver_storage_objects [STABLE] Number of stored objects at the time of last check split by kind. In case of a fetching error, the value will be -1.
# HELP apiserver_storage_objects [STABLE] [DEPRECATED, consider using apiserver_resource_objects instead] Number of stored objects at the time of last check split by kind. In case of a fetching error, the value will be -1.
# TYPE apiserver_storage_objects gauge
apiserver_storage_objects{resource="bar2.foo2"} 20
`
@@ -348,7 +348,7 @@ apiserver_storage_objects{resource="bar2.foo2"} 20
}
DeleteStoreStats(schema.GroupResource{Group: "foo2", Resource: "bar2"})
expectedMetrics = `# HELP apiserver_storage_objects [STABLE] Number of stored objects at the time of last check split by kind. In case of a fetching error, the value will be -1.
expectedMetrics = `# HELP apiserver_storage_objects [STABLE] [DEPRECATED, consider using apiserver_resource_objects instead] Number of stored objects at the time of last check split by kind. In case of a fetching error, the value will be -1.
# TYPE apiserver_storage_objects gauge
`
if err := testutil.GatherAndCompare(registry, strings.NewReader(expectedMetrics), "apiserver_storage_objects", "apiserver_resource_size_estimate_bytes"); err != nil {

View File

@@ -411,10 +411,10 @@
- 1e+08
- 1e+09
- name: apiserver_storage_objects
help: Number of stored objects at the time of last check split by kind. In case
of a fetching error, the value will be -1.
help: '[DEPRECATED, consider using apiserver_resource_objects instead] Number of
stored objects at the time of last check split by kind. In case of a fetching
error, the value will be -1.'
type: Gauge
deprecatedVersion: 1.34.0
stabilityLevel: STABLE
labels:
- resource