diff --git a/build/dependencies.yaml b/build/dependencies.yaml index 5b08d35dde1..a08185f66e9 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -77,7 +77,7 @@ dependencies: match: CoreDNSVersion = - name: "crictl" - version: 1.16.1 + version: 1.17.0 refPaths: - path: build/workspace.bzl match: CRI_TOOLS_VERSION = diff --git a/build/workspace.bzl b/build/workspace.bzl index cfa0b0889b3..d39bdd72ad4 100644 --- a/build/workspace.bzl +++ b/build/workspace.bzl @@ -26,16 +26,16 @@ _CNI_TARBALL_ARCH_SHA256 = { "s390x": "415cdcf02c65c22f5b7e55b0ab61208a10f2b95a0c8310176c771d07a9f448cf", } -CRI_TOOLS_VERSION = "1.16.1" +CRI_TOOLS_VERSION = "1.17.0" _CRI_TARBALL_ARCH_SHA256 = { - "linux-386": "35b721a7a90a12cf9689fb1f4fe5b50f73520200130a52b552234bd798d2ae9f", - "linux-amd64": "19fed421710fccfe58f5573383bb137c19438a9056355556f1a15da8d23b3ad1", - "linux-arm": "367826f3eb06c4d923f3174d23141ddacef9ffcb0c902502bd922dbad86d08dd", - "linux-arm64": "62b60ab7046b788df892a1b746bd602c520a59c38232febc0580692c9805f641", - "linux-ppc64le": "d6464188a5011242b8dad22cb1e55d8cb29d6873f3d1f3f3c32bb236d3fca64e", - "linux-s390x": "f3d5e707810d7985f6a470ea439ca5989c0ee218a824795ed1726f4958281a2d", - "windows-386": "b7564675f69aa2a01b092874c9c9aeda084204384d711a6fb85c6d2328ca5c7d", - "windows-amd64": "7d092dcb3b1af2edf75477d5d049a70e8c0d1ac8242b1dff2de7e6aa084e3615", + "linux-386": "cffa443cf76ab4b760a68d4db555d1854cb692e8b20b3360cf23221815ca151e", + "linux-amd64": "7b72073797f638f099ed19550d52e9b9067672523fc51b746e65d7aa0bafa414", + "linux-arm": "9700957218e8e7bdc02cbc8fda4c189f5b6223a93ba89d876bdfd77b6117e9b7", + "linux-arm64": "d89afd89c2852509fafeaff6534d456272360fcee732a8d0cb89476377387e12", + "linux-ppc64le": "a61c52b9ac5bffe94ae4c09763083c60f3eccd30eb351017b310f32d1cafb855", + "linux-s390x": "0db445f0b74ecb51708b710480a462b728174155c5f2709a39d1cc2dc975e350", + "windows-386": "2e285250d36b5cb3e8c047b191c0c0af606fed7c0034bb140ba95cc1498f4996", + "windows-amd64": "e18150d5546d3ddf6b165bd9aec0f65c18aacf75b94fb28bb26bfc0238f07b28", } ETCD_VERSION = "3.4.3" diff --git a/cluster/gce/gci/configure.sh b/cluster/gce/gci/configure.sh index bd7349914f7..bc476b411e8 100644 --- a/cluster/gce/gci/configure.sh +++ b/cluster/gce/gci/configure.sh @@ -28,8 +28,8 @@ DEFAULT_CNI_VERSION="v0.7.5" DEFAULT_CNI_SHA1="52e9d2de8a5f927307d9397308735658ee44ab8d" DEFAULT_NPD_VERSION="v0.8.0" DEFAULT_NPD_SHA1="9406c975b1b035995a137029a004622b905b4e7f" -DEFAULT_CRICTL_VERSION="v1.16.1" -DEFAULT_CRICTL_SHA1="8d7b788bf0a52bd3248407c6ebf779ffead27c99" +DEFAULT_CRICTL_VERSION="v1.17.0" +DEFAULT_CRICTL_SHA1="5c18f4e52ab524d429063b78d086dd18b894aae7" DEFAULT_MOUNTER_TAR_SHA="8003b798cf33c7f91320cd6ee5cec4fa22244571" ### diff --git a/cluster/gce/windows/k8s-node-setup.psm1 b/cluster/gce/windows/k8s-node-setup.psm1 index d021f7ffd0b..43ae0120107 100644 --- a/cluster/gce/windows/k8s-node-setup.psm1 +++ b/cluster/gce/windows/k8s-node-setup.psm1 @@ -1238,8 +1238,8 @@ function Verify-WorkerServices { } function DownloadAndInstall-Crictl { - $CRICTL_VERSION = "v1.16.1" - $CRICTL_SHA256 = "69a53602f9a8469d4a86284e318fe19b33e97577f7836f48e6f4fb2ed1822baa" + $CRICTL_VERSION = "v1.17.0" + $CRICTL_SHA256 = "781fd3bd15146a924c6fc2428b11d8a0f20fa04a0c8e00a9a5808f2cc37e0569" # Assume that presence of crictl.exe indicates that the crictl binaries # were already previously downloaded to this node. @@ -1551,7 +1551,7 @@ function Restart-LoggingAgent { Throw ("Timeout while waiting for StackdriverLogging service to stop") } } - + Start-Service StackdriverLogging } @@ -1613,12 +1613,12 @@ function Install-LoggingAgent { function Configure-LoggingAgent { $fluentd_config_dir = "$STACKDRIVER_ROOT\LoggingAgent\config.d" $fluentd_config_file = "$fluentd_config_dir\k8s_containers.conf" - + # Create a configuration file for kubernetes containers. # The config.d directory should have already been created automatically, but # try creating again just in case. New-Item $fluentd_config_dir -ItemType 'directory' -Force | Out-Null - + $config = $FLUENTD_CONFIG.replace('NODE_NAME', (hostname)) $config | Out-File -FilePath $fluentd_config_file -Encoding ASCII Log-Output "Wrote fluentd logging config to $fluentd_config_file"