From 35d7bbd2e80b743674c95e733adc9ee1ea0c0c31 Mon Sep 17 00:00:00 2001 From: Stefan Bueringer Date: Wed, 22 May 2024 19:47:31 +0200 Subject: [PATCH] default --use-deprecated-gcs to true --- tools/setup-envtest/README.md | 7 ++++--- tools/setup-envtest/main.go | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/tools/setup-envtest/README.md b/tools/setup-envtest/README.md index 44505dd8a3..cf8496d56b 100644 --- a/tools/setup-envtest/README.md +++ b/tools/setup-envtest/README.md @@ -41,12 +41,13 @@ setup-envtest use -i --use-env # sideload a pre-downloaded tarball as Kubernetes 1.16.2 into our store setup-envtest sideload 1.16.2 < downloaded-envtest.tar.gz -# Per default envtest binaries are downloaded from: +# If --use-deprecated-gcs is set to false envtest binaries are downloaded from: # https://raw.githubusercontent.com/kubernetes-sigs/controller-tools/master/envtest-releases.yaml # To download from a custom index use the following: -setup-envtest use --index https://custom.com/envtest-releases.yaml +# Note: In controller-runtime v0.19.0 --use-deprecated-gcs will default to false. +setup-envtest use --use-deprecated-gcs=false --index https://custom.com/envtest-releases.yaml -# To download from the kubebuilder-tools GCS bucket: (default behavior before v0.18) +# To download from the kubebuilder-tools GCS bucket: (default behavior until v0.18) # Note: This is a Google-owned bucket and it might be shutdown at any time # see: https://github.com/kubernetes/k8s.io/issues/2647#event-12439345373 # Note: This flag will also be removed soon. diff --git a/tools/setup-envtest/main.go b/tools/setup-envtest/main.go index 7e2761a4f6..62670af515 100644 --- a/tools/setup-envtest/main.go +++ b/tools/setup-envtest/main.go @@ -50,7 +50,7 @@ var ( binDir = flag.String("bin-dir", "", "directory to store binary assets (default: $OS_SPECIFIC_DATA_DIR/envtest-binaries)") - useDeprecatedGCS = flag.Bool("use-deprecated-gcs", false, "use GCS to fetch envtest binaries. Note: This is deprecated and will be removed soon. For more details see: https://github.com/kubernetes-sigs/controller-runtime/pull/2811") + useDeprecatedGCS = flag.Bool("use-deprecated-gcs", true, "use GCS to fetch envtest binaries. Note: This is deprecated and will be removed soon. For more details see: https://github.com/kubernetes-sigs/controller-runtime/pull/2811. In controller-runtime v0.19.0 this flag will default to false") // These flags are only used with --use-deprecated-gcs. remoteBucket = flag.String("remote-bucket", "kubebuilder-tools", "remote GCS bucket to download from (only used with --use-deprecated-gcs)") @@ -58,7 +58,7 @@ var ( "remote server to query from. You can override this if you want to run "+ "an internal storage server instead, or for testing. (only used with --use-deprecated-gcs)") - // This flag is only used if --use-deprecated-gcs is not set or false (default). + // This flag is only used if --use-deprecated-gcs is set to false. index = flag.String("index", remote.DefaultIndexURL, "index to discover envtest binaries (only used if --use-deprecated-gcs is not set, or set to false)") )