From da3ff694681967f6c8a5a213596ff647375ef7a9 Mon Sep 17 00:00:00 2001 From: Will Morrison Date: Thu, 4 Nov 2021 11:36:58 -0400 Subject: [PATCH] Use ioutil.WriteFile for earlier Go version compatibility and update flag docs. --- kubetest/gke.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kubetest/gke.go b/kubetest/gke.go index d1ab26667a6e..68c412249e75 100644 --- a/kubetest/gke.go +++ b/kubetest/gke.go @@ -63,7 +63,7 @@ var ( gkeNatMinPortsPerVm = flag.Int("gke-nat-min-ports-per-vm", 64, "(gke only) Specify number of ports per cluster VM for NAT router. Number of ports * number of nodes / 64k = number of auto-allocated IP addresses (there is a hard limit of 100 IPs).") gkeDownTimeout = flag.Duration("gke-down-timeout", 1*time.Hour, "(gke only) Timeout for gcloud container clusters delete call. Defaults to 1 hour which matches gcloud's default.") gkeRemoveNetwork = flag.Bool("gke-remove-network", true, "(gke only) At the end of the test remove non-default network that was used by cluster.") - gkeDumpConfigMaps = flag.String("gke-dump-configmaps", "[]", `(gke-only) A JSON description of ConfigMaps to dump as part of gathering cluster logs. Note: --dump or --dump-pre-test-logs flags must also be set. Example: '[{"Name":"my-map", "Namespace":"default"}]`) + gkeDumpConfigMaps = flag.String("gke-dump-configmaps", "[]", `(gke-only) A JSON description of ConfigMaps to dump as part of gathering cluster logs. Note: --dump or --dump-pre-test-logs flags must also be set. Example: '[{"Name":"my-map", "Namespace":"default", "DataKey":"my-data-key"}]`) // poolReTemplate matches instance group URLs of the form `https://www.googleapis.com/compute/v1/projects/some-project/zones/a-zone/instanceGroupManagers/gke-some-cluster-some-pool-90fcb815-grp`. Match meaning: // m[0]: path starting with zones/ @@ -525,7 +525,7 @@ export KUBE_NODE_OS_DISTRIBUTION='%[3]s' if err != nil { return err } - if err := os.WriteFile(filepath.Join(localPath, "gke-configmap.json"), jsonDump, 0644); err != nil { + if err := ioutil.WriteFile(filepath.Join(localPath, "gke-configmap.json"), jsonDump, 0644); err != nil { return err } return nil