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

config/prow/cluster: remove gke-project boskos pool #23880

Merged
merged 2 commits into from
Oct 4, 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
29 changes: 0 additions & 29 deletions config/prow/cluster/boskos-janitor.yaml
Original file line number Diff line number Diff line change
@@ -1,34 +1,5 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: boskos-janitor
labels:
app: boskos-janitor
namespace: test-pods
spec:
replicas: 4 # 4 distributed janitor instances for gke
selector:
matchLabels:
app: boskos-janitor
template:
metadata:
labels:
app: boskos-janitor
spec:
terminationGracePeriodSeconds: 300
serviceAccountName: boskos-janitor
containers:
- name: boskos-janitor
image: gcr.io/k8s-staging-boskos/janitor:v20210929-121128f
args:
- --boskos-url=http://boskos.test-pods.svc.cluster.local.
- --resource-type=gke-project
- --pool-size=20
- --
- --hours=0
---
apiVersion: apps/v1
kind: Deployment
metadata:
name: boskos-janitor-nongke
labels:
Expand Down
2 changes: 1 addition & 1 deletion config/prow/cluster/boskos-reaper_deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@ spec:
image: gcr.io/k8s-staging-boskos/reaper:v20210929-121128f
args:
- --boskos-url=http://boskos.test-pods.svc.cluster.local.
- --resource-type=gce-project,gke-project,gpu-project,ingress-project,istio-project,scalability-presubmit-project,scalability-project,aws-account,node-e2e-project
- --resource-type=gce-project,gpu-project,ingress-project,istio-project,scalability-presubmit-project,scalability-project,aws-account,node-e2e-project
10 changes: 0 additions & 10 deletions config/prow/cluster/boskos-resources.yaml
Original file line number Diff line number Diff line change
@@ -1,14 +1,4 @@
resources:
- names:
- e2e-gke-gci-ci-master
- kubernetes-e2e-gci-gke-updown
- kubernetes-e2e-gke-updown
- kubernetes-gci-gke-ingress
- kubernetes-gci-gke-ingress-1-2
- kubernetes-gci-gke-ingress-1-3
- kubernetes-gke-ingress
state: dirty
type: gke-project
- names:
- ci-k8s-e2e-gci-tip-gce
- ci-kubernetes-e2e-gke-gpu
Expand Down
1 change: 0 additions & 1 deletion config/prow/cluster/monitoring/mixins/lib/config.libsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ local config = {
{instance: "104.197.27.114:9090", job: "k8s-prow-builds-new-boskos", type: "aws-account", friendly: "AWS account"},
{instance: "104.197.27.114:9090", job: "k8s-prow-builds-new-boskos", type: "gce-project", friendly: "GCE project"},
{instance: "35.225.208.117:9090", job: "k8s-infra-prow-builds-boskos", type: "gce-project", friendly: "GCE project (k8s-infra)"},
{instance: "104.197.27.114:9090", job: "k8s-prow-builds-new-boskos", type: "gke-project", friendly: "GKE project"},
{instance: "104.197.27.114:9090", job: "k8s-prow-builds-new-boskos", type: "gpu-project", friendly: "GPU project"},
{instance: "35.225.208.117:9090", job: "k8s-infra-prow-builds-boskos", type: "gpu-project", friendly: "GPU project (k8s-infra)"},
{instance: "104.197.27.114:9090", job: "k8s-prow-builds-new-boskos", type: "ingress-project", friendly: "Ingress project"},
Expand Down
8 changes: 0 additions & 8 deletions releng/test_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -204,14 +204,6 @@ cloudProviders:
- --check-leaked-resources
- --provider=gce
- --gcp-zone=us-west1-b
gke:
args:
- --check-leaked-resources
- --provider=gke
- --deployment=gke
- --gcp-zone=us-west1-c
- --gcp-cloud-sdk=gs://cloud-sdk-testing/ci/staging
- --gke-environment=test

images:
cos1:
Expand Down