Skip to content

Commit 61eb6a4

Browse files
authored
Revert "backport tls handshake error (#1076)" (#1083)
This reverts commit b53dc6b.
1 parent b53dc6b commit 61eb6a4

File tree

3 files changed

+58
-69
lines changed

3 files changed

+58
-69
lines changed

go.mod

Lines changed: 25 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,7 @@ go 1.24.0
55
toolchain go1.24.6
66

77
replace (
8-
github.com/google/cel-go => github.com/google/cel-go v0.22.0
98
github.com/rancher/rke => github.com/rancher/rke v1.8.4
10-
go.opentelemetry.io/otel/exporters/otlp/otlptrace => go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0
11-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc => go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0
129
k8s.io/api => k8s.io/api v0.32.1
1310
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.32.1
1411
k8s.io/apimachinery => k8s.io/apimachinery v0.32.1
@@ -18,7 +15,6 @@ replace (
1815
k8s.io/cloud-provider => k8s.io/cloud-provider v0.32.1
1916
k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.32.1
2017
k8s.io/code-generator => k8s.io/code-generator v0.32.1
21-
k8s.io/component-base => k8s.io/component-base v0.32.1
2218
k8s.io/component-helpers => k8s.io/component-helpers v0.32.1
2319
k8s.io/controller-manager => k8s.io/controller-manager v0.32.1
2420
k8s.io/cri-api => k8s.io/cri-api v0.32.1
@@ -46,20 +42,20 @@ require (
4642
github.com/evanphx/json-patch v5.9.11+incompatible
4743
github.com/go-ldap/ldap/v3 v3.4.10
4844
github.com/gorilla/mux v1.8.1
49-
github.com/rancher/dynamiclistener v0.7.1
50-
github.com/rancher/lasso v0.2.3-rc3
45+
github.com/rancher/dynamiclistener v0.6.2
46+
github.com/rancher/lasso v0.2.2
5147
github.com/rancher/rancher/pkg/apis v0.0.0-20250821052120-92c1d050c17c
5248
github.com/rancher/rke v1.8.5
53-
github.com/rancher/wrangler/v3 v3.2.2-rc.3
49+
github.com/rancher/wrangler/v3 v3.2.1
5450
github.com/robfig/cron v1.2.0
5551
github.com/sirupsen/logrus v1.9.3
5652
github.com/stretchr/testify v1.10.0
5753
go.uber.org/mock v0.5.2
5854
golang.org/x/text v0.27.0
5955
golang.org/x/tools v0.34.0
60-
k8s.io/api v0.33.1
61-
k8s.io/apimachinery v0.33.1
62-
k8s.io/apiserver v0.33.1
56+
k8s.io/api v0.32.4
57+
k8s.io/apimachinery v0.32.4
58+
k8s.io/apiserver v0.32.2
6359
k8s.io/client-go v12.0.0+incompatible
6460
k8s.io/kubernetes v1.32.1
6561
k8s.io/pod-security-admission v0.32.1
@@ -69,7 +65,7 @@ require (
6965
)
7066

7167
require (
72-
cel.dev/expr v0.19.1 // indirect
68+
cel.dev/expr v0.19.0 // indirect
7369
github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358 // indirect
7470
github.com/NYTimes/gziphandler v1.1.1 // indirect
7571
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
@@ -96,16 +92,17 @@ require (
9692
github.com/gogo/protobuf v1.3.2 // indirect
9793
github.com/golang/protobuf v1.5.4 // indirect
9894
github.com/google/btree v1.0.1 // indirect
99-
github.com/google/cel-go v0.23.2 // indirect
95+
github.com/google/cel-go v0.22.0 // indirect
10096
github.com/google/gnostic-models v0.6.9 // indirect
10197
github.com/google/go-cmp v0.7.0 // indirect
10298
github.com/google/gofuzz v1.2.0 // indirect
10399
github.com/google/uuid v1.6.0 // indirect
104100
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
105-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.24.0 // indirect
101+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
106102
github.com/inconshreveable/mousetrap v1.1.0 // indirect
107103
github.com/josharian/intern v1.0.0 // indirect
108104
github.com/json-iterator/go v1.1.12 // indirect
105+
github.com/klauspost/compress v1.17.9 // indirect
109106
github.com/kylelemons/godebug v1.1.0 // indirect
110107
github.com/mailru/easyjson v0.7.7 // indirect
111108
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
@@ -114,9 +111,9 @@ require (
114111
github.com/opencontainers/go-digest v1.0.0 // indirect
115112
github.com/pkg/errors v0.9.1 // indirect
116113
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
117-
github.com/prometheus/client_golang v1.22.0 // indirect
114+
github.com/prometheus/client_golang v1.20.5 // indirect
118115
github.com/prometheus/client_model v0.6.1 // indirect
119-
github.com/prometheus/common v0.62.0 // indirect
116+
github.com/prometheus/common v0.55.0 // indirect
120117
github.com/prometheus/procfs v0.15.1 // indirect
121118
github.com/rancher/aks-operator v1.11.5 // indirect
122119
github.com/rancher/eks-operator v1.11.5 // indirect
@@ -134,12 +131,12 @@ require (
134131
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.53.0 // indirect
135132
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect
136133
go.opentelemetry.io/otel v1.34.0 // indirect
137-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.33.0 // indirect
138-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.33.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
139136
go.opentelemetry.io/otel/metric v1.34.0 // indirect
140-
go.opentelemetry.io/otel/sdk v1.33.0 // indirect
137+
go.opentelemetry.io/otel/sdk v1.32.0 // indirect
141138
go.opentelemetry.io/otel/trace v1.34.0 // indirect
142-
go.opentelemetry.io/proto/otlp v1.4.0 // indirect
139+
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
143140
go.uber.org/multierr v1.11.0 // indirect
144141
go.uber.org/zap v1.27.0 // indirect
145142
go.yaml.in/yaml/v2 v2.4.2 // indirect
@@ -153,7 +150,7 @@ require (
153150
golang.org/x/term v0.33.0 // indirect
154151
golang.org/x/time v0.10.0 // indirect
155152
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
156-
google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 // indirect
153+
google.golang.org/genproto/googleapis/api v0.0.0-20241202173237-19429a94021a // indirect
157154
google.golang.org/genproto/googleapis/rpc v0.0.0-20250207221924-e9438ea467c6 // indirect
158155
google.golang.org/grpc v1.70.0 // indirect
159156
google.golang.org/protobuf v1.36.6 // indirect
@@ -162,22 +159,21 @@ require (
162159
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
163160
gopkg.in/yaml.v2 v2.4.0 // indirect
164161
gopkg.in/yaml.v3 v3.0.1 // indirect
165-
k8s.io/apiextensions-apiserver v0.33.1 // indirect
162+
k8s.io/apiextensions-apiserver v0.32.2 // indirect
166163
k8s.io/cloud-provider v0.0.0 // indirect
167-
k8s.io/code-generator v0.33.1 // indirect
168-
k8s.io/component-base v0.33.1 // indirect
164+
k8s.io/code-generator v0.32.1 // indirect
165+
k8s.io/component-base v0.32.2 // indirect
169166
k8s.io/component-helpers v0.32.1 // indirect
170167
k8s.io/controller-manager v0.32.1 // indirect
171168
k8s.io/gengo v0.0.0-20250130153323-76c5745d3511 // indirect
172-
k8s.io/gengo/v2 v2.0.0-20250207200755-1244d31929d7 // indirect
169+
k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9 // indirect
173170
k8s.io/klog/v2 v2.130.1 // indirect
174171
k8s.io/kms v0.32.1 // indirect
175-
k8s.io/kube-aggregator v0.33.1 // indirect
176-
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
172+
k8s.io/kube-aggregator v0.32.1 // indirect
173+
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
177174
k8s.io/kubelet v0.0.0 // indirect
178-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 // indirect
175+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 // indirect
179176
sigs.k8s.io/cluster-api v1.9.5 // indirect
180177
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
181-
sigs.k8s.io/randfill v1.0.0 // indirect
182-
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
178+
sigs.k8s.io/structured-merge-diff/v4 v4.4.3 // indirect
183179
)

0 commit comments

Comments
 (0)