Skip to content

Commit b9e328f

Browse files
MikeZappa87MikeZappa87
committed
Merge branch 'master' into mzappa/fixnodeexporter
2 parents c627004 + 05a0f24 commit b9e328f

File tree

798 files changed

+92230
-51540
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

798 files changed

+92230
-51540
lines changed

‎benchmark/go.mod

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
module k8s.io/perf-tests/benchmark
22

3-
go 1.23.4
3+
go 1.24.1
44

55
require (
66
github.com/dgryski/go-onlinestats v0.0.0-20170612111826-1c7d19468768
7-
github.com/golang/glog v1.2.3
8-
github.com/spf13/pflag v1.0.5
7+
github.com/golang/glog v1.2.4
8+
github.com/spf13/pflag v1.0.6
99
k8s.io/contrib v0.0.0-20190411182844-89f6948e2457
10-
k8s.io/kubernetes v1.32.0
10+
k8s.io/kubernetes v1.33.0
1111
)
1212

1313
require github.com/aclements/go-moremath v0.0.0-20190830160640-d16893ddf098 // indirect

‎benchmark/go.sum

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ github.com/aclements/go-moremath v0.0.0-20190830160640-d16893ddf098 h1:a7+Y8VlXR
22
github.com/aclements/go-moremath v0.0.0-20190830160640-d16893ddf098/go.mod h1:idZL3yvz4kzx1dsBOAC+oYv6L92P1oFEhUXUB1A/lwQ=
33
github.com/dgryski/go-onlinestats v0.0.0-20170612111826-1c7d19468768 h1:Xzl7CSuSnGsyU+9xmSU2h8w3d7Tnis66xeoNN207tLo=
44
github.com/dgryski/go-onlinestats v0.0.0-20170612111826-1c7d19468768/go.mod h1:alfmlCqcg4uw9jaoIU1nOp9RFdJLMuu8P07BCEgpgoo=
5-
github.com/golang/glog v1.2.3 h1:oDTdz9f5VGVVNGu/Q7UXKWYsD0873HXLHdJUNBsSEKM=
6-
github.com/golang/glog v1.2.3/go.mod h1:6AhwSGph0fcJtXVM/PEHPqZlFeoLxhs7/t5UDAwmO+w=
7-
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
8-
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
9-
github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
10-
github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
5+
github.com/golang/glog v1.2.4 h1:CNNw5U8lSiiBk7druxtSHHTsRWcxKoac6kZKm2peBBc=
6+
github.com/golang/glog v1.2.4/go.mod h1:6AhwSGph0fcJtXVM/PEHPqZlFeoLxhs7/t5UDAwmO+w=
7+
github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
8+
github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
9+
github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o=
10+
github.com/spf13/pflag v1.0.6/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
1111
k8s.io/contrib v0.0.0-20190411182844-89f6948e2457 h1:+HYfXOtiem3CAb6EA4faiA++Q6otQ1dMBkBuw/tDKyw=
1212
k8s.io/contrib v0.0.0-20190411182844-89f6948e2457/go.mod h1:LvWVkdOW1o2tfDtZkAi8o71kBBacda6fVCL6aYrbc6U=
13-
k8s.io/kubernetes v1.32.0 h1:4BDBWSolqPrv8GC3YfZw0CJvh5kA1TPnoX0FxDVd+qc=
14-
k8s.io/kubernetes v1.32.0/go.mod h1:tiIKO63GcdPRBHW2WiUFm3C0eoLczl3f7qi56Dm1W8I=
13+
k8s.io/kubernetes v1.33.0 h1:BP5Y5yIzUZVeBuE/ESZvnw6TNxjXbLsCckIkljE+R0U=
14+
k8s.io/kubernetes v1.33.0/go.mod h1:2nWuPk0seE4+6sd0x60wQ6rYEXcV7SoeMbU0YbFm/5k=

‎clusterloader2/cmd/clusterloader.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ import (
2929
corev1 "k8s.io/api/core/v1"
3030
"k8s.io/client-go/kubernetes"
3131
"k8s.io/klog/v2"
32-
"k8s.io/kubernetes/pkg/cluster/ports"
3332
"k8s.io/perf-tests/clusterloader2/api"
3433
"k8s.io/perf-tests/clusterloader2/pkg/config"
3534
"k8s.io/perf-tests/clusterloader2/pkg/errors"
@@ -71,7 +70,7 @@ func initClusterFlags() {
7170
flags.StringEnvVar(&clusterLoaderConfig.ClusterConfig.KubeConfigPath, "kubeconfig", "KUBECONFIG", "", "Path to the kubeconfig file (if not empty, --run-from-cluster must be false)")
7271
flags.BoolEnvVar(&clusterLoaderConfig.ClusterConfig.RunFromCluster, "run-from-cluster", "RUN_FROM_CLUSTER", false, "Whether to use in-cluster client-config to create a client, --kubeconfig must be unset")
7372
flags.IntEnvVar(&clusterLoaderConfig.ClusterConfig.Nodes, "nodes", "NUM_NODES", 0, "number of nodes")
74-
flags.IntEnvVar(&clusterLoaderConfig.ClusterConfig.KubeletPort, "kubelet-port", "KUBELET_PORT", ports.KubeletPort, "Port of the kubelet to use")
73+
flags.IntEnvVar(&clusterLoaderConfig.ClusterConfig.KubeletPort, "kubelet-port", "KUBELET_PORT", 10250, "Port of the kubelet to use")
7574
flags.IntEnvVar(&clusterLoaderConfig.ClusterConfig.K8SClientsNumber, "k8s-clients-number", "K8S_CLIENTS_NUMBER", 0, fmt.Sprintf("(Optional) Number of k8s clients to use. If 0, will create 1 client per %d nodes", nodesPerClients))
7675
flags.StringEnvVar(&clusterLoaderConfig.ClusterConfig.EtcdCertificatePath, "etcd-certificate", "ETCD_CERTIFICATE", "/etc/srv/kubernetes/pki/etcd-apiserver-server.crt", "Path to the etcd certificate on the master machine")
7776
flags.StringEnvVar(&clusterLoaderConfig.ClusterConfig.EtcdKeyPath, "etcd-key", "ETCD_KEY", "/etc/srv/kubernetes/pki/etcd-apiserver-server.key", "Path to the etcd key on the master machine")

‎clusterloader2/go.mod

Lines changed: 61 additions & 102 deletions
Original file line numberDiff line numberDiff line change
@@ -1,114 +1,98 @@
11
module k8s.io/perf-tests/clusterloader2
22

3-
// go 1.15+ is required by k8s 1.20 we use as dependency.
4-
go 1.23.4
3+
go 1.24.1
54

65
replace (
7-
k8s.io/api => k8s.io/api v0.31.4
8-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.31.4
9-
k8s.io/apimachinery => k8s.io/apimachinery v0.31.4
10-
k8s.io/apiserver => k8s.io/apiserver v0.31.4
11-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.31.4
12-
k8s.io/client-go => k8s.io/client-go v0.31.4
13-
k8s.io/cloud-provider => k8s.io/cloud-provider v0.31.4
14-
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.31.4
15-
k8s.io/code-generator => k8s.io/code-generator v0.31.4
16-
k8s.io/component-base => k8s.io/component-base v0.31.4
17-
k8s.io/component-helpers => k8s.io/component-helpers v0.31.4
18-
k8s.io/controller-manager => k8s.io/controller-manager v0.31.4
19-
k8s.io/cri-api => k8s.io/cri-api v0.31.4
20-
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.31.4
21-
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.31.4
22-
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.31.4
23-
k8s.io/kube-proxy => k8s.io/kube-proxy v0.31.4
24-
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.31.4
25-
k8s.io/kubectl => k8s.io/kubectl v0.31.4
26-
k8s.io/kubelet => k8s.io/kubelet v0.31.4
27-
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.31.4
28-
k8s.io/metrics => k8s.io/metrics v0.31.4
29-
k8s.io/mount-utils => k8s.io/mount-utils v0.31.4
30-
k8s.io/node-api => k8s.io/node-api v0.31.4
31-
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.31.4
32-
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.31.4
33-
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.31.4
34-
k8s.io/sample-controller => k8s.io/sample-controller v0.31.4
6+
k8s.io/api => k8s.io/api v0.32.3
7+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.32.3
8+
k8s.io/apimachinery => k8s.io/apimachinery v0.32.3
9+
k8s.io/apiserver => k8s.io/apiserver v0.32.3
10+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.32.3
11+
k8s.io/client-go => k8s.io/client-go v0.32.3
12+
k8s.io/cloud-provider => k8s.io/cloud-provider v0.32.3
13+
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.32.3
14+
k8s.io/code-generator => k8s.io/code-generator v0.32.3
15+
k8s.io/component-base => k8s.io/component-base v0.32.3
16+
k8s.io/component-helpers => k8s.io/component-helpers v0.32.3
17+
k8s.io/controller-manager => k8s.io/controller-manager v0.32.3
18+
k8s.io/cri-api => k8s.io/cri-api v0.32.3
19+
k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.32.3
20+
k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.32.3
21+
k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.32.3
22+
k8s.io/kube-proxy => k8s.io/kube-proxy v0.32.3
23+
k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.32.3
24+
k8s.io/kubectl => k8s.io/kubectl v0.32.3
25+
k8s.io/kubelet => k8s.io/kubelet v0.32.3
26+
k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.32.3
27+
k8s.io/metrics => k8s.io/metrics v0.32.3
28+
k8s.io/mount-utils => k8s.io/mount-utils v0.32.3
29+
k8s.io/node-api => k8s.io/node-api v0.32.3
30+
k8s.io/pod-security-admission => k8s.io/pod-security-admission v0.32.3
31+
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.32.3
32+
k8s.io/sample-cli-plugin => k8s.io/sample-cli-plugin v0.32.3
33+
k8s.io/sample-controller => k8s.io/sample-controller v0.32.3
3534
)
3635

3736
require (
38-
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.17.0
39-
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.8.0
37+
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.18.0
38+
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.9.0
4039
github.com/go-errors/errors v1.5.1
41-
github.com/google/go-cmp v0.6.0
40+
github.com/google/go-cmp v0.7.0
4241
github.com/google/safetext v0.0.0-20230106111101-7156a760e523
4342
github.com/montanaflynn/stats v0.7.1
4443
github.com/onsi/ginkgo v1.16.5
45-
github.com/onsi/gomega v1.36.2
46-
github.com/prometheus/client_model v0.6.1
47-
github.com/prometheus/common v0.61.0
44+
github.com/onsi/gomega v1.37.0
45+
github.com/prometheus/client_model v0.6.2
46+
github.com/prometheus/common v0.63.0
4847
github.com/prometheus/prometheus v1.8.2-0.20210331101223-3cafc58827d1
49-
github.com/spf13/pflag v1.0.5
48+
github.com/spf13/pflag v1.0.6
5049
github.com/stretchr/testify v1.10.0
51-
golang.org/x/crypto v0.32.0
52-
golang.org/x/oauth2 v0.25.0
53-
golang.org/x/time v0.9.0
50+
golang.org/x/crypto v0.37.0
51+
golang.org/x/oauth2 v0.29.0
52+
golang.org/x/time v0.11.0
5453
gopkg.in/yaml.v2 v2.4.0
55-
k8s.io/api v0.31.4
56-
k8s.io/apimachinery v0.31.4
57-
k8s.io/client-go v0.31.4
58-
k8s.io/component-base v0.31.4
59-
k8s.io/component-helpers v0.31.4
54+
k8s.io/api v0.32.3
55+
k8s.io/apimachinery v0.32.3
56+
k8s.io/client-go v0.32.3
57+
k8s.io/component-base v0.32.3
58+
k8s.io/component-helpers v0.32.3
6059
k8s.io/gengo v0.0.0-20230829151522-9cce18d56c01
6160
k8s.io/klog/v2 v2.130.1
62-
k8s.io/kubelet v0.31.4
63-
k8s.io/kubernetes v1.31.4
61+
k8s.io/kubelet v0.32.3
6462
)
6563

6664
require (
6765
cloud.google.com/go/compute/metadata v0.3.0 // indirect
68-
github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 // indirect
69-
github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 // indirect
70-
github.com/NYTimes/gziphandler v1.1.1 // indirect
71-
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
72-
github.com/asaskevich/govalidator v0.0.0-20200907205600-7a23bdc65eef // indirect
66+
github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.1 // indirect
67+
github.com/AzureAD/microsoft-authentication-library-for-go v1.4.2 // indirect
7368
github.com/beorn7/perks v1.0.1 // indirect
7469
github.com/blang/semver/v4 v4.0.0 // indirect
75-
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
7670
github.com/cespare/xxhash/v2 v2.3.0 // indirect
77-
github.com/coreos/go-semver v0.3.1 // indirect
78-
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
7971
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
8072
github.com/edsrzf/mmap-go v1.0.0 // indirect
8173
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
82-
github.com/felixge/httpsnoop v1.0.4 // indirect
8374
github.com/fsnotify/fsnotify v1.7.0 // indirect
8475
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
8576
github.com/go-kit/kit v0.10.0 // indirect
8677
github.com/go-logfmt/logfmt v0.5.1 // indirect
8778
github.com/go-logr/logr v1.4.2 // indirect
88-
github.com/go-logr/stdr v1.2.2 // indirect
89-
github.com/go-openapi/jsonpointer v0.19.6 // indirect
79+
github.com/go-openapi/jsonpointer v0.21.0 // indirect
9080
github.com/go-openapi/jsonreference v0.20.2 // indirect
91-
github.com/go-openapi/swag v0.22.4 // indirect
81+
github.com/go-openapi/swag v0.23.0 // indirect
9282
github.com/gogo/protobuf v1.3.2 // indirect
93-
github.com/golang-jwt/jwt/v5 v5.2.1 // indirect
94-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
83+
github.com/golang-jwt/jwt/v5 v5.2.2 // indirect
9584
github.com/golang/protobuf v1.5.4 // indirect
9685
github.com/golang/snappy v0.0.4 // indirect
97-
github.com/google/cel-go v0.20.1 // indirect
9886
github.com/google/gnostic-models v0.6.8 // indirect
9987
github.com/google/gofuzz v1.2.0 // indirect
10088
github.com/google/uuid v1.6.0 // indirect
10189
github.com/gorilla/websocket v1.5.0 // indirect
102-
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
103-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
104-
github.com/imdario/mergo v0.3.6 // indirect
105-
github.com/inconshreveable/mousetrap v1.1.0 // indirect
10690
github.com/josharian/intern v1.0.0 // indirect
10791
github.com/json-iterator/go v1.1.12 // indirect
10892
github.com/klauspost/compress v1.17.9 // indirect
10993
github.com/kylelemons/godebug v1.1.0 // indirect
11094
github.com/mailru/easyjson v0.7.7 // indirect
111-
github.com/moby/spdystream v0.4.0 // indirect
95+
github.com/moby/spdystream v0.5.0 // indirect
11296
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
11397
github.com/modern-go/reflect2 v1.0.2 // indirect
11498
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
@@ -120,50 +104,25 @@ require (
120104
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
121105
github.com/prometheus/client_golang v1.20.4 // indirect
122106
github.com/prometheus/procfs v0.15.1 // indirect
123-
github.com/spf13/cobra v1.8.1 // indirect
124-
github.com/stoewer/go-strcase v1.2.0 // indirect
125107
github.com/uber/jaeger-client-go v2.25.0+incompatible // indirect
126108
github.com/uber/jaeger-lib v2.4.0+incompatible // indirect
127109
github.com/x448/float16 v0.8.4 // indirect
128-
go.etcd.io/etcd/api/v3 v3.5.14 // indirect
129-
go.etcd.io/etcd/client/pkg/v3 v3.5.14 // indirect
130-
go.etcd.io/etcd/client/v3 v3.5.14 // indirect
131-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect
132-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
133110
go.opentelemetry.io/otel v1.28.0 // indirect
134-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect
135-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 // indirect
136-
go.opentelemetry.io/otel/metric v1.28.0 // indirect
137-
go.opentelemetry.io/otel/sdk v1.28.0 // indirect
138111
go.opentelemetry.io/otel/trace v1.28.0 // indirect
139-
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
140112
go.uber.org/atomic v1.10.0 // indirect
141113
go.uber.org/goleak v1.3.0 // indirect
142-
go.uber.org/multierr v1.11.0 // indirect
143-
go.uber.org/zap v1.26.0 // indirect
144-
golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc // indirect
145-
golang.org/x/net v0.34.0 // indirect
146-
golang.org/x/sync v0.10.0 // indirect
147-
golang.org/x/sys v0.29.0 // indirect
148-
golang.org/x/term v0.28.0 // indirect
149-
golang.org/x/text v0.21.0 // indirect
150-
google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 // indirect
151-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
152-
google.golang.org/grpc v1.65.0 // indirect
153-
google.golang.org/protobuf v1.36.1 // indirect
114+
golang.org/x/net v0.38.0 // indirect
115+
golang.org/x/sync v0.13.0 // indirect
116+
golang.org/x/sys v0.32.0 // indirect
117+
golang.org/x/term v0.31.0 // indirect
118+
golang.org/x/text v0.24.0 // indirect
119+
google.golang.org/protobuf v1.36.6 // indirect
154120
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
155121
gopkg.in/inf.v0 v0.9.1 // indirect
156-
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
157122
gopkg.in/yaml.v3 v3.0.1 // indirect
158-
k8s.io/apiextensions-apiserver v0.0.0 // indirect
159-
k8s.io/apiserver v0.31.4 // indirect
160-
k8s.io/cloud-provider v0.0.0 // indirect
161-
k8s.io/controller-manager v0.31.4 // indirect
162-
k8s.io/kms v0.31.4 // indirect
163-
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
164-
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
165-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect
166-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
167-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
123+
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
124+
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
125+
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
126+
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
168127
sigs.k8s.io/yaml v1.4.0 // indirect
169128
)

0 commit comments

Comments
 (0)