Skip to content

Commit

Permalink
Merge branch 'master' into oauth
Browse files Browse the repository at this point in the history
  • Loading branch information
mirandachrist authored Jun 20, 2019
2 parents f92fa2d + 294d73f commit d635a79
Show file tree
Hide file tree
Showing 163 changed files with 4,947 additions and 1,160 deletions.
2 changes: 1 addition & 1 deletion boskos/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ spec:
terminationGracePeriodSeconds: 30
containers:
- name: boskos
image: gcr.io/k8s-testimages/boskos:v20190614-260dce7
image: gcr.io/k8s-testimages/boskos:v20190618-b782256
args:
- --storage=/store/boskos.json
- --config=/etc/config/config
Expand Down
4 changes: 2 additions & 2 deletions boskos/janitor/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ spec:
terminationGracePeriodSeconds: 300
containers:
- name: boskos-janitor
image: gcr.io/k8s-testimages/janitor:v20190614-260dce7
image: gcr.io/k8s-testimages/janitor:v20190618-b782256
args:
- --boskos-url=http://boskos.test-pods.svc.cluster.local.
- --resource-type=gke-project
Expand Down Expand Up @@ -55,7 +55,7 @@ spec:
terminationGracePeriodSeconds: 300
containers:
- name: boskos-janitor-nongke
image: gcr.io/k8s-testimages/janitor:v20190614-260dce7
image: gcr.io/k8s-testimages/janitor:v20190618-b782256
args:
- --boskos-url=http://boskos.test-pods.svc.cluster.local.
- --resource-type=gce-project,gpu-project,ingress-project,istio-project,scalability-project
Expand Down
2 changes: 1 addition & 1 deletion boskos/metrics/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ spec:
terminationGracePeriodSeconds: 30
containers:
- name: metrics
image: gcr.io/k8s-testimages/metrics:v20190614-260dce7
image: gcr.io/k8s-testimages/metrics:v20190618-b782256
args:
- --resource-type=gce-project,gke-project,gpu-project,ingress-project,istio-project,scalability-project,aws-account
ports:
Expand Down
2 changes: 1 addition & 1 deletion boskos/reaper/deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ spec:
terminationGracePeriodSeconds: 30
containers:
- name: boskos-reaper
image: gcr.io/k8s-testimages/reaper:v20190614-260dce7
image: gcr.io/k8s-testimages/reaper:v20190618-b782256
args:
- --boskos-url=http://boskos.test-pods.svc.cluster.local.
- --resource-type=gce-project,gke-project,gpu-project,ingress-project,istio-project,scalability-project,aws-account
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ presubmits:
preset-service-account: "true"
spec:
containers:
- image: gcr.io/k8s-testimages/kubekins-e2e:v20190614-260dce7-master
- image: gcr.io/k8s-testimages/kubekins-e2e:v20190618-b782256-master
args:
- "--repo=github.com/GoogleCloudPlatform/$(REPO_NAME)=$(PULL_REFS)"
- "--root=/go/src"
Expand Down Expand Up @@ -43,7 +43,7 @@ postsubmits:
preset-dind-enabled: "true"
spec:
containers:
- image: gcr.io/k8s-testimages/kubekins-e2e:v20190614-260dce7-master
- image: gcr.io/k8s-testimages/kubekins-e2e:v20190618-b782256-master
args:
- "--repo=k8s.io/test-infra=master"
- "--root=/go/src/"
Expand All @@ -66,7 +66,7 @@ periodics:
preset-service-account: "true"
spec:
containers:
- image: gcr.io/k8s-testimages/kubekins-e2e:v20190614-260dce7-master
- image: gcr.io/k8s-testimages/kubekins-e2e:v20190618-b782256-master
args:
- --repo=github.com/GoogleCloudPlatform/k8s-multicluster-ingress=master
- --root=/go/src
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ periodics:
preset-dind-enabled: "true"
spec:
containers:
- image: gcr.io/k8s-testimages/kubekins-e2e:v20190614-260dce7-master
- image: gcr.io/k8s-testimages/kubekins-e2e:v20190618-b782256-master
args:
- "--job=$(JOB_NAME)"
- "--repo=github.com/apache-spark-on-k8s/spark-integration=master"
Expand Down Expand Up @@ -43,7 +43,7 @@ periodics:
preset-dind-enabled: "true"
spec:
containers:
- image: gcr.io/k8s-testimages/kubekins-e2e:v20190614-260dce7-master
- image: gcr.io/k8s-testimages/kubekins-e2e:v20190618-b782256-master
args:
- "--job=$(JOB_NAME)"
- "--repo=github.com/apache-spark-on-k8s/spark-integration=master"
Expand Down
4 changes: 2 additions & 2 deletions config/jobs/cadvisor/cadvisor.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ presubmits:
preset-k8s-ssh: "true"
spec:
containers:
- image: gcr.io/k8s-testimages/kubekins-e2e:v20190614-260dce7-master
- image: gcr.io/k8s-testimages/kubekins-e2e:v20190618-b782256-master
args:
- "--job=$(JOB_NAME)"
- "--repo=k8s.io/kubernetes"
Expand Down Expand Up @@ -75,7 +75,7 @@ periodics:
preset-k8s-ssh: "true"
spec:
containers:
- image: gcr.io/k8s-testimages/kubekins-e2e:v20190614-260dce7-master
- image: gcr.io/k8s-testimages/kubekins-e2e:v20190618-b782256-master
args:
- --job=$(JOB_NAME)
- --root=/go/src
Expand Down
12 changes: 6 additions & 6 deletions config/jobs/containerd/cri/containerd-cri-presubmit-jobs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ presubmits:
preset-service-account: "true"
spec:
containers:
- image: gcr.io/k8s-testimages/kubekins-e2e:v20190614-260dce7-master
- image: gcr.io/k8s-testimages/kubekins-e2e:v20190618-b782256-master
command:
- runner.sh
args:
Expand Down Expand Up @@ -40,7 +40,7 @@ presubmits:
spec:
containers:
- name: pull-cri-containerd-node-e2e
image: gcr.io/k8s-testimages/kubekins-e2e:v20190614-260dce7-master
image: gcr.io/k8s-testimages/kubekins-e2e:v20190618-b782256-master
command:
- sh
- -c
Expand Down Expand Up @@ -84,7 +84,7 @@ presubmits:
spec:
containers:
- name: pull-cri-containerd-node-e2e
image: gcr.io/k8s-testimages/kubekins-e2e:v20190614-260dce7-master
image: gcr.io/k8s-testimages/kubekins-e2e:v20190618-b782256-master
command:
- sh
- -c
Expand Down Expand Up @@ -128,7 +128,7 @@ presubmits:
spec:
containers:
- name: pull-cri-containerd-node-e2e
image: gcr.io/k8s-testimages/kubekins-e2e:v20190614-260dce7-master
image: gcr.io/k8s-testimages/kubekins-e2e:v20190618-b782256-master
command:
- sh
- -c
Expand Down Expand Up @@ -159,7 +159,7 @@ presubmits:
spec:
containers:
# Use go 1.10 for old branches, because gofmt result changed in go 1.11.
- image: gcr.io/k8s-testimages/kubekins-e2e:v20190614-260dce7-1.12
- image: gcr.io/k8s-testimages/kubekins-e2e:v20190618-b782256-1.12
args:
- "--repo=github.com/containerd/$(REPO_NAME)=$(PULL_REFS)"
- "--root=/go/src"
Expand All @@ -176,7 +176,7 @@ presubmits:
preset-service-account: "true"
spec:
containers:
- image: gcr.io/k8s-testimages/kubekins-e2e:v20190614-260dce7-master
- image: gcr.io/k8s-testimages/kubekins-e2e:v20190618-b782256-master
args:
- "--repo=github.com/containerd/$(REPO_NAME)=$(PULL_REFS)"
- "--root=/go/src"
Expand Down
28 changes: 14 additions & 14 deletions config/jobs/gke/containerd/gke-test-containerd.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ periodics:
- --check-leaked-resources
- --cluster=
- --deployment=gke
- --extract=ci/latest
- --extract=ci-cross/latest
- --gcp-cloud-sdk=gs://cloud-sdk-testing/ci/staging
- --gcp-node-image=cos_containerd
- --gcp-zone=us-central1-f
Expand All @@ -32,7 +32,7 @@ periodics:
- --provider=gke
- --test_args=--ginkgo.skip=\[Slow\]|\[Serial\]|\[Disruptive\]|\[Flaky\]|\[Feature:.+\] --minStartupPods=8
- --timeout=50m
image: gcr.io/k8s-testimages/kubekins-e2e:v20190614-260dce7-master
image: gcr.io/k8s-testimages/kubekins-e2e:v20190618-b782256-master

- interval: 1h
name: ci-kubernetes-e2e-cos-containerd-gke-k8sbeta-alpha-cluster
Expand Down Expand Up @@ -60,7 +60,7 @@ periodics:
- --provider=gke
- --test_args=--ginkgo.skip=\[Slow\]|\[Serial\]|\[Disruptive\]|\[Flaky\]|\[Feature:.+\] --minStartupPods=8
- --timeout=50m
image: gcr.io/k8s-testimages/kubekins-e2e:v20190614-260dce7-master
image: gcr.io/k8s-testimages/kubekins-e2e:v20190618-b782256-master

- interval: 1h
name: ci-kubernetes-e2e-cos-containerd-gke-k8sbeta-alpha-cluster-features
Expand All @@ -87,7 +87,7 @@ periodics:
- --provider=gke
- --test_args=--ginkgo.focus=\[Feature:(Audit|BlockVolume|PodPreset|ExpandPersistentVolumes|NodeLease)\]|Networking --ginkgo.skip=Networking-Performance|IPv6|Feature:Volumes --minStartupPods=8
- --timeout=180m
image: gcr.io/k8s-testimages/kubekins-e2e:v20190614-260dce7-master
image: gcr.io/k8s-testimages/kubekins-e2e:v20190618-b782256-master

- interval: 1h
name: ci-kubernetes-e2e-cos-containerd-gke-k8sbeta
Expand Down Expand Up @@ -115,7 +115,7 @@ periodics:
- --provider=gke
- --test_args=--ginkgo.skip=\[Slow\]|\[Serial\]|\[Disruptive\]|\[Flaky\]|\[Feature:.+\] --minStartupPods=8
- --timeout=50m
image: gcr.io/k8s-testimages/kubekins-e2e:v20190614-260dce7-master
image: gcr.io/k8s-testimages/kubekins-e2e:v20190618-b782256-master

- interval: 1h
name: ci-kubernetes-e2e-cos-containerd-gke-k8sstable1
Expand Down Expand Up @@ -143,7 +143,7 @@ periodics:
- --provider=gke
- --test_args=--ginkgo.skip=\[Slow\]|\[Serial\]|\[Disruptive\]|\[Flaky\]|\[Feature:.+\] --minStartupPods=8
- --timeout=50m
image: gcr.io/k8s-testimages/kubekins-e2e:v20190614-260dce7-master
image: gcr.io/k8s-testimages/kubekins-e2e:v20190618-b782256-master

- interval: 1h
name: ci-kubernetes-e2e-cos-containerd-gke-k8sstable1-alpha-cluster
Expand Down Expand Up @@ -171,7 +171,7 @@ periodics:
- --provider=gke
- --test_args=--ginkgo.skip=\[Slow\]|\[Serial\]|\[Disruptive\]|\[Flaky\]|\[Feature:.+\] --minStartupPods=8
- --timeout=50m
image: gcr.io/k8s-testimages/kubekins-e2e:v20190614-260dce7-master
image: gcr.io/k8s-testimages/kubekins-e2e:v20190618-b782256-master

- interval: 1h
name: ci-kubernetes-e2e-cos-containerd-gke-k8sstable1-alpha-cluster-features
Expand Down Expand Up @@ -199,7 +199,7 @@ periodics:
- --provider=gke
- --test_args=--ginkgo.focus=\[Feature:(Audit|BlockVolume|PodPreset|ExpandPersistentVolumes)\]|Networking --ginkgo.skip=Networking-Performance|IPv6|Feature:Volumes --minStartupPods=8
- --timeout=180m
image: gcr.io/k8s-testimages/kubekins-e2e:v20190614-260dce7-master
image: gcr.io/k8s-testimages/kubekins-e2e:v20190618-b782256-master

- interval: 1h
name: ci-kubernetes-e2e-cos-gke-k8sbeta-alpha-cluster
Expand All @@ -226,7 +226,7 @@ periodics:
- --provider=gke
- --test_args=--ginkgo.skip=\[Slow\]|\[Serial\]|\[Disruptive\]|\[Flaky\]|\[Feature:.+\] --minStartupPods=8
- --timeout=50m
image: gcr.io/k8s-testimages/kubekins-e2e:v20190614-260dce7-master
image: gcr.io/k8s-testimages/kubekins-e2e:v20190618-b782256-master

- interval: 1h
name: ci-kubernetes-e2e-cos-gke-k8sbeta-alpha-cluster-features
Expand All @@ -252,7 +252,7 @@ periodics:
- --provider=gke
- --test_args=--ginkgo.focus=\[Feature:(Audit|BlockVolume|PodPreset|ExpandPersistentVolumes|NodeLease)\]|Networking --ginkgo.skip=Networking-Performance|IPv6|Feature:Volumes --minStartupPods=8
- --timeout=180m
image: gcr.io/k8s-testimages/kubekins-e2e:v20190614-260dce7-master
image: gcr.io/k8s-testimages/kubekins-e2e:v20190618-b782256-master

- interval: 1h
name: ci-kubernetes-e2e-cos-gke-k8sstable1-alpha-cluster
Expand All @@ -279,7 +279,7 @@ periodics:
- --provider=gke
- --test_args=--ginkgo.skip=\[Slow\]|\[Serial\]|\[Disruptive\]|\[Flaky\]|\[Feature:.+\] --minStartupPods=8
- --timeout=50m
image: gcr.io/k8s-testimages/kubekins-e2e:v20190614-260dce7-master
image: gcr.io/k8s-testimages/kubekins-e2e:v20190618-b782256-master

- interval: 1h
name: ci-kubernetes-e2e-cos-gke-k8sstable1-alpha-cluster-features
Expand All @@ -306,7 +306,7 @@ periodics:
- --provider=gke
- --test_args=--ginkgo.focus=\[Feature:(Audit|BlockVolume|PodPreset|ExpandPersistentVolumes)\]|Networking --ginkgo.skip=Networking-Performance|IPv6|Feature:Volumes --minStartupPods=8
- --timeout=180m
image: gcr.io/k8s-testimages/kubekins-e2e:v20190614-260dce7-master
image: gcr.io/k8s-testimages/kubekins-e2e:v20190618-b782256-master

- interval: 12h
name: ci-kubernetes-soak-gke-cos-containerd
Expand All @@ -325,7 +325,7 @@ periodics:
- --cluster=
- --deployment=gke
- --down=false
- --extract=ci/latest
- --extract=ci-cross/latest
- --gcp-cloud-sdk=gs://cloud-sdk-testing/ci/staging
- --gcp-node-image=cos_containerd
- --gcp-project=k8s-jkns-e2e-gci-gke-staging
Expand All @@ -338,4 +338,4 @@ periodics:
- --test_args=--ginkgo.skip=\[Slow\]|\[Serial\]|\[Disruptive\]|\[Flaky\]|\[Feature:.+\] --clean-start=true --minStartupPods=8
- --timeout=800m
- --up=false
image: gcr.io/k8s-testimages/kubekins-e2e:v20190614-260dce7-master
image: gcr.io/k8s-testimages/kubekins-e2e:v20190618-b782256-master
4 changes: 2 additions & 2 deletions config/jobs/helm/charts/charts.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ presubmits:
preset-dind-enabled: "true"
spec:
containers:
- image: gcr.io/k8s-testimages/kubekins-e2e:v20190614-260dce7-master
- image: gcr.io/k8s-testimages/kubekins-e2e:v20190618-b782256-master
args:
- "--repo=github.com/helm/charts=$(PULL_REFS)"
- "--root=/go/src/"
Expand Down Expand Up @@ -44,4 +44,4 @@ periodics:
- --provider=gce
- --test=false
- --timeout=180m
image: gcr.io/k8s-testimages/kubekins-e2e:v20190614-260dce7-master
image: gcr.io/k8s-testimages/kubekins-e2e:v20190618-b782256-master
2 changes: 1 addition & 1 deletion config/jobs/kubeflow/kubeflow-postsubmits.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,7 @@ postsubmits:
preset-service-account: "true"
spec:
containers:
- image: gcr.io/k8s-testimages/kubekins-e2e:v20190614-260dce7-master
- image: gcr.io/k8s-testimages/kubekins-e2e:v20190618-b782256-master
command:
- ./test/postsubmit-tests-with-pipeline-deployment.sh
args:
Expand Down
9 changes: 4 additions & 5 deletions config/jobs/kubeflow/kubeflow-presubmits.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ presubmits:
preset-service-account: "true"
spec:
containers:
- image: gcr.io/k8s-testimages/kubekins-e2e:v20190614-260dce7-master
- image: gcr.io/k8s-testimages/kubekins-e2e:v20190618-b782256-master
command:
- ./test/presubmit-tests-with-pipeline-deployment.sh
args:
Expand All @@ -266,12 +266,11 @@ presubmits:
- name: kubeflow-pipeline-sample-test
always_run: true
decorate: true
skip_report: true
labels:
preset-service-account: "true"
spec:
containers:
- image: gcr.io/k8s-testimages/kubekins-e2e:v20190614-260dce7-master
- image: gcr.io/k8s-testimages/kubekins-e2e:v20190618-b782256-master
command:
- ./test/presubmit-tests-with-pipeline-deployment.sh
args:
Expand All @@ -289,7 +288,7 @@ presubmits:
preset-service-account: "true"
spec:
containers:
- image: gcr.io/k8s-testimages/kubekins-e2e:v20190614-260dce7-master
- image: gcr.io/k8s-testimages/kubekins-e2e:v20190618-b782256-master
command:
- ./test/upgrade-tests.sh
args:
Expand All @@ -303,7 +302,7 @@ presubmits:
# preset-service-account: "true"
# spec:
# containers:
# - image: gcr.io/k8s-testimages/kubekins-e2e:v20190614-260dce7-master
# - image: gcr.io/k8s-testimages/kubekins-e2e:v20190618-b782256-master
# command:
# - ./test/presubmit-tests-gce-minikube.sh
# args:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ presubmits:
spec:
containers:
# We need this image because it has Docker in Docker and go.
- image: gcr.io/k8s-testimages/kubekins-e2e:v20190614-260dce7-master
- image: gcr.io/k8s-testimages/kubekins-e2e:v20190618-b782256-master
command:
- runner.sh
args:
Expand Down
Loading

0 comments on commit d635a79

Please sign in to comment.