Skip to content

Commit 0755c66

Browse files
vishnuswmechvishnuswmech
committed
33354 - Remove Gubernator IDLE DNS entries
1 parent 5c3f7ca commit 0755c66

File tree

6 files changed

+2
-95
lines changed

6 files changed

+2
-95
lines changed

‎apps/k8s-io/configmap-nginx.yaml

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -192,8 +192,6 @@ data:
192192
193193
# This is really not ideal, but there's no obvious way to browse GCS that handles directories and files.
194194
rewrite ^/$ https://console.developers.google.com/storage/browser/kubernetes-jenkins/logs redirect;
195-
# Things that look like builds should be viewed on Gubernator
196-
rewrite ^/(.*/\d+)/?$ https://k8s-gubernator.appspot.com/build/kubernetes-jenkins/logs/$1 redirect;
197195
rewrite ^/(.*)/$ https://console.developers.google.com/storage/browser/kubernetes-jenkins/logs/$1 redirect;
198196
rewrite ^/(.*)$ https://storage.cloud.google.com/kubernetes-jenkins/logs/$1 redirect;
199197
}
@@ -303,7 +301,6 @@ data:
303301
rewrite ^/owners$ https://www.kubernetes.dev/docs/guide/owners/ redirect;
304302
rewrite ^/owners/([^/]*)/?$ https://cs.k8s.io/?q=$1&i=fosho&files=OWNERS&excludeFiles=vendor%2F&repos= redirect;
305303
rewrite ^/partner-request$ https://docs.google.com/forms/d/e/1FAIpQLSdN1KtSKX2VAOPGABFlShkSd6CajQynoL4QCVtY0dj76MNDKg/viewform redirect;
306-
rewrite ^/pr-dashboard$ https://gubernator.k8s.io/pr redirect;
307304
rewrite ^/redirects$ https://github.com/kubernetes/k8s.io/tree/main/apps/k8s-io/README.md#redirections redirect;
308305
rewrite ^/start$ https://kubernetes.io/docs/setup/ redirect;
309306
rewrite ^/stuck-prs$ https://github.com/kubernetes/kubernetes/pulls?utf8=%E2%9C%93&q=is%3Apr%20is%3Aopen%20label%3Algtm%20label%3Aapproved%20-label%3Ado-not-merge%20-label%3Aneeds-rebase%20sort%3Aupdated-asc%20-status%3Asuccess redirect;
@@ -340,14 +337,6 @@ data:
340337
rewrite ^/(.*)$ https://github.com/kubernetes/kubernetes/pull/$1 redirect;
341338
}
342339
}
343-
server {
344-
server_name pr-test.kubernetes.io pr-test.k8s.io;
345-
listen 80;
346-
347-
rewrite ^/$ https://gubernator.k8s.io redirect;
348-
rewrite ^/(.*)$ https://gubernator.k8s.io/pr/$1 redirect;
349-
350-
}
351340
server {
352341
server_name releases.k8s.io rel.k8s.io releases.kubernetes.io rel.kubernetes.io;
353342
listen 80;

‎apps/k8s-io/test.py

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -201,10 +201,6 @@ def test_go(self):
201201
self.assert_temp_redirect(
202202
base + 'logo',
203203
'https://branding.cncf.io/projects/kubernetes/')
204-
self.assert_temp_redirect(
205-
base + 'pr-dashboard',
206-
'https://gubernator.k8s.io/pr')
207-
208204
self.assert_temp_redirect(
209205
base + 'stuck-prs',
210206
'https://github.com/kubernetes/kubernetes/pulls?utf8=%E2%9C%93&q=is%3Apr%20is%3Aopen%20label%3Algtm%20label%3Aapproved%20-label%3Ado-not-merge%20-label%3Aneeds-rebase%20sort%3Aupdated-asc%20-status%3Asuccess')
@@ -256,14 +252,6 @@ def test_ci_test(self):
256252
'https://console.developers.google.com/storage/browser/kubernetes-jenkins/logs/e2e')
257253

258254
num = rand_num()
259-
# numeric with trailing slash
260-
self.assert_temp_redirect(base + '/e2e/$num/',
261-
'https://k8s-gubernator.appspot.com/build/kubernetes-jenkins/logs/e2e/$num',
262-
num=num)
263-
# numeric without trailing slash
264-
self.assert_temp_redirect(base + '/e2e/$num',
265-
'https://k8s-gubernator.appspot.com/build/kubernetes-jenkins/logs/e2e/$num',
266-
num=num)
267255

268256
# no trailing slash
269257
self.assert_temp_redirect(base + '/e2e/$num/file',
@@ -391,12 +379,6 @@ def test_prs(self):
391379
'https://github.com/kubernetes/kubernetes/pull/$path',
392380
path=rand_num())
393381

394-
def test_pr_test(self):
395-
base = 'pr-test.kubernetes.io'
396-
self.assert_temp_redirect(base, 'https://gubernator.k8s.io')
397-
self.assert_temp_redirect(base + '/$id',
398-
'https://gubernator.k8s.io/pr/$id', id=rand_num())
399-
400382
def test_release(self):
401383
for base in ('releases.k8s.io', 'rel.k8s.io',
402384
'releases.kubernetes.io', 'rel.kubernetes.io'):

‎dns/zone-configs/k8s.io._0_base.yaml

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -208,24 +208,6 @@ git:
208208
go:
209209
type: CNAME
210210
value: redirect.k8s.io.
211-
# Running on Google App Engine
212-
gubernator:
213-
- type: A
214-
values:
215-
- 216.239.32.21
216-
- 216.239.34.21
217-
- 216.239.36.21
218-
- 216.239.38.21
219-
- type: AAAA
220-
values:
221-
- 2001:4860:4802:32::15
222-
- 2001:4860:4802:34::15
223-
- 2001:4860:4802:36::15
224-
- 2001:4860:4802:38::15
225-
# Verify that @ixdy owns gubernator.k8s.io, necessary to set up custom domain in GAE
226-
aupoulkmindh.gubernator:
227-
type: CNAME
228-
value: gv-afluggfkiwfho7.dv.googlehosted.com.
229211
issue:
230212
type: CNAME
231213
value: redirect.k8s.io.

‎dns/zone-configs/kubernetes.io._0_base.yaml

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -141,13 +141,6 @@ git:
141141
go:
142142
type: CNAME
143143
value: go.k8s.io.
144-
gubernator:
145-
type: CNAME
146-
value: gubernator.k8s.io.
147-
# Verify that @ixdy owns gubernator.kubernetes.io, necessary to set up custom domain in GAE
148-
hpxqcdbptcka.gubernator:
149-
type: CNAME
150-
value: gv-lld4xxz7bimg2e.dv.googlehosted.com.
151144
issue:
152145
type: CNAME
153146
value: issue.k8s.io.

‎infra/gcp/terraform/kubernetes-public/k8s-kettle.tf

Lines changed: 0 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -72,38 +72,6 @@ resource "google_bigquery_dataset_iam_policy" "prod_kettle_dataset" {
7272
policy_data = data.google_iam_policy.prod_kettle_dataset_iam_policy.policy_data
7373
}
7474

75-
76-
// Service account dedicated for BigQuery Data Transfer from BQ dataset k8s-gubernator:builds
77-
// TODO: remove when kettle migration is over
78-
resource "google_service_account" "bq_kettle_data_transfer_writer" {
79-
account_id = "bq-data-transfer-kettle"
80-
description = "Service Acccount BigQuery Data Transfer"
81-
project = data.google_project.project.project_id
82-
}
83-
84-
// grant bigquery jobUser role to the service account
85-
// so the job transfer can launch BigQuery jobs
86-
resource "google_project_iam_member" "bq_kettle_data_transfer_jobuser_binding" {
87-
project = data.google_project.project.project_id
88-
role = "roles/bigquery.jobUser"
89-
member = "serviceAccount:${google_service_account.bq_kettle_data_transfer_writer.email}"
90-
}
91-
92-
resource "google_bigquery_data_transfer_config" "bq_data_transfer_kettle" {
93-
display_name = "BigQuery data transfer to ${google_bigquery_dataset.prod_kettle_dataset.dataset_id}"
94-
project = data.google_project.project.project_id
95-
data_source_id = "cross_region_copy"
96-
destination_dataset_id = google_bigquery_dataset.prod_kettle_dataset.dataset_id
97-
service_account_name = google_service_account.bq_kettle_data_transfer_writer.email
98-
disabled = false
99-
100-
params = {
101-
overwrite_destination_table = "true"
102-
source_dataset_id = "build"
103-
source_project_id = "k8s-gubernator"
104-
}
105-
}
106-
10775
# Used to monitor kubernetes jenkings changes
10876
resource "google_pubsub_topic" "notification_topic" {
10977
project = data.google_project.project.project_id

‎infra/gcp/terraform/kubernetes-public/k8s-triage.tf

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,6 @@ This file defines:
2121
- IAM bindings
2222
*/
2323

24-
locals {
25-
// TODO(spiffxp): remove legacy serviceaccount when migration completed
26-
triage_legacy_sa_email = "[email protected]"
27-
}
28-
2924
// Use a data source for the service account
3025
// NB: we can't do this for triage_legacy_sa_email as we lack sufficient privileges
3126
data "google_service_account" "triage_sa" {
@@ -62,8 +57,7 @@ data "google_iam_policy" "triage_bucket_iam_bindings" {
6257
// Ensure triage service accounts have write access to the bucket
6358
binding {
6459
members = [
65-
"serviceAccount:${data.google_service_account.triage_sa.email}",
66-
"serviceAccount:${local.triage_legacy_sa_email}"
60+
"serviceAccount:${data.google_service_account.triage_sa.email}"
6761
]
6862
role = "roles/storage.legacyBucketWriter"
6963
}
@@ -79,8 +73,7 @@ data "google_iam_policy" "triage_bucket_iam_bindings" {
7973
role = "roles/storage.objectAdmin"
8074
members = [
8175
"group:${local.prow_owners}",
82-
"serviceAccount:${data.google_service_account.triage_sa.email}",
83-
"serviceAccount:${local.triage_legacy_sa_email}"
76+
"serviceAccount:${data.google_service_account.triage_sa.email}"
8477
]
8578
}
8679
// Ensure bucket contents are world readable

0 commit comments

Comments
 (0)