Skip to content

Commit 0af3a94

Browse files
guettliguettli
committed
Merge remote-tracking branch 'origin/master' into tg/remove-docker
2 parents 842ede0 + be0d387 commit 0af3a94

File tree

7 files changed

+19
-29
lines changed

7 files changed

+19
-29
lines changed

Diff for: ‎Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
# Must override builder-base, not builder, since the latter is referred to later in the file and so must not be
2020
# directly replaced. See here, and note that "stage" parameter mentioned there has been renamed to
2121
# "build-context": https://github.com/docker/buildx/pull/904#issuecomment-1005871838
22-
FROM golang:1.24-bookworm@sha256:d7d795d0a9f51b00d9c9bfd17388c2c626004a50c6ed7c581e095122507fe1ab as builder-base
22+
FROM golang:1.24-bookworm@sha256:fa1a01d362a7b9df68b021d59a124d28cae6d99ebd1a876e3557c4dd092f1b1d as builder-base
2323
FROM builder-base as builder
2424
LABEL maintainer="Andy Xie <[email protected]>"
2525

Diff for: ‎README.md

-10
Original file line numberDiff line numberDiff line change
@@ -287,16 +287,6 @@ detected by the node-problem-detector. Remedy systems observe events and/or node
287287
conditions emitted by the node-problem-detector and take action to return the
288288
Kubernetes cluster to a healthy state. The following remedy systems exist:
289289

290-
* [**Draino**](https://github.com/planetlabs/draino) automatically drains Kubernetes
291-
nodes based on labels and node conditions. Nodes that match _all_ of the supplied
292-
labels and _any_ of the supplied node conditions will be prevented from accepting
293-
new pods (aka 'cordoned') immediately, and
294-
[drained](https://kubernetes.io/docs/tasks/administer-cluster/safely-drain-node/)
295-
after a configurable time. Draino can be used in conjunction with the
296-
[Cluster Autoscaler](https://github.com/kubernetes/autoscaler/tree/master/cluster-autoscaler)
297-
to automatically terminate drained nodes. Refer to
298-
[this issue](https://github.com/kubernetes/node-problem-detector/issues/199)
299-
for an example production use case for Draino.
300290
* [**Descheduler**](https://github.com/kubernetes-sigs/descheduler) strategy RemovePodsViolatingNodeTaints
301291
evicts pods violating NoSchedule taints on nodes. The k8s scheduler's TaintNodesByCondition feature must
302292
be enabled. The [Cluster Autoscaler](https://github.com/kubernetes/autoscaler/tree/master/cluster-autoscaler)

Diff for: ‎go.mod

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ require (
2020
go.opencensus.io v0.24.0
2121
golang.org/x/sys v0.28.0
2222
google.golang.org/api v0.192.0
23-
k8s.io/api v0.31.6
24-
k8s.io/apimachinery v0.31.6
25-
k8s.io/client-go v0.31.6
23+
k8s.io/api v0.31.7
24+
k8s.io/apimachinery v0.31.7
25+
k8s.io/client-go v0.31.7
2626
k8s.io/klog/v2 v2.130.1
2727
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
2828
)

Diff for: ‎go.sum

+6-6
Original file line numberDiff line numberDiff line change
@@ -1861,16 +1861,16 @@ k8s.io/api v0.20.4/go.mod h1:++lNL1AJMkDymriNniQsWRkMDzRaX2Y/POTUi8yvqYQ=
18611861
k8s.io/api v0.20.6/go.mod h1:X9e8Qag6JV/bL5G6bU8sdVRltWKmdHsFUGS3eVndqE8=
18621862
k8s.io/api v0.22.5/go.mod h1:mEhXyLaSD1qTOf40rRiKXkc+2iCem09rWLlFwhCEiAs=
18631863
k8s.io/api v0.23.5/go.mod h1:Na4XuKng8PXJ2JsploYYrivXrINeTaycCGcYgF91Xm8=
1864-
k8s.io/api v0.31.6 h1:ocWG/UhC9Mqp5oEfYWy9wCddbZiZyBAFTlBt0LVlhDg=
1865-
k8s.io/api v0.31.6/go.mod h1:i16xSiKMgVIVhsJMxfWq0mJbXA+Z7KhjPgYmwT41hl4=
1864+
k8s.io/api v0.31.7 h1:wSo59nXpVXmaB6hgNVJCrdnKtyYoutIgpNNBbROBd2U=
1865+
k8s.io/api v0.31.7/go.mod h1:vLUha4nXRUGtQdayzsmjur0lQApK/sJSxyR/fwuujcU=
18661866
k8s.io/apimachinery v0.20.1/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU=
18671867
k8s.io/apimachinery v0.20.4/go.mod h1:WlLqWAHZGg07AeltaI0MV5uk1Omp8xaN0JGLY6gkRpU=
18681868
k8s.io/apimachinery v0.20.6/go.mod h1:ejZXtW1Ra6V1O5H8xPBGz+T3+4gfkTCeExAHKU57MAc=
18691869
k8s.io/apimachinery v0.22.1/go.mod h1:O3oNtNadZdeOMxHFVxOreoznohCpy0z6mocxbZr7oJ0=
18701870
k8s.io/apimachinery v0.22.5/go.mod h1:xziclGKwuuJ2RM5/rSFQSYAj0zdbci3DH8kj+WvyN0U=
18711871
k8s.io/apimachinery v0.23.5/go.mod h1:BEuFMMBaIbcOqVIJqNZJXGFTP4W6AycEpb5+m/97hrM=
1872-
k8s.io/apimachinery v0.31.6 h1:Pn96A0wHD0X8+l7QTdAzdLQPrpav1s8rU6A+v2/9UEY=
1873-
k8s.io/apimachinery v0.31.6/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo=
1872+
k8s.io/apimachinery v0.31.7 h1:fpV8yLerIZFAkj0of66+i1ArPv/Btf9KO6Aulng7RRw=
1873+
k8s.io/apimachinery v0.31.7/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo=
18741874
k8s.io/apiserver v0.20.1/go.mod h1:ro5QHeQkgMS7ZGpvf4tSMx6bBOgPfE+f52KwvXfScaU=
18751875
k8s.io/apiserver v0.20.4/go.mod h1:Mc80thBKOyy7tbvFtB4kJv1kbdD0eIH8k8vianJcbFM=
18761876
k8s.io/apiserver v0.20.6/go.mod h1:QIJXNt6i6JB+0YQRNcS0hdRHJlMhflFmsBDeSgT1r8Q=
@@ -1880,8 +1880,8 @@ k8s.io/client-go v0.20.4/go.mod h1:LiMv25ND1gLUdBeYxBIwKpkSC5IsozMMmOOeSJboP+k=
18801880
k8s.io/client-go v0.20.6/go.mod h1:nNQMnOvEUEsOzRRFIIkdmYOjAZrC8bgq0ExboWSU1I0=
18811881
k8s.io/client-go v0.22.5/go.mod h1:cs6yf/61q2T1SdQL5Rdcjg9J1ElXSwbjSrW2vFImM4Y=
18821882
k8s.io/client-go v0.23.5/go.mod h1:flkeinTO1CirYgzMPRWxUCnV0G4Fbu2vLhYCObnt/r4=
1883-
k8s.io/client-go v0.31.6 h1:51HT40qVIZ13BrHKeWxFuU52uoPnFhxTYJnv4+LTgp4=
1884-
k8s.io/client-go v0.31.6/go.mod h1:MEq7JQJelUQ0/4fMoPEUrc/OOFyGo/9LmGA38H6O6xY=
1883+
k8s.io/client-go v0.31.7 h1:2+LFJc6Xw6rhmpDbN1NSmhoFLWBh62cPG/P+IfaTSGY=
1884+
k8s.io/client-go v0.31.7/go.mod h1:hrrMorBQ17LqzoKIxKg5cSWvmWl94EwA/MUF0Mkf+Zw=
18851885
k8s.io/code-generator v0.19.7/go.mod h1:lwEq3YnLYb/7uVXLorOJfxg+cUu2oihFhHZ0n9NIla0=
18861886
k8s.io/component-base v0.20.1/go.mod h1:guxkoJnNoh8LNrbtiQOlyp2Y2XFCZQmrcg2n/DeYNLk=
18871887
k8s.io/component-base v0.20.4/go.mod h1:t4p9EdiagbVCJKrQ1RsA5/V4rFQNDfRlevJajlGwgjI=

Diff for: ‎test/go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ require (
1313
golang.org/x/crypto v0.31.0
1414
golang.org/x/oauth2 v0.22.0
1515
google.golang.org/api v0.192.0
16-
k8s.io/apimachinery v0.31.6
17-
k8s.io/component-base v0.29.14
16+
k8s.io/apimachinery v0.31.7
17+
k8s.io/component-base v0.29.15
1818
k8s.io/klog/v2 v2.130.1
1919
k8s.io/node-problem-detector v0.8.19
2020
sigs.k8s.io/boskos v0.0.0-20200515170311-7d36bde8cdf6

Diff for: ‎test/go.sum

+4-4
Original file line numberDiff line numberDiff line change
@@ -1155,8 +1155,8 @@ k8s.io/apimachinery v0.0.0-20190703205208-4cfb76a8bf76/go.mod h1:M2fZgZL9DbLfeJa
11551155
k8s.io/apimachinery v0.17.0/go.mod h1:b9qmWdKlLuU9EBh+06BtLcSf/Mu89rWL33naRxs1uZg=
11561156
k8s.io/apimachinery v0.17.2/go.mod h1:b9qmWdKlLuU9EBh+06BtLcSf/Mu89rWL33naRxs1uZg=
11571157
k8s.io/apimachinery v0.17.3/go.mod h1:gxLnyZcGNdZTCLnq3fgzyg2A5BVCHTNDFrw8AmuJ+0g=
1158-
k8s.io/apimachinery v0.31.6 h1:Pn96A0wHD0X8+l7QTdAzdLQPrpav1s8rU6A+v2/9UEY=
1159-
k8s.io/apimachinery v0.31.6/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo=
1158+
k8s.io/apimachinery v0.31.7 h1:fpV8yLerIZFAkj0of66+i1ArPv/Btf9KO6Aulng7RRw=
1159+
k8s.io/apimachinery v0.31.7/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo=
11601160
k8s.io/apiserver v0.17.0/go.mod h1:ABM+9x/prjINN6iiffRVNCBR2Wk7uY4z+EtEGZD48cg=
11611161
k8s.io/apiserver v0.17.2/go.mod h1:lBmw/TtQdtxvrTk0e2cgtOxHizXI+d0mmGQURIHQZlo=
11621162
k8s.io/cli-runtime v0.17.2/go.mod h1:aa8t9ziyQdbkuizkNLAw3qe3srSyWh9zlSB7zTqRNPI=
@@ -1171,8 +1171,8 @@ k8s.io/code-generator v0.17.2/go.mod h1:DVmfPQgxQENqDIzVR2ddLXMH34qeszkKSdH/N+s+
11711171
k8s.io/code-generator v0.17.3/go.mod h1:l8BLVwASXQZTo2xamW5mQNFCe1XPiAesVq7Y1t7PiQQ=
11721172
k8s.io/component-base v0.17.0/go.mod h1:rKuRAokNMY2nn2A6LP/MiwpoaMRHpfRnrPaUJJj1Yoc=
11731173
k8s.io/component-base v0.17.2/go.mod h1:zMPW3g5aH7cHJpKYQ/ZsGMcgbsA/VyhEugF3QT1awLs=
1174-
k8s.io/component-base v0.29.14 h1:SF1DWN7bc2VloJ/ysegGoi/aHnopEo81aw9CslhqXIw=
1175-
k8s.io/component-base v0.29.14/go.mod h1:FoK1PHhFTaEQVvQLw29/Uyfd8Ug0qUKHrUcXIXJ1VxI=
1174+
k8s.io/component-base v0.29.15 h1:CvmXXTDyk43FDaiJ/Rp+yWFjw6hkUI2t7mIJUrK5j00=
1175+
k8s.io/component-base v0.29.15/go.mod h1:jH/sbuvmXew2Fz2iIKNMeNw8o/d1KR9tAg6uekQKnVk=
11761176
k8s.io/csi-translation-lib v0.17.0/go.mod h1:HEF7MEz7pOLJCnxabi45IPkhSsE/KmxPQksuCrHKWls=
11771177
k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
11781178
k8s.io/gengo v0.0.0-20190822140433-26a664648505/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=

Diff for: ‎vendor/modules.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -582,7 +582,7 @@ gopkg.in/yaml.v2
582582
# gopkg.in/yaml.v3 v3.0.1
583583
## explicit
584584
gopkg.in/yaml.v3
585-
# k8s.io/api v0.31.6
585+
# k8s.io/api v0.31.7
586586
## explicit; go 1.22.0
587587
k8s.io/api/admissionregistration/v1
588588
k8s.io/api/admissionregistration/v1alpha1
@@ -639,7 +639,7 @@ k8s.io/api/storage/v1
639639
k8s.io/api/storage/v1alpha1
640640
k8s.io/api/storage/v1beta1
641641
k8s.io/api/storagemigration/v1alpha1
642-
# k8s.io/apimachinery v0.31.6
642+
# k8s.io/apimachinery v0.31.7
643643
## explicit; go 1.22.0
644644
k8s.io/apimachinery/pkg/api/equality
645645
k8s.io/apimachinery/pkg/api/errors
@@ -689,7 +689,7 @@ k8s.io/apimachinery/pkg/version
689689
k8s.io/apimachinery/pkg/watch
690690
k8s.io/apimachinery/third_party/forked/golang/json
691691
k8s.io/apimachinery/third_party/forked/golang/reflect
692-
# k8s.io/client-go v0.31.6
692+
# k8s.io/client-go v0.31.7
693693
## explicit; go 1.22.0
694694
k8s.io/client-go/applyconfigurations/admissionregistration/v1
695695
k8s.io/client-go/applyconfigurations/admissionregistration/v1alpha1

0 commit comments

Comments
 (0)