From ec29bedf6bcd5699b53e22121606317fe66b8428 Mon Sep 17 00:00:00 2001 From: Aaron Crickenberger Date: Fri, 16 Jul 2021 18:33:30 -0700 Subject: [PATCH] use k8s-release-dev instead of kubernetes-release-dev this was a straight search-replace rather than attempting to converge toward dl.k8s.io because way too much of this is stale. I tried editing to update stale info at first, but someone who knows the state of things needs to do this. e.g. many of the uris in here are already dead, let alone things like /bazel and /ci-cross not existing in gs://k8s-release-dev --- docs/testing-pre-releases.md | 16 ++++++++-------- .../e2e/packages/verify_packages_install_deb.sh | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/docs/testing-pre-releases.md b/docs/testing-pre-releases.md index 67277a55..585de606 100644 --- a/docs/testing-pre-releases.md +++ b/docs/testing-pre-releases.md @@ -64,7 +64,7 @@ The table below summarize the current state: | ----------------------- | ------------------------------------------------------------ | ------------------------------------------------------------ | ------------------------------------------------------------ | | **GA release** | from .deb or .rpm repository | from [github release page](https://github.com/kubernetes/kubernetes/releases) or from `gs://kubernetes-release/release/` GCS bucket | from `k8s.gcr.io` container registry or from [github release page](https://github.com/kubernetes/kubernetes/releases) | | **alpha/beta release*** | not available. use CI/CD version "near" tag | from [github release page](https://github.com/kubernetes/kubernetes/releases) or from `gs://kubernetes-release/release/` GCS bucket | from `k8s.gcr.io` container registry or from [github release page](https://github.com/kubernetes/kubernetes/releases) | -| **CI/CD release*** | from `gs://kubernetes-release-dev/bazel/` GCS bucket (only debs, built every merge) | from `gs://kubernetes-release-dev/ci-cross/` GCS bucket (built every merge) | from `gcr.io/kubernetes-ci-images` container registry (built every few hours, not by PR) | +| **CI/CD release*** | from `gs://k8s-release-dev/bazel/` GCS bucket (only debs, built every merge) | from `gs://k8s-release-dev/ci-cross/` GCS bucket (built every merge) | from `gcr.io/kubernetes-ci-images` container registry (built every few hours, not by PR) | [*] for alpha/beta and CI/CD currently it is not possible to have exact version number consistency for all the components; however you can select version numbers "near to" the desired version. @@ -98,19 +98,19 @@ yum install - ### Getting .deb or .rpm packages form a GCS bucket -Pre-compiled CI/CD releases of .deb or .rpm packages are deployed into the `gs://kubernetes-release-dev/bazel/` +Pre-compiled CI/CD releases of .deb or .rpm packages are deployed into the `gs://k8s-release-dev/bazel/` GCS bucket. To explore versions available in Google Storage buckets use: ```bash -gsutil ls gs://kubernetes-release-dev/bazel/{filter} +gsutil ls gs://k8s-release-dev/bazel/{filter} # e.g. search all CI/CD v1.10 releases -gsutil ls -g gs://kubernetes-release-dev/bazel/v1.10* +gsutil ls -g gs://k8s-release-dev/bazel/v1.10* ``` -As alternative, you can browse using . +As alternative, you can browse using . To retrieve a pre-compiled CI/CD releases of .deb or .rpm version of kubeadm binary use: @@ -121,7 +121,7 @@ gsutil cp gs://{bucket-name}/{release}/bin/linux/amd64 *.deb . ### Getting kubeadm binaries from a GCS bucket Pre-compiled GA, alpha/beta versions of kubeadm binary are deployed into `gs://kubernetes-release/release/` GCS bucket, -while CI/CD versions are deployed into `gs://kubernetes-release-dev/ci-cross/` bucket. +while CI/CD versions are deployed into `gs://k8s-release-dev/ci-cross/` bucket. To explore versions available in Google Storage buckets use: @@ -159,7 +159,7 @@ For CI/CD valid version numbers are: - prefix `ci/` followed by a semantic version number - prefix `ci/` followed by Kubernetes release labels for CI/CD versions like e.g. `ci/latest`, `ci/latest-1`, `latest-1.10`. - See for the full list of labels. + See for the full list of labels. If you want to retrieve manually pre-compiled/pre-built GA, alpha/beta versions of control plane images, such images are deployed into `k8s.gcr.io` GCR registry, while CI/CD versions are deployed into @@ -520,7 +520,7 @@ see [https://semver.org/](https://semver.org/) for full explanation. Briefly: 4. Then open in the browser the corresponding bucket using the address 5. This bucket should contains a file named `bazel-build-location.txt`; inside there is the name of the GCS bucket - where CI/CD output are stored by jenkins e.g. `gs://kubernetes-release-dev/bazel/v1.9.0-alpha.0.584+0bfca758a870fc` + where CI/CD output are stored by jenkins e.g. `gs://k8s-release-dev/bazel/v1.9.0-alpha.0.584+0bfca758a870fc` ### Change the target version number when building a local release diff --git a/tests/e2e/packages/verify_packages_install_deb.sh b/tests/e2e/packages/verify_packages_install_deb.sh index 40a08f50..c6705780 100755 --- a/tests/e2e/packages/verify_packages_install_deb.sh +++ b/tests/e2e/packages/verify_packages_install_deb.sh @@ -44,7 +44,7 @@ CI_DIR=/tmp/k8s-ci mkdir -p $CI_DIR mkdir -p /opt/cni/bin CI_VERSION=$(curl -sSL https://dl.k8s.io/ci/latest.txt) -CI_URL="gs://kubernetes-release-dev/ci/$CI_VERSION-bazel/bin/linux/amd64" +CI_URL="gs://k8s-release-dev/ci/$CI_VERSION-bazel/bin/linux/amd64" echo "* testing CI version $CI_VERSION"