Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use gs://k8s-release-dev for kubernetes CI builds #22840

Merged
merged 7 commits into from
Jul 9, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions config/jobs/kubernetes/kops/helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@ def k8s_version_info(k8s_version):
k8s_deploy_url = "https://storage.googleapis.com/kubernetes-release/release/latest.txt"
elif k8s_version == 'ci':
marker = 'latest.txt'
k8s_deploy_url = "https://storage.googleapis.com/kubernetes-release-dev/ci/latest.txt"
test_package_bucket = 'kubernetes-release-dev'
k8s_deploy_url = "https://storage.googleapis.com/k8s-release-dev/ci/latest.txt"
test_package_bucket = 'k8s-release-dev'
test_package_dir = 'ci'
elif k8s_version == 'stable':
marker = 'stable.txt'
Expand Down
4 changes: 2 additions & 2 deletions config/jobs/kubernetes/kops/kops-periodics-gce.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -95,12 +95,12 @@ periodics:
--create-args="--channel=alpha" \
--env=KOPS_FEATURE_FLAGS=GoogleCloudBucketACL \
--kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
--kubernetes-version=https://storage.googleapis.com/kubernetes-release-dev/ci/latest.txt \
--kubernetes-version=https://storage.googleapis.com/k8s-release-dev/ci/latest.txt \
--test=kops \
-- \
--ginkgo-args="--debug" \
--test-args="-test.timeout=60m -num-nodes=0" \
--test-package-bucket=kubernetes-release-dev \
--test-package-bucket=k8s-release-dev \
--test-package-dir=ci \
--test-package-marker=latest.txt \
--parallel=25 \
Expand Down
24 changes: 12 additions & 12 deletions config/jobs/kubernetes/kops/kops-periodics-misc2.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -98,12 +98,12 @@ periodics:
--create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210621' --channel=alpha --networking=calico --container-runtime=containerd --ipv6 --api-loadbalancer-type=public --api-loadbalancer-class=network --set=cluster.spec.api.loadBalancer.useForInternalApi=true --set=cluster.spec.cloudControllerManager.cloudProvider=aws --set=cluster.spec.cloudControllerManager.image=hakman/cloud-controller-manager:ipv6-1 --set=cluster.spec.nonMasqueradeCIDR=fd00:10:96::/64 --set=cluster.spec.kubeDNS.upstreamNameservers=2620:119:35::35 --set=cluster.spec.kubeDNS.upstreamNameservers=2620:119:53::53" \
--env=KOPS_FEATURE_FLAGS=AWSIPv6 \
--kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
--kubernetes-version=https://storage.googleapis.com/kubernetes-release-dev/ci/latest.txt \
--kubernetes-version=https://storage.googleapis.com/k8s-release-dev/ci/latest.txt \
--test=kops \
-- \
--ginkgo-args="--debug" \
--test-args="-test.timeout=60m -num-nodes=0" \
--test-package-bucket=kubernetes-release-dev \
--test-package-bucket=k8s-release-dev \
--test-package-dir=ci \
--test-package-marker=latest.txt \
--focus-regex="\[Conformance\]|\[NodeConformance\]" \
Expand Down Expand Up @@ -167,12 +167,12 @@ periodics:
--create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210621' --channel=alpha --networking=calico --container-runtime=containerd --ipv6 --api-loadbalancer-type=public --api-loadbalancer-class=network --set=cluster.spec.api.loadBalancer.useForInternalApi=true --set=cluster.spec.cloudControllerManager.cloudProvider=aws --set=cluster.spec.cloudControllerManager.image=hakman/cloud-controller-manager:ipv6-1 --set=cluster.spec.nonMasqueradeCIDR=fd00:10:96::/64 --set=cluster.spec.kubeDNS.upstreamNameservers=2620:119:35::35 --set=cluster.spec.kubeDNS.upstreamNameservers=2620:119:53::53" \
--env=KOPS_FEATURE_FLAGS=AWSIPv6,UseServiceAccountIAM \
--kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
--kubernetes-version=https://storage.googleapis.com/kubernetes-release-dev/ci/latest.txt \
--kubernetes-version=https://storage.googleapis.com/k8s-release-dev/ci/latest.txt \
--test=kops \
-- \
--ginkgo-args="--debug" \
--test-args="-test.timeout=60m -num-nodes=0" \
--test-package-bucket=kubernetes-release-dev \
--test-package-bucket=k8s-release-dev \
--test-package-dir=ci \
--test-package-marker=latest.txt \
--parallel=25
Expand Down Expand Up @@ -235,12 +235,12 @@ periodics:
--create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210621' --channel=alpha --networking=cilium --container-runtime=containerd --ipv6 --api-loadbalancer-type=public --api-loadbalancer-class=network --set=cluster.spec.api.loadBalancer.useForInternalApi=true --set=cluster.spec.cloudControllerManager.cloudProvider=aws --set=cluster.spec.cloudControllerManager.image=hakman/cloud-controller-manager:ipv6-1 --set=cluster.spec.nonMasqueradeCIDR=fd00:10:96::/64 --set=cluster.spec.kubeDNS.upstreamNameservers=2620:119:35::35 --set=cluster.spec.kubeDNS.upstreamNameservers=2620:119:53::53" \
--env=KOPS_FEATURE_FLAGS=AWSIPv6 \
--kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
--kubernetes-version=https://storage.googleapis.com/kubernetes-release-dev/ci/latest.txt \
--kubernetes-version=https://storage.googleapis.com/k8s-release-dev/ci/latest.txt \
--test=kops \
-- \
--ginkgo-args="--debug" \
--test-args="-test.timeout=60m -num-nodes=0" \
--test-package-bucket=kubernetes-release-dev \
--test-package-bucket=k8s-release-dev \
--test-package-dir=ci \
--test-package-marker=latest.txt \
--parallel=25
Expand Down Expand Up @@ -754,12 +754,12 @@ periodics:
--cloud-provider=aws \
--create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-arm64-server-20210622' --channel=alpha --networking=calico --container-runtime=containerd --zones=eu-central-1a --node-size=m6g.large --master-size=m6g.large" \
--kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
--kubernetes-version=https://storage.googleapis.com/kubernetes-release-dev/ci/latest.txt \
--kubernetes-version=https://storage.googleapis.com/k8s-release-dev/ci/latest.txt \
--test=kops \
-- \
--ginkgo-args="--debug" \
--test-args="-test.timeout=60m -num-nodes=0" \
--test-package-bucket=kubernetes-release-dev \
--test-package-bucket=k8s-release-dev \
--test-package-dir=ci \
--test-package-marker=latest.txt \
--parallel=25
Expand Down Expand Up @@ -820,12 +820,12 @@ periodics:
--cloud-provider=aws \
--create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-arm64-server-20210622' --channel=alpha --networking=calico --container-runtime=containerd --zones=eu-central-1a --node-size=m6g.large --master-size=m6g.large" \
--kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
--kubernetes-version=https://storage.googleapis.com/kubernetes-release-dev/ci/latest.txt \
--kubernetes-version=https://storage.googleapis.com/k8s-release-dev/ci/latest.txt \
--test=kops \
-- \
--ginkgo-args="--debug" \
--test-args="-test.timeout=60m -num-nodes=0" \
--test-package-bucket=kubernetes-release-dev \
--test-package-bucket=k8s-release-dev \
--test-package-dir=ci \
--test-package-marker=latest.txt \
--focus-regex="\[Conformance\]|\[NodeConformance\]" \
Expand Down Expand Up @@ -888,12 +888,12 @@ periodics:
--cloud-provider=aws \
--create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210621' --channel=alpha --networking=kubenet --container-runtime=containerd --node-size=c5.large --master-size=c5.large" \
--kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
--kubernetes-version=https://storage.googleapis.com/kubernetes-release-dev/ci/latest.txt \
--kubernetes-version=https://storage.googleapis.com/k8s-release-dev/ci/latest.txt \
--test=kops \
-- \
--ginkgo-args="--debug" \
--test-args="-test.timeout=60m -num-nodes=0" \
--test-package-bucket=kubernetes-release-dev \
--test-package-bucket=k8s-release-dev \
--test-package-dir=ci \
--test-package-marker=latest.txt \
--focus-regex="\[Conformance\]|\[NodeConformance\]" \
Expand Down
4 changes: 2 additions & 2 deletions config/jobs/kubernetes/kops/kops-periodics-versions.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,12 +34,12 @@ periodics:
--create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210621' --channel=alpha --networking=calico --container-runtime=containerd" \
--kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
--publish-version-marker=gs://kops-ci/bin/latest-ci-green.txt \
--kubernetes-version=https://storage.googleapis.com/kubernetes-release-dev/ci/latest.txt \
--kubernetes-version=https://storage.googleapis.com/k8s-release-dev/ci/latest.txt \
--test=kops \
-- \
--ginkgo-args="--debug" \
--test-args="-test.timeout=60m -num-nodes=0" \
--test-package-bucket=kubernetes-release-dev \
--test-package-bucket=k8s-release-dev \
--test-package-dir=ci \
--test-package-marker=latest.txt \
--parallel=25
Expand Down
12 changes: 6 additions & 6 deletions config/jobs/kubernetes/kops/kops-presubmits-e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,13 @@ presubmits:
--up --build --down \
--cloud-provider=aws \
--create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210621' --channel=alpha --networking=calico --container-runtime=containerd" \
--kubernetes-version=https://storage.googleapis.com/kubernetes-release-dev/ci/latest.txt \
--kubernetes-version=https://storage.googleapis.com/k8s-release-dev/ci/latest.txt \
--kops-binary-path=/home/prow/go/src/k8s.io/kops/bazel-bin/cmd/kops/linux-amd64/kops \
--test=kops \
-- \
--ginkgo-args="--debug" \
--test-args="-test.timeout=60m -num-nodes=0" \
--test-package-bucket=kubernetes-release-dev \
--test-package-bucket=k8s-release-dev \
--test-package-dir=ci \
--test-package-marker=latest.txt \
--focus-regex="\[Conformance\]|\[NodeConformance\]" \
Expand Down Expand Up @@ -104,13 +104,13 @@ presubmits:
--up --build --down \
--cloud-provider=aws \
--create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210621' --channel=alpha --networking=calico --container-runtime=containerd --master-count=3 --node-count=6 --zones=eu-central-1a,eu-central-1b,eu-central-1c" \
--kubernetes-version=https://storage.googleapis.com/kubernetes-release-dev/ci/latest.txt \
--kubernetes-version=https://storage.googleapis.com/k8s-release-dev/ci/latest.txt \
--kops-binary-path=/home/prow/go/src/k8s.io/kops/bazel-bin/cmd/kops/linux-amd64/kops \
--test=kops \
-- \
--ginkgo-args="--debug" \
--test-args="-test.timeout=60m -num-nodes=0" \
--test-package-bucket=kubernetes-release-dev \
--test-package-bucket=k8s-release-dev \
--test-package-dir=ci \
--test-package-marker=latest.txt \
--focus-regex="\[Conformance\]|\[NodeConformance\]" \
Expand Down Expand Up @@ -635,13 +635,13 @@ presubmits:
--cloud-provider=aws \
--create-args="--image='099720109477/ubuntu/images/hvm-ssd/ubuntu-focal-20.04-amd64-server-20210621' --channel=alpha --networking=calico --container-runtime=containerd --ipv6 --api-loadbalancer-type=public --api-loadbalancer-class=network --set=cluster.spec.api.loadBalancer.useForInternalApi=true --set=cluster.spec.cloudControllerManager.cloudProvider=aws --set=cluster.spec.cloudControllerManager.image=hakman/cloud-controller-manager:ipv6-1 --set=cluster.spec.nonMasqueradeCIDR=fd00:10:96::/64 --set=cluster.spec.kubeDNS.upstreamNameservers=2620:119:35::35 --set=cluster.spec.kubeDNS.upstreamNameservers=2620:119:53::53" \
--env=KOPS_FEATURE_FLAGS=AWSIPv6 \
--kubernetes-version=https://storage.googleapis.com/kubernetes-release-dev/ci/latest.txt \
--kubernetes-version=https://storage.googleapis.com/k8s-release-dev/ci/latest.txt \
--kops-binary-path=/home/prow/go/src/k8s.io/kops/bazel-bin/cmd/kops/linux-amd64/kops \
--test=kops \
-- \
--ginkgo-args="--debug" \
--test-args="-test.timeout=60m -num-nodes=0" \
--test-package-bucket=kubernetes-release-dev \
--test-package-bucket=k8s-release-dev \
--test-package-dir=ci \
--test-package-marker=latest.txt \
--focus-regex="\[Conformance\]|\[NodeConformance\]" \
Expand Down
2 changes: 1 addition & 1 deletion config/jobs/kubernetes/kops/kops-presubmits.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -479,7 +479,7 @@ postsubmits:
args:
- "make"
- "prow-postsubmit"
- "UPLOAD_DEST=gs://kubernetes-release-dev/kops/ci"
- "UPLOAD_DEST=gs://k8s-release-dev/kops/ci"
resources:
requests:
memory: "2Gi"
Expand Down
1 change: 1 addition & 0 deletions config/jobs/kubernetes/sig-release/kubernetes-builds.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ periodics:
- --root=/go/src
- --timeout=240
- --scenario=kubernetes_build
- --release=kubernetes-release-dev
- --
- --allow-dup
- --extra-version-markers=k8s-master
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,7 @@ periodics:
- --root=/go/src
- --timeout=240
- --scenario=kubernetes_build
- --release=kubernetes-release-dev
- --
- --allow-dup
- --extra-version-markers=k8s-stable3
Expand Down Expand Up @@ -411,7 +412,7 @@ periodics:
--config=ci \
"--build=//... -//vendor/..." \
--release=//build/release-tars \
--gcs=gs://kubernetes-release-dev/ci-periodic \
--gcs=gs://k8s-release-dev/ci-periodic \
--version-suffix=-bazel
command:
- bash
Expand Down Expand Up @@ -711,7 +712,7 @@ postsubmits:
- --
- --build=//... -//vendor/...
- --release=//build/release-tars
- --gcs=gs://kubernetes-release-dev/ci
- --gcs=gs://k8s-release-dev/ci
- --version-suffix=-bazel
image: gcr.io/k8s-testimages/kubekins-e2e:v20210707-0f9c540-1.19
name: ""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,7 @@ periodics:
- --root=/go/src
- --timeout=240
- --scenario=kubernetes_build
- --release=kubernetes-release-dev
- --
- --allow-dup
- --extra-version-markers=k8s-stable2
Expand Down Expand Up @@ -408,7 +409,7 @@ periodics:
--config=ci \
"--build=//... -//vendor/..." \
--release=//build/release-tars \
--gcs=gs://kubernetes-release-dev/ci-periodic \
--gcs=gs://k8s-release-dev/ci-periodic \
--version-suffix=-bazel
command:
- bash
Expand Down Expand Up @@ -710,7 +711,7 @@ postsubmits:
- --
- --build=//... -//vendor/...
- --release=//build/release-tars
- --gcs=gs://kubernetes-release-dev/ci
- --gcs=gs://k8s-release-dev/ci
- --version-suffix=-bazel
image: gcr.io/k8s-testimages/kubekins-e2e:v20210707-0f9c540-1.20
name: ""
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,7 @@ periodics:
- --root=/go/src
- --timeout=240
- --scenario=kubernetes_build
- --release=kubernetes-release-dev
- --
- --allow-dup
- --extra-version-markers=k8s-stable1
Expand Down
4 changes: 2 additions & 2 deletions config/jobs/kubernetes/sig-testing/coverage.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ periodics:
--build=quick \
--dump-before-and-after \
--extract=local \
--stage=gs://kubernetes-release-dev/ci/ci-kubernetes-conformance-coverage \
--stage=gs://k8s-release-dev/ci/ci-kubernetes-conformance-coverage \
--gcp-zone=us-west1-b \
--provider=gce \
--timeout=300m \
Expand Down Expand Up @@ -98,7 +98,7 @@ periodics:
--build=quick \
--dump-before-and-after \
--extract=local \
--stage=gs://kubernetes-release-dev/ci/ci-kubernetes-coverage-e2e-gci-gce \
--stage=gs://k8s-release-dev/ci/ci-kubernetes-coverage-e2e-gci-gce \
--gcp-master-image=gci \
--gcp-node-image=gci \
--gcp-nodes=4 \
Expand Down
2 changes: 1 addition & 1 deletion config/tests/jobs/jobs_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1133,7 +1133,7 @@ func TestKubernetesE2eJobsMustExtractFromK8sInfraBuckets(t *testing.T) {
needsFix := false
extracts := []string{}
const (
defaultCIBucket = "kubernetes-release-dev" // ensure this matches kubetest --extract-ci-bucket default
defaultCIBucket = "k8s-release-dev" // ensure this matches kubetest --extract-ci-bucket default
expectedCIBucket = "k8s-release-dev"
defaultReleaseBucket = "kubernetes-release" // ensure this matches kubetest --extract-release-bucket default
expectedReleaseBucket = "k8s-release"
Expand Down
4 changes: 2 additions & 2 deletions images/kubekins-e2e/kops-e2e-runner.sh
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,13 @@ e2e_args=( \
# TODO(zmerlynn): This is duplicating some logic in e2e-runner.sh, but
# I'd rather keep it isolated for now.
if [[ "${KOPS_DEPLOY_LATEST_KUBE:-}" =~ ^[yY]$ ]]; then
readonly KOPS_KUBE_LATEST_URL=${KOPS_DEPLOY_LATEST_URL:-"https://storage.googleapis.com/kubernetes-release-dev/ci/latest.txt"}
readonly KOPS_KUBE_LATEST_URL=${KOPS_DEPLOY_LATEST_URL:-"https://storage.googleapis.com/k8s-release-dev/ci/latest.txt"}
readonly KOPS_KUBE_LATEST=$(curl -fsS --retry 3 "${KOPS_KUBE_LATEST_URL}")
if [[ -z "${KOPS_KUBE_LATEST}" ]]; then
echo "Can't fetch kube latest URL" >&2
exit 1
fi
readonly KOPS_KUBE_RELEASE_URL=${KOPS_KUBE_RELEASE_URL:-"https://storage.googleapis.com/kubernetes-release-dev/ci"}
readonly KOPS_KUBE_RELEASE_URL=${KOPS_KUBE_RELEASE_URL:-"https://storage.googleapis.com/k8s-release-dev/ci"}

e2e_args+=(--kops-kubernetes-version="${KOPS_KUBE_RELEASE_URL}/${KOPS_KUBE_LATEST}")
fi
Expand Down
4 changes: 2 additions & 2 deletions kubetest/extract_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -155,8 +155,8 @@ func TestExtractStrategies(t *testing.T) {
"bazel/49747/master:b341939d6d3666b119028400a4311cc66da9a542,49747:c4656c3d029e47d03b3d7d9915d79cab72a80852",
},
{
"gs://kubernetes-release-dev/bazel/v1.8.0-alpha.3.389+eab2f8f6c19fcb",
"https://storage.googleapis.com/kubernetes-release-dev/bazel",
"gs://k8s-release-dev/bazel/v1.8.0-alpha.3.389+eab2f8f6c19fcb",
"https://storage.googleapis.com/k8s-release-dev/bazel",
"v1.8.0-alpha.3.389+eab2f8f6c19fcb",
},
{
Expand Down
2 changes: 1 addition & 1 deletion kubetest/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ func defineFlags() *options {
flag.StringVar(&o.dump, "dump", "", "If set, dump bring-up and cluster logs to this location on test or cluster-up failure")
flag.StringVar(&o.dumpPreTestLogs, "dump-pre-test-logs", "", "If set, dump cluster logs to this location before running tests")
flag.Var(&o.extract, "extract", "Extract k8s binaries from the specified release location")
flag.StringVar(&o.extractCIBucket, "extract-ci-bucket", "kubernetes-release-dev", "Extract k8s CI binaries from the specified GCS bucket")
flag.StringVar(&o.extractCIBucket, "extract-ci-bucket", "k8s-release-dev", "Extract k8s CI binaries from the specified GCS bucket")
flag.StringVar(&o.extractReleaseBucket, "extract-release-bucket", "kubernetes-release", "Extract k8s release binaries from the specified GCS bucket")
flag.BoolVar(&o.extractSource, "extract-source", false, "Extract k8s src together with other tarballs")
flag.BoolVar(&o.flushMemAfterBuild, "flush-mem-after-build", false, "If true, try to flush container memory after building")
Expand Down
2 changes: 1 addition & 1 deletion scenarios/kubernetes_bazel.py
Original file line number Diff line number Diff line change
Expand Up @@ -272,7 +272,7 @@ def create_parser():
'--test-args', action="append", help='Bazel test args')
parser.add_argument(
'--gcs',
default='gs://kubernetes-release-dev/bazel',
default='gs://k8s-release-dev/bazel',
help='GCS path for where to push build')
parser.add_argument(
'--version-suffix',
Expand Down
2 changes: 1 addition & 1 deletion scenarios/kubernetes_build.py
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ def check_build_exists(gcs, suffix, fast):

if version:
if not gcs:
gcs = 'kubernetes-release-dev'
gcs = 'k8s-release-dev'
gcs = 'gs://' + gcs
mode = 'ci'
if fast:
Expand Down