Skip to content

Commit 15f96a8

Browse files
authored
Merge pull request kubernetes#86305 from saschagrunert/cri-tools
Update cri-tools to v1.17.0
2 parents e92a7cf + 7e5e7c1 commit 15f96a8

File tree

4 files changed

+17
-17
lines changed

4 files changed

+17
-17
lines changed

build/dependencies.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ dependencies:
7777
match: CoreDNSVersion =
7878

7979
- name: "crictl"
80-
version: 1.16.1
80+
version: 1.17.0
8181
refPaths:
8282
- path: build/workspace.bzl
8383
match: CRI_TOOLS_VERSION =

build/workspace.bzl

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,16 @@ _CNI_TARBALL_ARCH_SHA256 = {
2626
"s390x": "415cdcf02c65c22f5b7e55b0ab61208a10f2b95a0c8310176c771d07a9f448cf",
2727
}
2828

29-
CRI_TOOLS_VERSION = "1.16.1"
29+
CRI_TOOLS_VERSION = "1.17.0"
3030
_CRI_TARBALL_ARCH_SHA256 = {
31-
"linux-386": "35b721a7a90a12cf9689fb1f4fe5b50f73520200130a52b552234bd798d2ae9f",
32-
"linux-amd64": "19fed421710fccfe58f5573383bb137c19438a9056355556f1a15da8d23b3ad1",
33-
"linux-arm": "367826f3eb06c4d923f3174d23141ddacef9ffcb0c902502bd922dbad86d08dd",
34-
"linux-arm64": "62b60ab7046b788df892a1b746bd602c520a59c38232febc0580692c9805f641",
35-
"linux-ppc64le": "d6464188a5011242b8dad22cb1e55d8cb29d6873f3d1f3f3c32bb236d3fca64e",
36-
"linux-s390x": "f3d5e707810d7985f6a470ea439ca5989c0ee218a824795ed1726f4958281a2d",
37-
"windows-386": "b7564675f69aa2a01b092874c9c9aeda084204384d711a6fb85c6d2328ca5c7d",
38-
"windows-amd64": "7d092dcb3b1af2edf75477d5d049a70e8c0d1ac8242b1dff2de7e6aa084e3615",
31+
"linux-386": "cffa443cf76ab4b760a68d4db555d1854cb692e8b20b3360cf23221815ca151e",
32+
"linux-amd64": "7b72073797f638f099ed19550d52e9b9067672523fc51b746e65d7aa0bafa414",
33+
"linux-arm": "9700957218e8e7bdc02cbc8fda4c189f5b6223a93ba89d876bdfd77b6117e9b7",
34+
"linux-arm64": "d89afd89c2852509fafeaff6534d456272360fcee732a8d0cb89476377387e12",
35+
"linux-ppc64le": "a61c52b9ac5bffe94ae4c09763083c60f3eccd30eb351017b310f32d1cafb855",
36+
"linux-s390x": "0db445f0b74ecb51708b710480a462b728174155c5f2709a39d1cc2dc975e350",
37+
"windows-386": "2e285250d36b5cb3e8c047b191c0c0af606fed7c0034bb140ba95cc1498f4996",
38+
"windows-amd64": "e18150d5546d3ddf6b165bd9aec0f65c18aacf75b94fb28bb26bfc0238f07b28",
3939
}
4040

4141
ETCD_VERSION = "3.4.3"

cluster/gce/gci/configure.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ DEFAULT_CNI_VERSION="v0.7.5"
2828
DEFAULT_CNI_SHA1="52e9d2de8a5f927307d9397308735658ee44ab8d"
2929
DEFAULT_NPD_VERSION="v0.8.0"
3030
DEFAULT_NPD_SHA1="9406c975b1b035995a137029a004622b905b4e7f"
31-
DEFAULT_CRICTL_VERSION="v1.16.1"
32-
DEFAULT_CRICTL_SHA1="8d7b788bf0a52bd3248407c6ebf779ffead27c99"
31+
DEFAULT_CRICTL_VERSION="v1.17.0"
32+
DEFAULT_CRICTL_SHA1="5c18f4e52ab524d429063b78d086dd18b894aae7"
3333
DEFAULT_MOUNTER_TAR_SHA="8003b798cf33c7f91320cd6ee5cec4fa22244571"
3434
###
3535

cluster/gce/windows/k8s-node-setup.psm1

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1238,8 +1238,8 @@ function Verify-WorkerServices {
12381238
}
12391239

12401240
function DownloadAndInstall-Crictl {
1241-
$CRICTL_VERSION = "v1.16.1"
1242-
$CRICTL_SHA256 = "69a53602f9a8469d4a86284e318fe19b33e97577f7836f48e6f4fb2ed1822baa"
1241+
$CRICTL_VERSION = "v1.17.0"
1242+
$CRICTL_SHA256 = "781fd3bd15146a924c6fc2428b11d8a0f20fa04a0c8e00a9a5808f2cc37e0569"
12431243

12441244
# Assume that presence of crictl.exe indicates that the crictl binaries
12451245
# were already previously downloaded to this node.
@@ -1551,7 +1551,7 @@ function Restart-LoggingAgent {
15511551
Throw ("Timeout while waiting for StackdriverLogging service to stop")
15521552
}
15531553
}
1554-
1554+
15551555
Start-Service StackdriverLogging
15561556
}
15571557

@@ -1613,12 +1613,12 @@ function Install-LoggingAgent {
16131613
function Configure-LoggingAgent {
16141614
$fluentd_config_dir = "$STACKDRIVER_ROOT\LoggingAgent\config.d"
16151615
$fluentd_config_file = "$fluentd_config_dir\k8s_containers.conf"
1616-
1616+
16171617
# Create a configuration file for kubernetes containers.
16181618
# The config.d directory should have already been created automatically, but
16191619
# try creating again just in case.
16201620
New-Item $fluentd_config_dir -ItemType 'directory' -Force | Out-Null
1621-
1621+
16221622
$config = $FLUENTD_CONFIG.replace('NODE_NAME', (hostname))
16231623
$config | Out-File -FilePath $fluentd_config_file -Encoding ASCII
16241624
Log-Output "Wrote fluentd logging config to $fluentd_config_file"

0 commit comments

Comments
 (0)