Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[release-4.13] OCPBUGS-8308: Bump to k8s 1.26.2 #1495

Merged
merged 57 commits into from
Mar 6, 2023
Merged

[release-4.13] OCPBUGS-8308: Bump to k8s 1.26.2 #1495

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
0f05e26
PodGC should not add DisruptionTarget condition for pods which are in…
mimowo Jan 13, 2023
0248aa8
Fixes the issue #114145
Rajalakshmi-Girish Jan 10, 2023
8017dff
Release commit for Kubernetes v1.26.2-rc.0
k8s-release-robot Jan 18, 2023
070518c
Update CHANGELOG/CHANGELOG-1.26.md for v1.26.1
k8s-release-robot Jan 18, 2023
8f86f57
bump honnef.co/go/tools to support go1.20
liggitt Jan 17, 2023
7ec8de5
Fix shadowing lint error
liggitt Jan 17, 2023
0b0a325
fix bug with param controllers being removed if used by more than one…
Jan 18, 2023
1b2da23
Merge pull request #115152 from Rajalakshmi-Girish/automated-cherry-p…
k8s-ci-robot Jan 20, 2023
6495dd0
k8s.io/component-base/logs: fix usage through Go flag package
pohly Dec 23, 2022
ce665b2
k8s.io/component-base/logs: unit test for command line help output
pohly Jan 17, 2023
576b56a
k8s.io/component-base/logs: relax flagset unit tests
pohly Jan 18, 2023
5dc7893
k8s.io/component-base/logs: match full help text in unit test
pohly Jan 19, 2023
429b61f
Merge pull request #115169 from liggitt/automated-cherry-pick-of-#115…
k8s-ci-robot Jan 20, 2023
b48139c
add custom dialer optimized for probes
aojea Jan 17, 2023
cc7e738
use custom dialer for tcp probes
aojea Jan 17, 2023
b6429e3
use custom dialer for http probes
aojea Jan 17, 2023
4cd96e6
Fix panic on ClusterIP allocation for /28 subnets
aojea Jan 25, 2023
7d2254d
kubectl: use v2 for hpa
a7i Jan 7, 2023
d3b0f3f
add scale test for probes
aojea Jan 17, 2023
aa95077
Fix nil pointer error in nodevolumelimits csi logging
sunnylovestiramisu Jan 18, 2023
376f673
Merge pull request #115333 from aojea/automated-cherry-pick-of-#11532…
k8s-ci-robot Jan 27, 2023
a9edc2c
Fix konnectivity-client metric registration.
jkh52 Jan 25, 2023
15b48cd
Avoid typechecking stdlib
liggitt Jan 29, 2023
c688261
Merge pull request #115104 from mimowo/automated-cherry-pick-of-#1150…
k8s-ci-robot Jan 30, 2023
dfda43d
Merge pull request #115278 from SergeyKanzhelev/automated-cherry-pick…
k8s-ci-robot Jan 30, 2023
b10dce4
dynamic resource allocation: avoid apiserver complaint about list con…
pohly Jan 26, 2023
a082cbd
update prev succeeded indexes for indexed jobs unconditionally
danielvegamyhre Jan 27, 2023
6d4db15
apiserver: remove 34s from DELETECOLLECTION rest handler
tkashem Jan 26, 2023
6d4b94f
Merge pull request #115386 from liggitt/automated-cherry-pick-of-#115…
k8s-ci-robot Feb 3, 2023
5a6e365
Ignore container events with nil PodSandboxStatus
ruiwen-zhao Dec 7, 2022
c651e4f
kubelet/client: collapse transport wiring onto standard approach
enj Feb 6, 2023
07ee81c
hack/tools: Bump golangci-lint version
MadhavJivrajani Feb 8, 2023
be1dc7d
*: Fix linter warnings
MadhavJivrajani Feb 8, 2023
4e95e99
Enforce nodeName cannot be set along with non empty schedulingGates
Huang-Wei Feb 7, 2023
c5fe622
Pin golang.org/x/net to v0.4.0 in 1.26
nckturner Feb 9, 2023
96dacc5
Merge pull request #115185 from alexzielenski/automated-cherry-pick-o…
k8s-ci-robot Feb 9, 2023
9f9ba1b
Merge pull request #115479 from tkashem/automated-cherry-pick-of-#115…
k8s-ci-robot Feb 9, 2023
e6810e1
Merge pull request #115337 from nathanmartins/automated-cherry-pick-o…
k8s-ci-robot Feb 9, 2023
ddc6ba7
Merge pull request #115611 from MadhavJivrajani/golangci-lint-1.26
k8s-ci-robot Feb 9, 2023
e115dfe
Merge pull request #115347 from sunnylovestiramisu/automated-cherry-p…
k8s-ci-robot Feb 10, 2023
5ae2e75
Merge pull request #115642 from nckturner/pin-golang.org/x/net-to-v0.…
k8s-ci-robot Feb 10, 2023
41137e4
Merge pull request #115400 from pohly/automated-cherry-pick-of-#11535…
k8s-ci-robot Feb 10, 2023
f7bcf49
Merge pull request #115462 from danielvegamyhre/automated-cherry-pick…
k8s-ci-robot Feb 10, 2023
0711382
Merge pull request #115552 from ruiwen-zhao/automated-cherry-pick-of-…
k8s-ci-robot Feb 10, 2023
76cdf44
Merge pull request #115229 from pohly/automated-cherry-pick-of-#11468…
k8s-ci-robot Feb 10, 2023
1802182
Merge pull request #115566 from enj/automated-cherry-pick-of-#115315-…
k8s-ci-robot Feb 10, 2023
3822e40
Merge pull request #115369 from jkh52/release-1.26-fix-metrics
k8s-ci-robot Feb 10, 2023
fbb80cb
Merge pull request #115636 from Huang-Wei/automated-cherry-pick-of-#1…
k8s-ci-robot Feb 10, 2023
26d4675
Update golang.org/x/net to v0.7.0
liggitt Feb 15, 2023
0fbdfce
Merge pull request #115787 from liggitt/net-0.7.0-1.26
k8s-ci-robot Feb 15, 2023
40eb36a
releng: Update images, dependencies and version to Go 1.19.6
cpanato Feb 16, 2023
915924e
Merge pull request #115833 from cpanato/rel-126-go1196
k8s-ci-robot Feb 17, 2023
fc04e73
Release commit for Kubernetes v1.26.2
k8s-release-robot Feb 22, 2023
9776176
Merge tag 'v1.26.2' into bump-1.26.2
sanchezl Mar 3, 2023
20c1e3a
UPSTREAM: <drop>: manually resolve conflicts
sanchezl Mar 2, 2023
2a18fca
UPSTREAM: <carry>: kubelet: fix readiness probes with pod termination
sanchezl Mar 2, 2023
219d4a6
UPSTREAM: <drop>: hack/update-vendor.sh, make update and update image
sanchezl Mar 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .go-version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.19.5
1.19.6
219 changes: 174 additions & 45 deletions CHANGELOG/CHANGELOG-1.26.md
View file
Open in desktop

Large diffs are not rendered by default.

5 changes: 4 additions & 1 deletion api/openapi-spec/swagger.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion api/openapi-spec/v3/apis__resource.k8s.io__v1alpha1_openapi.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -466,7 +466,10 @@
"default": {}
},
"type": "array",
"x-kubernetes-list-type": "set"
"x-kubernetes-list-map-keys": [
"uid"
],
"x-kubernetes-list-type": "map"
}
},
"type": "object"
Expand Down
2 changes: 1 addition & 1 deletion build/build-image/cross/VERSION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v1.26.0-go1.19.5-bullseye.0
v1.26.0-go1.19.6-bullseye.0
2 changes: 1 addition & 1 deletion build/common.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ readonly KUBE_CONTAINER_RSYNC_PORT=8730

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

# These are the base images for the Docker-wrapped binaries.
Expand Down
6 changes: 3 additions & 3 deletions build/dependencies.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ dependencies:

# Golang
- name: "golang: upstream version"
version: 1.19.5
version: 1.19.6
refPaths:
- path: .go-version
- path: build/build-image/cross/VERSION
Expand All @@ -110,7 +110,7 @@ dependencies:
match: minimum_go_version=go([0-9]+\.[0-9]+)

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

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

- name: "registry.k8s.io/go-runner: dependents"
version: v2.3.1-go1.19.5-bullseye.0
version: v2.3.1-go1.19.6-bullseye.0
refPaths:
- path: build/common.sh
match: __default_go_runner_version=
Expand Down
6 changes: 3 additions & 3 deletions cmd/kube-apiserver/app/options/options.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,13 +212,13 @@ func (s *ServerRunOptions) Flags() (fss cliflag.NamedFlagSets) {
fs.DurationVar(&s.KubeletConfig.HTTPTimeout, "kubelet-timeout", s.KubeletConfig.HTTPTimeout,
"Timeout for kubelet operations.")

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

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

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

fs.StringVar(&s.ProxyClientCertFile, "proxy-client-cert-file", s.ProxyClientCertFile, ""+
Expand Down
4 changes: 2 additions & 2 deletions cmd/kube-apiserver/app/options/options_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,13 @@ import (
"github.com/google/go-cmp/cmp/cmpopts"
"github.com/spf13/pflag"
oteltrace "go.opentelemetry.io/otel/trace"

"k8s.io/apiserver/pkg/admission"
apiserveroptions "k8s.io/apiserver/pkg/server/options"
"k8s.io/apiserver/pkg/storage/etcd3"
"k8s.io/apiserver/pkg/storage/storagebackend"
auditbuffered "k8s.io/apiserver/plugin/pkg/audit/buffered"
audittruncate "k8s.io/apiserver/plugin/pkg/audit/truncate"
restclient "k8s.io/client-go/rest"
cliflag "k8s.io/component-base/cli/flag"
"k8s.io/component-base/logs"
"k8s.io/component-base/metrics"
Expand Down Expand Up @@ -200,7 +200,7 @@ func TestAddFlags(t *testing.T) {
string(kapi.NodeExternalIP),
},
HTTPTimeout: time.Duration(5) * time.Second,
TLSClientConfig: restclient.TLSClientConfig{
TLSClientConfig: kubeletclient.KubeletTLSConfig{
CertFile: "/var/run/kubernetes/ceserver.crt",
KeyFile: "/var/run/kubernetes/server.key",
CAFile: "/var/run/kubernetes/caserver.crt",
Expand Down
8 changes: 4 additions & 4 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,11 +82,11 @@ require (
go.opentelemetry.io/proto/otlp v0.19.0
go.uber.org/zap v1.19.0
golang.org/x/crypto v0.1.0
golang.org/x/net v0.5.0
golang.org/x/net v0.7.0
golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4
golang.org/x/sys v0.4.0
golang.org/x/term v0.4.0
golang.org/x/sys v0.5.0
golang.org/x/term v0.5.0
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8
golang.org/x/tools v0.2.0
google.golang.org/api v0.60.0
Expand Down Expand Up @@ -245,7 +245,7 @@ require (
go.uber.org/atomic v1.7.0 // indirect
go.uber.org/multierr v1.6.0 // indirect
golang.org/x/mod v0.6.0 // indirect
golang.org/x/text v0.6.0 // indirect
golang.org/x/text v0.7.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/warnings.v0 v0.1.1 // indirect
Expand Down
16 changes: 8 additions & 8 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -888,8 +888,8 @@ golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qx
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
golang.org/x/net v0.5.0 h1:GyT4nK/YDHSqa1c4753ouYCDajOYKTja9Xb/OHtgvSw=
golang.org/x/net v0.5.0/go.mod h1:DivGGAXEgPSlEBzxGzZI+ZLohi+xUj054jfeKui00ws=
golang.org/x/net v0.7.0 h1:rJrUqqhjsgNp7KqAIc25s9pZnjU7TUcSY7HcVZjdn1g=
golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
Expand Down Expand Up @@ -1001,12 +1001,12 @@ golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBc
golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220908164124-27713097b956/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.4.0 h1:Zr2JFtRQNX3BCZ8YtxRE9hNJYC8J6I1MVbMg6owUp18=
golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/term v0.4.0 h1:O7UWfv5+A2qiuulQk30kVinPoMtoIPeVaKLEgLpVkvg=
golang.org/x/term v0.4.0/go.mod h1:9P2UbLfCdcvo3p/nzKvsmas4TnlujnuoV9hGgYzW1lQ=
golang.org/x/term v0.5.0 h1:n2a8QNdAb0sZNpU9R1ALUXBbY+w51fCQDN+7EdxNBsY=
golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
Expand All @@ -1016,8 +1016,8 @@ golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
golang.org/x/text v0.6.0 h1:3XmdazWV+ubf7QgHSTWeykHOci5oeekaGJBLkrkaw4k=
golang.org/x/text v0.6.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
golang.org/x/text v0.7.0 h1:4BRB4x83lYWy72KwLD/qYDuTu7q9PjSagHvijDw7cLo=
golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
Expand Down
Loading