Merge pull request #178624 from iAmMrinal0/update/google-cloud-sdk
This commit is contained in:
commit
2d4758ed89
|
@ -1,32 +1,32 @@
|
||||||
# DO NOT EDIT! This file is generated automatically by update.sh
|
# DO NOT EDIT! This file is generated automatically by update.sh
|
||||||
{ }:
|
{ }:
|
||||||
{
|
{
|
||||||
version = "387.0.0";
|
version = "397.0.0";
|
||||||
googleCloudSdkPkgs = {
|
googleCloudSdkPkgs = {
|
||||||
x86_64-linux =
|
x86_64-linux =
|
||||||
{
|
{
|
||||||
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-387.0.0-linux-x86_64.tar.gz";
|
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-397.0.0-linux-x86_64.tar.gz";
|
||||||
sha256 = "1hsp575xg7caxhldxmqxsds99mr0gs2qxgk7x7mr9jnjdq6nqmdg";
|
sha256 = "1b7ggqc43xyszb583paky4gvph4ncvvwpdy1037dj1ckrd53bg00";
|
||||||
};
|
};
|
||||||
x86_64-darwin =
|
x86_64-darwin =
|
||||||
{
|
{
|
||||||
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-387.0.0-darwin-x86_64.tar.gz";
|
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-397.0.0-darwin-x86_64.tar.gz";
|
||||||
sha256 = "0qyd6z5clnd0slhsn9hc1xiic5rbssrps1n97jq94mv90rjp94jx";
|
sha256 = "0iiyga7b4axkprif5gyqnr8sjkv9nap5lvabgfx5845br7hzr5ps";
|
||||||
};
|
};
|
||||||
aarch64-linux =
|
aarch64-linux =
|
||||||
{
|
{
|
||||||
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-387.0.0-linux-arm.tar.gz";
|
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-397.0.0-linux-arm.tar.gz";
|
||||||
sha256 = "0drxv1dzlnzmrs92j7a48iwvzfvdl9dl4hk688lj7cl51yndbyyz";
|
sha256 = "102vw2f2q28c54hvn4hlp2da3zsib16z6hkz41079c1pmiybysi1";
|
||||||
};
|
};
|
||||||
aarch64-darwin =
|
aarch64-darwin =
|
||||||
{
|
{
|
||||||
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-387.0.0-darwin-arm.tar.gz";
|
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-397.0.0-darwin-arm.tar.gz";
|
||||||
sha256 = "0244k34lwj29smyds8qs7qdrvwwnvwh0v6giifbwzhlb40nw4k72";
|
sha256 = "0hp60fpmsvhn046sp0wb52xszkmin5v235khbxb82wr0vsgnqd7z";
|
||||||
};
|
};
|
||||||
i686-linux =
|
i686-linux =
|
||||||
{
|
{
|
||||||
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-387.0.0-linux-x86.tar.gz";
|
url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-397.0.0-linux-x86.tar.gz";
|
||||||
sha256 = "0fb6qx1qjm9y013glinxdaf1x9ppwrb7szjx96maqb90zvq1jdcz";
|
sha256 = "1xw4jzl85didin26q9sg7j1pip4bmap5d0ac9ywbj0vni71mqx26";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -30,17 +30,15 @@ keep working.
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
diff --git a/lib/googlecloudsdk/api_lib/container/kubeconfig.py b/lib/googlecloudsdk/api_lib/container/kubeconfig.py
|
diff --git a/lib/googlecloudsdk/api_lib/container/kubeconfig.py b/lib/googlecloudsdk/api_lib/container/kubeconfig.py
|
||||||
index 4330988d6..37424b841 100644
|
index 5975cb8f..b98e6721 100644
|
||||||
--- a/lib/googlecloudsdk/api_lib/container/kubeconfig.py
|
--- a/lib/googlecloudsdk/api_lib/container/kubeconfig.py
|
||||||
+++ b/lib/googlecloudsdk/api_lib/container/kubeconfig.py
|
+++ b/lib/googlecloudsdk/api_lib/container/kubeconfig.py
|
||||||
@@ -352,7 +352,7 @@ def _AuthProvider(name='gcp',
|
@@ -396,7 +396,7 @@ def _AuthProvider(name='gcp',
|
||||||
if sdk_bin_path is None:
|
if sdk_bin_path is None:
|
||||||
log.error(SDK_BIN_PATH_NOT_FOUND)
|
log.error(SDK_BIN_PATH_NOT_FOUND)
|
||||||
raise Error(SDK_BIN_PATH_NOT_FOUND)
|
raise Error(SDK_BIN_PATH_NOT_FOUND)
|
||||||
- cmd_path = os.path.join(sdk_bin_path, bin_name)
|
- cmd_path = os.path.join(sdk_bin_path, bin_name)
|
||||||
+ cmd_path = bin_name
|
+ cmd_path = bin_name
|
||||||
|
try:
|
||||||
cfg = {
|
# Print warning if gke-gcloud-auth-plugin is not present or executable
|
||||||
# Command for gcloud credential helper
|
_GetGkeGcloudPluginCommandAndPrintWarning()
|
||||||
--
|
|
||||||
2.21.0
|
|
||||||
|
|
|
@ -5,7 +5,7 @@ BASE_URL="https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-clou
|
||||||
|
|
||||||
# Version of Google Cloud SDK from
|
# Version of Google Cloud SDK from
|
||||||
# https://cloud.google.com/sdk/docs/release-notes
|
# https://cloud.google.com/sdk/docs/release-notes
|
||||||
VERSION="387.0.0"
|
VERSION="397.0.0"
|
||||||
|
|
||||||
function genMainSrc() {
|
function genMainSrc() {
|
||||||
local url="${BASE_URL}-${VERSION}-${1}-${2}.tar.gz"
|
local url="${BASE_URL}-${VERSION}-${1}-${2}.tar.gz"
|
||||||
|
|
Loading…
Reference in a new issue