Skip to content

K
k3s
Commit 5f4aaaa1 authored by k8s-merge-robot's avatar k8s-merge-robot Committed by GitHub
Browse files
Options

Merge pull request #28246 from zmerlynn/revert-revert-28193

Automatic merge from submit-queue Revert Revert of #28193 Bring back #28193. We caught a break in https://github.com/kubernetes/test-infra/issues/240 and discovered the previous issue, fixed in https://github.com/kubernetes/test-infra/pull/241 and https://github.com/kubernetes/test-infra/pull/244, so I have a pretty good handle on what was causing the previous bringup issues (and it wasn't #28193). By the time this merges, we'll have good signal on GKE in several concurrent GKE jobs. This reverts commit ee1d4803. [![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()
parents 8621326a 2d6c632d
Hide whitespace changes
Inline Side-by-side
Showing with 29 additions and 20 deletions
cluster/common.sh
View file @ 5f4aaaa1
...@@ -292,7 +292,7 @@ function detect-master-from-kubeconfig() { ...@@ -292,7 +292,7 @@ function detect-master-from-kubeconfig() {
# Sets KUBE_VERSION variable to the proper version number (e.g. "v1.0.6", # Sets KUBE_VERSION variable to the proper version number (e.g. "v1.0.6",
# "v1.2.0-alpha.1.881+376438b69c7612") or a version' publication of the form # "v1.2.0-alpha.1.881+376438b69c7612") or a version' publication of the form
# <bucket>/<version> (e.g. "release/stable",' "ci/latest-1"). # <path>/<version> (e.g. "release/stable",' "ci/latest-1").
# #
# See the docs on getting builds for more information about version # See the docs on getting builds for more information about version
# publication. # publication.
...@@ -303,7 +303,12 @@ function detect-master-from-kubeconfig() { ...@@ -303,7 +303,12 @@ function detect-master-from-kubeconfig() {
# KUBE_VERSION # KUBE_VERSION
function set_binary_version() { function set_binary_version() {
if [[ "${1}" =~ "/" ]]; then if [[ "${1}" =~ "/" ]]; then
KUBE_VERSION=$(gsutil cat gs://kubernetes-release/${1}.txt) IFS='/' read -a path <<< "${1}"
if [[ "${path[0]}" == "release" ]]; then
KUBE_VERSION=$(gsutil cat "gs://kubernetes-release/${1}.txt")
else
KUBE_VERSION=$(gsutil cat "gs://kubernetes-release-dev/${1}.txt")
fi
else else
KUBE_VERSION=${1} KUBE_VERSION=${1}
fi fi
...@@ -334,8 +339,8 @@ function tars_from_version() { ...@@ -334,8 +339,8 @@ function tars_from_version() {
KUBE_MANIFESTS_TAR_URL="${SERVER_BINARY_TAR_URL/server-linux-amd64/manifests}" KUBE_MANIFESTS_TAR_URL="${SERVER_BINARY_TAR_URL/server-linux-amd64/manifests}"
KUBE_MANIFESTS_TAR_HASH=$(curl ${KUBE_MANIFESTS_TAR_URL} | sha1sum | awk '{print $1}') KUBE_MANIFESTS_TAR_HASH=$(curl ${KUBE_MANIFESTS_TAR_URL} | sha1sum | awk '{print $1}')
elif [[ ${KUBE_VERSION} =~ ${KUBE_CI_VERSION_REGEX} ]]; then elif [[ ${KUBE_VERSION} =~ ${KUBE_CI_VERSION_REGEX} ]]; then
SERVER_BINARY_TAR_URL="https://storage.googleapis.com/kubernetes-release/ci/${KUBE_VERSION}/kubernetes-server-linux-amd64.tar.gz" SERVER_BINARY_TAR_URL="https://storage.googleapis.com/kubernetes-release-dev/ci/${KUBE_VERSION}/kubernetes-server-linux-amd64.tar.gz"
SALT_TAR_URL="https://storage.googleapis.com/kubernetes-release/ci/${KUBE_VERSION}/kubernetes-salt.tar.gz" SALT_TAR_URL="https://storage.googleapis.com/kubernetes-release-dev/ci/${KUBE_VERSION}/kubernetes-salt.tar.gz"
# TODO: Clean this up. # TODO: Clean this up.
KUBE_MANIFESTS_TAR_URL="${SERVER_BINARY_TAR_URL/server-linux-amd64/manifests}" KUBE_MANIFESTS_TAR_URL="${SERVER_BINARY_TAR_URL/server-linux-amd64/manifests}"
KUBE_MANIFESTS_TAR_HASH=$(curl ${KUBE_MANIFESTS_TAR_URL} | sha1sum | awk '{print $1}') KUBE_MANIFESTS_TAR_HASH=$(curl ${KUBE_MANIFESTS_TAR_URL} | sha1sum | awk '{print $1}')
...@@ -484,7 +489,7 @@ function build-runtime-config() { ...@@ -484,7 +489,7 @@ function build-runtime-config() {
if [[ -n ${appends} ]]; then if [[ -n ${appends} ]]; then
if [[ -n ${RUNTIME_CONFIG} ]]; then if [[ -n ${RUNTIME_CONFIG} ]]; then
RUNTIME_CONFIG="${RUNTIME_CONFIG},${appends}" RUNTIME_CONFIG="${RUNTIME_CONFIG},${appends}"
else else
RUNTIME_CONFIG="${appends}" RUNTIME_CONFIG="${appends}"
fi fi
fi fi
......
cluster/gce/upgrade.sh
View file @ 5f4aaaa1
...@@ -59,7 +59,7 @@ function usage() { ...@@ -59,7 +59,7 @@ function usage() {
release_stable=$(gsutil cat gs://kubernetes-release/release/stable.txt) release_stable=$(gsutil cat gs://kubernetes-release/release/stable.txt)
release_latest=$(gsutil cat gs://kubernetes-release/release/latest.txt) release_latest=$(gsutil cat gs://kubernetes-release/release/latest.txt)
ci_latest=$(gsutil cat gs://kubernetes-release/ci/latest.txt) ci_latest=$(gsutil cat gs://kubernetes-release-dev/ci/latest.txt)
echo "Right now, versions are as follows:" echo "Right now, versions are as follows:"
echo " release/stable: ${0} ${release_stable}" echo " release/stable: ${0} ${release_stable}"
......
docs/devel/getting-builds.md
View file @ 5f4aaaa1
...@@ -59,9 +59,9 @@ Finally, you can just print the latest or stable version: ...@@ -59,9 +59,9 @@ Finally, you can just print the latest or stable version:
You can also use the gsutil tool to explore the Google Cloud Storage release buckets. Here are some examples: You can also use the gsutil tool to explore the Google Cloud Storage release buckets. Here are some examples:
```sh ```sh
gsutil cat gs://kubernetes-release/ci/latest.txt # output the latest ci version number gsutil cat gs://kubernetes-release-dev/ci/latest.txt # output the latest ci version number
gsutil cat gs://kubernetes-release/ci/latest-green.txt # output the latest ci version number that passed gce e2e gsutil cat gs://kubernetes-release-dev/ci/latest-green.txt # output the latest ci version number that passed gce e2e
gsutil ls gs://kubernetes-release/ci/v0.20.0-29-g29a55cc/ # list the contents of a ci release gsutil ls gs://kubernetes-release-dev/ci/v0.20.0-29-g29a55cc/ # list the contents of a ci release
gsutil ls gs://kubernetes-release/release # list all official releases and rcs gsutil ls gs://kubernetes-release/release # list all official releases and rcs
``` ```
......
hack/get-build.sh
View file @ 5f4aaaa1
...@@ -23,6 +23,7 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE}")/.. ...@@ -23,6 +23,7 @@ KUBE_ROOT=$(dirname "${BASH_SOURCE}")/..
source "${KUBE_ROOT}/cluster/common.sh" source "${KUBE_ROOT}/cluster/common.sh"
declare -r KUBE_RELEASE_BUCKET_URL="https://storage.googleapis.com/kubernetes-release" declare -r KUBE_RELEASE_BUCKET_URL="https://storage.googleapis.com/kubernetes-release"
declare -r KUBE_DEV_RELEASE_BUCKET_URL="https://storage.googleapis.com/kubernetes-release-dev"
declare -r KUBE_TAR_NAME="kubernetes.tar.gz" declare -r KUBE_TAR_NAME="kubernetes.tar.gz"
usage() { usage() {
...@@ -74,7 +75,7 @@ else ...@@ -74,7 +75,7 @@ else
if [[ ${KUBE_VERSION} =~ ${KUBE_RELEASE_VERSION_REGEX} ]]; then if [[ ${KUBE_VERSION} =~ ${KUBE_RELEASE_VERSION_REGEX} ]]; then
curl --fail -o "kubernetes-${KUBE_VERSION}.tar.gz" "${KUBE_RELEASE_BUCKET_URL}/release/${KUBE_VERSION}/${KUBE_TAR_NAME}" curl --fail -o "kubernetes-${KUBE_VERSION}.tar.gz" "${KUBE_RELEASE_BUCKET_URL}/release/${KUBE_VERSION}/${KUBE_TAR_NAME}"
elif [[ ${KUBE_VERSION} =~ ${KUBE_CI_VERSION_REGEX} ]]; then elif [[ ${KUBE_VERSION} =~ ${KUBE_CI_VERSION_REGEX} ]]; then
curl --fail -o "kubernetes-${KUBE_VERSION}.tar.gz" "${KUBE_RELEASE_BUCKET_URL}/ci/${KUBE_VERSION}/${KUBE_TAR_NAME}" curl --fail -o "kubernetes-${KUBE_VERSION}.tar.gz" "${KUBE_DEV_RELEASE_BUCKET_URL}/ci/${KUBE_VERSION}/${KUBE_TAR_NAME}"
else else
echo "Version doesn't match regexp" >&2 echo "Version doesn't match regexp" >&2
exit 1 exit 1
......
hack/jenkins/e2e-runner.sh
View file @ 5f4aaaa1
...@@ -22,6 +22,7 @@ set -o pipefail ...@@ -22,6 +22,7 @@ set -o pipefail
set -o xtrace set -o xtrace
: ${KUBE_GCS_RELEASE_BUCKET:="kubernetes-release"} : ${KUBE_GCS_RELEASE_BUCKET:="kubernetes-release"}
: ${KUBE_GCS_DEV_RELEASE_BUCKET:="kubernetes-release-dev"}
function running_in_docker() { function running_in_docker() {
grep -q docker /proc/self/cgroup grep -q docker /proc/self/cgroup
...@@ -47,10 +48,15 @@ function fetch_server_version_tars() { ...@@ -47,10 +48,15 @@ function fetch_server_version_tars() {
function fetch_published_version_tars() { function fetch_published_version_tars() {
local -r published_version="${1}" local -r published_version="${1}"
IFS='/' read -a varr <<< "${published_version}" IFS='/' read -a varr <<< "${published_version}"
bucket="${varr[0]}" path="${varr[0]}"
build_version=$(gsutil cat gs://${KUBE_GCS_RELEASE_BUCKET}/${published_version}.txt) if [[ "${path}" == "release" ]]; then
local -r bucket="${KUBE_GCS_RELEASE_BUCKET}"
else
local -r bucket="${KUBE_GCS_DEV_RELEASE_BUCKET}"
fi
build_version=$(gsutil cat "gs://${bucket}/${published_version}.txt")
echo "Using published version $bucket/$build_version (from ${published_version})" echo "Using published version $bucket/$build_version (from ${published_version})"
fetch_tars_from_gcs "${bucket}" "${build_version}" fetch_tars_from_gcs "gs://${bucket}/${path}" "${build_version}"
unpack_binaries unpack_binaries
# Set CLUSTER_API_VERSION for GKE CI # Set CLUSTER_API_VERSION for GKE CI
export CLUSTER_API_VERSION=$(echo ${build_version} | cut -c 2-) export CLUSTER_API_VERSION=$(echo ${build_version} | cut -c 2-)
...@@ -64,13 +70,10 @@ function clean_binaries() { ...@@ -64,13 +70,10 @@ function clean_binaries() {
} }
function fetch_tars_from_gcs() { function fetch_tars_from_gcs() {
local -r bucket="${1}" local -r gspath="${1}"
local -r build_version="${2}" local -r build_version="${2}"
echo "Pulling binaries from GCS; using server version ${bucket}/${build_version}." echo "Pulling binaries from GCS; using server version ${gspath}/${build_version}."
gsutil -mq cp \ gsutil -mq cp "${gspath}/${build_version}/kubernetes.tar.gz" "${gspath}/${build_version}/kubernetes-test.tar.gz" .
"gs://${KUBE_GCS_RELEASE_BUCKET}/${bucket}/${build_version}/kubernetes.tar.gz" \
"gs://${KUBE_GCS_RELEASE_BUCKET}/${bucket}/${build_version}/kubernetes-test.tar.gz" \
.
} }
function unpack_binaries() { function unpack_binaries() {
...@@ -190,7 +193,7 @@ function e2e_test() { ...@@ -190,7 +193,7 @@ function e2e_test() {
if [[ "${E2E_PUBLISH_GREEN_VERSION:-}" == "true" && ${exitcode} == 0 ]]; then if [[ "${E2E_PUBLISH_GREEN_VERSION:-}" == "true" && ${exitcode} == 0 ]]; then
# Use plaintext version file packaged with kubernetes.tar.gz # Use plaintext version file packaged with kubernetes.tar.gz
echo "Publish version to ci/latest-green.txt: $(cat version)" echo "Publish version to ci/latest-green.txt: $(cat version)"
gsutil cp ./version gs://kubernetes-release/ci/latest-green.txt gsutil cp ./version "gs://${KUBE_GCS_DEV_RELEASE_BUCKET}/ci/latest-green.txt"
fi fi
return ${exitcode} return ${exitcode}
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment