Skip to content

Commit b2c1cf6

Browse files
sbueringertnthornton
authored andcommitted
default --use-deprecated-gcs to true
Signed-off-by: tnthornton <[email protected]>
1 parent 22d9eab commit b2c1cf6

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

tools/setup-envtest/README.md

+4-3
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,13 @@ setup-envtest use -i --use-env
4747
# sideload a pre-downloaded tarball as Kubernetes 1.16.2 into our store
4848
setup-envtest sideload 1.16.2 < downloaded-envtest.tar.gz
4949

50-
# Per default envtest binaries are downloaded from:
50+
# If --use-deprecated-gcs is set to false envtest binaries are downloaded from:
5151
# https://raw.githubusercontent.com/kubernetes-sigs/controller-tools/master/envtest-releases.yaml
5252
# To download from a custom index use the following:
53-
setup-envtest use --index https://custom.com/envtest-releases.yaml
53+
# Note: In controller-runtime v0.19.0 --use-deprecated-gcs will default to false.
54+
setup-envtest use --use-deprecated-gcs=false --index https://custom.com/envtest-releases.yaml
5455

55-
# To download from the kubebuilder-tools GCS bucket: (default behavior before v0.18)
56+
# To download from the kubebuilder-tools GCS bucket: (default behavior until v0.18)
5657
# Note: This is a Google-owned bucket and it might be shutdown at any time
5758
# see: https://github.com/kubernetes/k8s.io/issues/2647#event-12439345373
5859
# Note: This flag will also be removed soon.

tools/setup-envtest/main.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,15 +50,15 @@ var (
5050
binDir = flag.String("bin-dir", "",
5151
"directory to store binary assets (default: $OS_SPECIFIC_DATA_DIR/envtest-binaries)")
5252

53-
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")
53+
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")
5454

5555
// These flags are only used with --use-deprecated-gcs.
5656
remoteBucket = flag.String("remote-bucket", "kubebuilder-tools", "remote GCS bucket to download from (only used with --use-deprecated-gcs)")
5757
remoteServer = flag.String("remote-server", "storage.googleapis.com",
5858
"remote server to query from. You can override this if you want to run "+
5959
"an internal storage server instead, or for testing. (only used with --use-deprecated-gcs)")
6060

61-
// This flag is only used if --use-deprecated-gcs is not set or false (default).
61+
// This flag is only used if --use-deprecated-gcs is set to false.
6262
index = flag.String("index", remote.DefaultIndexURL, "index to discover envtest binaries (only used if --use-deprecated-gcs is not set, or set to false)")
6363
)
6464

0 commit comments

Comments
 (0)