Skip to content

Commit bc894ae

Browse files
openshift-merge-robotopenshift-merge-robot
authored
Merge pull request #1495 from sanchezl/bump-1.26.2
[release-4.13] OCPBUGS-8308: Bump to k8s 1.26.2
2 parents 8cfbab7 + 219d4a6 commit bc894ae

File tree

174 files changed

+2773
-1182
lines changed

Some content is hidden

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

174 files changed

+2773
-1182
lines changed

‎.go-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.19.5
1+
1.19.6

‎CHANGELOG/CHANGELOG-1.26.md

Lines changed: 174 additions & 45 deletions
Large diffs are not rendered by default.

‎api/openapi-spec/swagger.json

Lines changed: 4 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎api/openapi-spec/v3/apis__resource.k8s.io__v1alpha1_openapi.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -466,7 +466,10 @@
466466
"default": {}
467467
},
468468
"type": "array",
469-
"x-kubernetes-list-type": "set"
469+
"x-kubernetes-list-map-keys": [
470+
"uid"
471+
],
472+
"x-kubernetes-list-type": "map"
470473
}
471474
},
472475
"type": "object"

‎build/build-image/cross/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v1.26.0-go1.19.5-bullseye.0
1+
v1.26.0-go1.19.6-bullseye.0

‎build/common.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ readonly KUBE_CONTAINER_RSYNC_PORT=8730
9696

9797
# These are the default versions (image tags) for their respective base images.
9898
readonly __default_distroless_iptables_version=v0.1.2
99-
readonly __default_go_runner_version=v2.3.1-go1.19.5-bullseye.0
99+
readonly __default_go_runner_version=v2.3.1-go1.19.6-bullseye.0
100100
readonly __default_setcap_version=bullseye-v1.3.0
101101

102102
# These are the base images for the Docker-wrapped binaries.

‎build/dependencies.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ dependencies:
8888

8989
# Golang
9090
- name: "golang: upstream version"
91-
version: 1.19.5
91+
version: 1.19.6
9292
refPaths:
9393
- path: .go-version
9494
- path: build/build-image/cross/VERSION
@@ -110,7 +110,7 @@ dependencies:
110110
match: minimum_go_version=go([0-9]+\.[0-9]+)
111111

112112
- name: "registry.k8s.io/kube-cross: dependents"
113-
version: v1.26.0-go1.19.5-bullseye.0
113+
version: v1.26.0-go1.19.6-bullseye.0
114114
refPaths:
115115
- path: build/build-image/cross/VERSION
116116

@@ -140,7 +140,7 @@ dependencies:
140140
match: configs\[DistrolessIptables\] = Config{list\.BuildImageRegistry, "distroless-iptables", "v([0-9]+)\.([0-9]+)\.([0-9]+)"}
141141

142142
- name: "registry.k8s.io/go-runner: dependents"
143-
version: v2.3.1-go1.19.5-bullseye.0
143+
version: v2.3.1-go1.19.6-bullseye.0
144144
refPaths:
145145
- path: build/common.sh
146146
match: __default_go_runner_version=

‎cmd/kube-apiserver/app/options/options.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -212,13 +212,13 @@ func (s *ServerRunOptions) Flags() (fss cliflag.NamedFlagSets) {
212212
fs.DurationVar(&s.KubeletConfig.HTTPTimeout, "kubelet-timeout", s.KubeletConfig.HTTPTimeout,
213213
"Timeout for kubelet operations.")
214214

215-
fs.StringVar(&s.KubeletConfig.CertFile, "kubelet-client-certificate", s.KubeletConfig.CertFile,
215+
fs.StringVar(&s.KubeletConfig.TLSClientConfig.CertFile, "kubelet-client-certificate", s.KubeletConfig.TLSClientConfig.CertFile,
216216
"Path to a client cert file for TLS.")
217217

218-
fs.StringVar(&s.KubeletConfig.KeyFile, "kubelet-client-key", s.KubeletConfig.KeyFile,
218+
fs.StringVar(&s.KubeletConfig.TLSClientConfig.KeyFile, "kubelet-client-key", s.KubeletConfig.TLSClientConfig.KeyFile,
219219
"Path to a client key file for TLS.")
220220

221-
fs.StringVar(&s.KubeletConfig.CAFile, "kubelet-certificate-authority", s.KubeletConfig.CAFile,
221+
fs.StringVar(&s.KubeletConfig.TLSClientConfig.CAFile, "kubelet-certificate-authority", s.KubeletConfig.TLSClientConfig.CAFile,
222222
"Path to a cert file for the certificate authority.")
223223

224224
fs.StringVar(&s.ProxyClientCertFile, "proxy-client-cert-file", s.ProxyClientCertFile, ""+

‎cmd/kube-apiserver/app/options/options_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,13 @@ import (
2626
"github.com/google/go-cmp/cmp/cmpopts"
2727
"github.com/spf13/pflag"
2828
oteltrace "go.opentelemetry.io/otel/trace"
29+
2930
"k8s.io/apiserver/pkg/admission"
3031
apiserveroptions "k8s.io/apiserver/pkg/server/options"
3132
"k8s.io/apiserver/pkg/storage/etcd3"
3233
"k8s.io/apiserver/pkg/storage/storagebackend"
3334
auditbuffered "k8s.io/apiserver/plugin/pkg/audit/buffered"
3435
audittruncate "k8s.io/apiserver/plugin/pkg/audit/truncate"
35-
restclient "k8s.io/client-go/rest"
3636
cliflag "k8s.io/component-base/cli/flag"
3737
"k8s.io/component-base/logs"
3838
"k8s.io/component-base/metrics"
@@ -200,7 +200,7 @@ func TestAddFlags(t *testing.T) {
200200
string(kapi.NodeExternalIP),
201201
},
202202
HTTPTimeout: time.Duration(5) * time.Second,
203-
TLSClientConfig: restclient.TLSClientConfig{
203+
TLSClientConfig: kubeletclient.KubeletTLSConfig{
204204
CertFile: "/var/run/kubernetes/ceserver.crt",
205205
KeyFile: "/var/run/kubernetes/server.key",
206206
CAFile: "/var/run/kubernetes/caserver.crt",

‎go.mod

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,11 +82,11 @@ require (
8282
go.opentelemetry.io/proto/otlp v0.19.0
8383
go.uber.org/zap v1.19.0
8484
golang.org/x/crypto v0.1.0
85-
golang.org/x/net v0.5.0
85+
golang.org/x/net v0.7.0
8686
golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5
8787
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4
88-
golang.org/x/sys v0.4.0
89-
golang.org/x/term v0.4.0
88+
golang.org/x/sys v0.5.0
89+
golang.org/x/term v0.5.0
9090
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8
9191
golang.org/x/tools v0.2.0
9292
google.golang.org/api v0.60.0
@@ -245,7 +245,7 @@ require (
245245
go.uber.org/atomic v1.7.0 // indirect
246246
go.uber.org/multierr v1.6.0 // indirect
247247
golang.org/x/mod v0.6.0 // indirect
248-
golang.org/x/text v0.6.0 // indirect
248+
golang.org/x/text v0.7.0 // indirect
249249
google.golang.org/appengine v1.6.7 // indirect
250250
gopkg.in/inf.v0 v0.9.1 // indirect
251251
gopkg.in/warnings.v0 v0.1.1 // indirect

‎go.sum

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -888,8 +888,8 @@ golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qx
888888
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
889889
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
890890
golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
891-
golang.org/x/net v0.5.0 h1:GyT4nK/YDHSqa1c4753ouYCDajOYKTja9Xb/OHtgvSw=
892-
golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws=
891+
golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g=
892+
golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
893893
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
894894
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
895895
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
@@ -1001,12 +1001,12 @@ golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBc
10011001
golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
10021002
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
10031003
golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
1004-
golang.org/x/sys v0.4.0 h1:Zr2JFtRQNX3BCZ8YtxRE9hNJYC8J6I1MVbMg6owUp18=
1005-
golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
1004+
golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
1005+
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
10061006
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
10071007
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
1008-
golang.org/x/term v0.4.0 h1:O7UWfv5+A2qiuulQk30kVinPoMtoIPeVaKLEgLpVkvg=
1009-
golang.org/x/term v0.4.0/go.mod h1:9P2UbLfCdcvo3p/nzKvsmas4TnlujnuoV9hGgYzW1lQ=
1008+
golang.org/x/term v0.5.0 h1:n2a8QNdAb0sZNpU9R1ALUXBbY+w51fCQDN+7EdxNBsY=
1009+
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
10101010
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
10111011
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
10121012
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
@@ -1016,8 +1016,8 @@ golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
10161016
golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
10171017
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
10181018
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
1019-
golang.org/x/text v0.6.0 h1:3XmdazWV+ubf7QgHSTWeykHOci5oeekaGJBLkrkaw4k=
1020-
golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
1019+
golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo=
1020+
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
10211021
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
10221022
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
10231023
golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=

0 commit comments

Comments
 (0)