Skip to content

Commit 9ae2c39

Browse files
brooksnbrooksn
authored
Update Kubernetes to v1.31.1 (#10895)
* update Kubernetes to v1.31.1 and Go to 1.22.6 Signed-off-by: Brooks Newberry <[email protected]>
1 parent d926e69 commit 9ae2c39

6 files changed

+106
-106
lines changed

‎Dockerfile.dapper

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG GOLANG=golang:1.22.5-alpine3.20
1+
ARG GOLANG=golang:1.22.6-alpine3.20
22
FROM ${GOLANG}
33

44
# Set proxy environment variables

‎Dockerfile.local

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG GOLANG=golang:1.22.5-alpine3.19
1+
ARG GOLANG=golang:1.22.6-alpine3.19
22
FROM ${GOLANG} as infra
33

44
ARG http_proxy=$http_proxy

‎Dockerfile.manifest

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG GOLANG=golang:1.22.5-alpine3.20
1+
ARG GOLANG=golang:1.22.6-alpine3.20
22
FROM ${GOLANG}
33

44
COPY --from=plugins/manifest:1.2.3 /bin/* /bin/

‎Dockerfile.test

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG GOLANG=golang:1.22.5-alpine3.20
1+
ARG GOLANG=golang:1.22.6-alpine3.20
22
FROM ${GOLANG} as test-base
33

44
RUN apk -U --no-cache add bash jq

‎go.mod

+46-46
Original file line numberDiff line numberDiff line change
@@ -38,39 +38,39 @@ replace (
3838
google.golang.org/genproto => google.golang.org/genproto v0.0.0-20230525234035-dd9d682886f9
3939
google.golang.org/grpc => google.golang.org/grpc v1.64.0
4040
gopkg.in/square/go-jose.v2 => gopkg.in/square/go-jose.v2 v2.6.0
41-
k8s.io/api => github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.31.0-k3s3
42-
k8s.io/apiextensions-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.31.0-k3s3
43-
k8s.io/apimachinery => github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.31.0-k3s3
44-
k8s.io/apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.31.0-k3s3
45-
k8s.io/cli-runtime => github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.31.0-k3s3
46-
k8s.io/client-go => github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.31.0-k3s3
47-
k8s.io/cloud-provider => github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.31.0-k3s3
48-
k8s.io/cluster-bootstrap => github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.31.0-k3s3
49-
k8s.io/code-generator => github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.31.0-k3s3
50-
k8s.io/component-base => github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.31.0-k3s3
51-
k8s.io/component-helpers => github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.31.0-k3s3
52-
k8s.io/controller-manager => github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.31.0-k3s3
53-
k8s.io/cri-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.31.0-k3s3
54-
k8s.io/csi-translation-lib => github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.31.0-k3s3
55-
k8s.io/dynamic-resource-allocation => github.com/k3s-io/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v1.31.0-k3s3
56-
k8s.io/endpointslice => github.com/k3s-io/kubernetes/staging/src/k8s.io/endpointslice v1.31.0-k3s3
41+
k8s.io/api => github.com/k3s-io/kubernetes/staging/src/k8s.io/api v1.31.1-k3s2
42+
k8s.io/apiextensions-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiextensions-apiserver v1.31.1-k3s2
43+
k8s.io/apimachinery => github.com/k3s-io/kubernetes/staging/src/k8s.io/apimachinery v1.31.1-k3s2
44+
k8s.io/apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/apiserver v1.31.1-k3s2
45+
k8s.io/cli-runtime => github.com/k3s-io/kubernetes/staging/src/k8s.io/cli-runtime v1.31.1-k3s2
46+
k8s.io/client-go => github.com/k3s-io/kubernetes/staging/src/k8s.io/client-go v1.31.1-k3s2
47+
k8s.io/cloud-provider => github.com/k3s-io/kubernetes/staging/src/k8s.io/cloud-provider v1.31.1-k3s2
48+
k8s.io/cluster-bootstrap => github.com/k3s-io/kubernetes/staging/src/k8s.io/cluster-bootstrap v1.31.1-k3s2
49+
k8s.io/code-generator => github.com/k3s-io/kubernetes/staging/src/k8s.io/code-generator v1.31.1-k3s2
50+
k8s.io/component-base => github.com/k3s-io/kubernetes/staging/src/k8s.io/component-base v1.31.1-k3s2
51+
k8s.io/component-helpers => github.com/k3s-io/kubernetes/staging/src/k8s.io/component-helpers v1.31.1-k3s2
52+
k8s.io/controller-manager => github.com/k3s-io/kubernetes/staging/src/k8s.io/controller-manager v1.31.1-k3s2
53+
k8s.io/cri-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/cri-api v1.31.1-k3s2
54+
k8s.io/csi-translation-lib => github.com/k3s-io/kubernetes/staging/src/k8s.io/csi-translation-lib v1.31.1-k3s2
55+
k8s.io/dynamic-resource-allocation => github.com/k3s-io/kubernetes/staging/src/k8s.io/dynamic-resource-allocation v1.31.1-k3s2
56+
k8s.io/endpointslice => github.com/k3s-io/kubernetes/staging/src/k8s.io/endpointslice v1.31.1-k3s2
5757
k8s.io/klog => github.com/k3s-io/klog v1.0.0-k3s2 // k3s-release-1.x
5858
k8s.io/klog/v2 => github.com/k3s-io/klog/v2 v2.120.1-k3s1 // k3s-main
59-
k8s.io/kms => github.com/k3s-io/kubernetes/staging/src/k8s.io/kms v1.31.0-k3s3
60-
k8s.io/kube-aggregator => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.31.0-k3s3
61-
k8s.io/kube-controller-manager => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.31.0-k3s3
62-
k8s.io/kube-proxy => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.31.0-k3s3
63-
k8s.io/kube-scheduler => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.31.0-k3s3
64-
k8s.io/kubectl => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.31.0-k3s3
65-
k8s.io/kubelet => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.31.0-k3s3
66-
k8s.io/kubernetes => github.com/k3s-io/kubernetes v1.31.0-k3s3
67-
k8s.io/metrics => github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.31.0-k3s3
68-
k8s.io/mount-utils => github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.31.0-k3s3
69-
k8s.io/node-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/node-api v1.31.0-k3s3
70-
k8s.io/pod-security-admission => github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.31.0-k3s3
71-
k8s.io/sample-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-apiserver v1.31.0-k3s3
72-
k8s.io/sample-cli-plugin => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-cli-plugin v1.31.0-k3s3
73-
k8s.io/sample-controller => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-controller v1.31.0-k3s3
59+
k8s.io/kms => github.com/k3s-io/kubernetes/staging/src/k8s.io/kms v1.31.1-k3s2
60+
k8s.io/kube-aggregator => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-aggregator v1.31.1-k3s2
61+
k8s.io/kube-controller-manager => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-controller-manager v1.31.1-k3s2
62+
k8s.io/kube-proxy => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-proxy v1.31.1-k3s2
63+
k8s.io/kube-scheduler => github.com/k3s-io/kubernetes/staging/src/k8s.io/kube-scheduler v1.31.1-k3s2
64+
k8s.io/kubectl => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubectl v1.31.1-k3s2
65+
k8s.io/kubelet => github.com/k3s-io/kubernetes/staging/src/k8s.io/kubelet v1.31.1-k3s2
66+
k8s.io/kubernetes => github.com/k3s-io/kubernetes v1.31.1-k3s2
67+
k8s.io/metrics => github.com/k3s-io/kubernetes/staging/src/k8s.io/metrics v1.31.1-k3s2
68+
k8s.io/mount-utils => github.com/k3s-io/kubernetes/staging/src/k8s.io/mount-utils v1.31.1-k3s2
69+
k8s.io/node-api => github.com/k3s-io/kubernetes/staging/src/k8s.io/node-api v1.31.1-k3s2
70+
k8s.io/pod-security-admission => github.com/k3s-io/kubernetes/staging/src/k8s.io/pod-security-admission v1.31.1-k3s2
71+
k8s.io/sample-apiserver => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-apiserver v1.31.1-k3s2
72+
k8s.io/sample-cli-plugin => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-cli-plugin v1.31.1-k3s2
73+
k8s.io/sample-controller => github.com/k3s-io/kubernetes/staging/src/k8s.io/sample-controller v1.31.1-k3s2
7474
sigs.k8s.io/cri-tools => github.com/k3s-io/cri-tools v1.31.0-k3s2
7575
sourcegraph.com/sourcegraph/go-diff => github.com/sourcegraph/go-diff v0.6.0
7676
)
@@ -148,21 +148,21 @@ require (
148148
google.golang.org/grpc v1.66.0
149149
gopkg.in/yaml.v2 v2.4.0
150150
inet.af/tcpproxy v0.0.0-20200125044825-b6bb9b5b8252
151-
k8s.io/api v0.31.0
152-
k8s.io/apimachinery v0.31.0
153-
k8s.io/apiserver v0.31.0
154-
k8s.io/cli-runtime v0.31.0-rc.1
151+
k8s.io/api v0.31.1
152+
k8s.io/apimachinery v0.31.1
153+
k8s.io/apiserver v0.31.1
154+
k8s.io/cli-runtime v0.31.1-rc.1
155155
k8s.io/client-go v11.0.1-0.20190409021438-1a26190bd76a+incompatible
156-
k8s.io/cloud-provider v0.31.0
156+
k8s.io/cloud-provider v0.31.1
157157
k8s.io/cluster-bootstrap v0.0.0
158-
k8s.io/component-base v0.31.0
159-
k8s.io/component-helpers v0.31.0
158+
k8s.io/component-base v0.31.1
159+
k8s.io/component-helpers v0.31.1
160160
k8s.io/cri-api v0.32.0-alpha.0
161-
k8s.io/cri-client v0.31.0
161+
k8s.io/cri-client v0.31.1
162162
k8s.io/klog/v2 v2.130.1
163163
k8s.io/kube-proxy v0.0.0
164-
k8s.io/kubectl v0.31.0-rc.1
165-
k8s.io/kubernetes v1.31.0
164+
k8s.io/kubectl v0.31.1-rc.1
165+
k8s.io/kubernetes v1.31.1
166166
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
167167
sigs.k8s.io/cri-tools v0.0.0-00010101000000-000000000000
168168
sigs.k8s.io/yaml v1.4.0
@@ -466,22 +466,22 @@ require (
466466
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
467467
gopkg.in/square/go-jose.v2 v2.6.0 // indirect
468468
gopkg.in/yaml.v3 v3.0.1 // indirect
469-
k8s.io/apiextensions-apiserver v0.31.0 // indirect
470-
k8s.io/code-generator v0.31.0 // indirect
469+
k8s.io/apiextensions-apiserver v0.31.1 // indirect
470+
k8s.io/code-generator v0.31.1 // indirect
471471
k8s.io/controller-manager v0.25.4 // indirect
472472
k8s.io/csi-translation-lib v0.0.0 // indirect
473473
k8s.io/dynamic-resource-allocation v0.0.0 // indirect
474474
k8s.io/endpointslice v0.0.0 // indirect
475475
k8s.io/gengo v0.0.0-20240228010128-51d4e06bde70 // indirect
476476
k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 // indirect
477477
k8s.io/kms v0.0.0 // indirect
478-
k8s.io/kube-aggregator v0.31.0 // indirect
478+
k8s.io/kube-aggregator v0.31.1 // indirect
479479
k8s.io/kube-controller-manager v0.0.0 // indirect
480480
k8s.io/kube-openapi v0.0.0-20240730131305-7a9a4e85957e // indirect
481481
k8s.io/kube-scheduler v0.0.0 // indirect
482-
k8s.io/kubelet v0.31.0 // indirect
482+
k8s.io/kubelet v0.31.1 // indirect
483483
k8s.io/metrics v0.0.0 // indirect
484-
k8s.io/mount-utils v0.31.0 // indirect
484+
k8s.io/mount-utils v0.31.1 // indirect
485485
k8s.io/pod-security-admission v0.0.0 // indirect
486486
lukechampine.com/blake3 v1.2.1 // indirect
487487
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect

0 commit comments

Comments
 (0)