Skip to content

Commit

Permalink
Merge pull request #15911 from ixdy/boskos-gcp-janitor
Browse files Browse the repository at this point in the history 
Fix a few bugs in the Boskos GCP janitor
  • Loading branch information
@k8s-ci-robot
k8s-ci-robot authored Jan 23, 2020
2 parents a1c4f60 + 3c14ab1 commit 0a8437a
Show file tree
Hide file tree
Showing 3 changed files with 63 additions and 41 deletions.
2 changes: 1 addition & 1 deletion boskos/janitor/BUILD.bazel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ pkg_tar(

container_image(
name = "janitor_image",
base = "@gcloud-go//image",
base = "@cloud-sdk-slim//image",
tars = [":janitor_tar"],
)

Expand Down
94 changes: 54 additions & 40 deletions boskos/janitor/gcp_janitor.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,40 +34,39 @@

# compute resources
Resource('', 'compute', 'instances', None, 'zone', None, False, True),
Resource('', 'compute', 'addresses', None, 'global', None, False, True),
Resource('', 'compute', 'addresses', None, 'region', None, False, True),
Resource('', 'compute', 'disks', None, 'zone', None, False, True),
Resource('', 'compute', 'disks', None, 'region', None, False, True),
Resource('', 'compute', 'firewall-rules', None, None, None, False, True),
Resource('', 'compute', 'routes', None, None, None, False, True),
Resource('', 'compute', 'forwarding-rules', None, None, None, False, True),
Resource('beta', 'compute', 'forwarding-rules', None, 'region', None, False, True),
Resource('', 'compute', 'target-http-proxies', None, None, None, False, True),
Resource('beta', 'compute', 'target-http-proxies', None, 'region', None, False, True),
Resource('', 'compute', 'target-https-proxies', None, None, None, False, True),
Resource('beta', 'compute', 'target-https-proxies', None, 'region', None, False, True),
Resource('', 'compute', 'target-tcp-proxies', None, None, None, False, True),
Resource('beta', 'compute', 'target-tcp-proxies', None, 'region', None, False, True),
Resource('', 'compute', 'forwarding-rules', None, 'global', None, False, True),
Resource('', 'compute', 'forwarding-rules', None, 'region', None, False, True),
Resource('', 'compute', 'target-http-proxies', None, 'global', None, False, True),
Resource('', 'compute', 'target-http-proxies', None, 'region', None, False, True),
Resource('', 'compute', 'target-https-proxies', None, 'global', None, False, True),
Resource('', 'compute', 'target-https-proxies', None, 'region', None, False, True),
Resource('', 'compute', 'target-tcp-proxies', None, None, None, False, True),
Resource('beta', 'compute', 'target-tcp-proxies', None, 'region', None, False, True),
Resource('', 'compute', 'ssl-certificates', None, None, None, False, True),
Resource('beta', 'compute', 'ssl-certificates', None, 'region', None, False, True),
Resource('', 'compute', 'url-maps', None, None, None, False, True),
Resource('beta', 'compute', 'url-maps', None, 'region', None, False, True),
Resource('', 'compute', 'ssl-certificates', None, 'global', None, False, True),
Resource('', 'compute', 'ssl-certificates', None, 'region', None, False, True),
Resource('', 'compute', 'url-maps', None, 'global', None, False, True),
Resource('', 'compute', 'url-maps', None, 'region', None, False, True),
Resource('', 'compute', 'backend-services', None, 'global', None, False, True),
Resource('', 'compute', 'backend-services', None, 'region', None, False, True),
Resource('', 'compute', 'target-pools', None, 'region', None, False, True),
Resource('', 'compute', 'health-checks', None, None, None, False, True),
Resource('beta', 'compute', 'health-checks', None, 'region', None, False, True),
Resource('', 'compute', 'health-checks', None, 'global', None, False, True),
Resource('', 'compute', 'health-checks', None, 'region', None, False, True),
Resource('', 'compute', 'http-health-checks', None, None, None, False, True),
Resource('', 'compute', 'instance-groups', None, 'region', 'Yes', False, True),
Resource('', 'compute', 'instance-groups', None, 'zone', 'Yes', False, True),
Resource('', 'compute', 'instance-groups', None, 'zone', 'No', False, True),
Resource('', 'compute', 'instance-templates', None, None, None, False, True),
Resource('', 'compute', 'sole-tenancy', 'node-groups', 'zone', None, False, True),
Resource('', 'compute', 'sole-tenancy', 'node-templates', 'region', None, False, True),
Resource('beta', 'compute', 'network-endpoint-groups', None, 'zone', None, False, False),
Resource('', 'compute', 'networks', 'subnets', 'region', None, True, True),
Resource('', 'compute', 'networks', None, '', None, False, True),
Resource('', 'compute', 'network-endpoint-groups', None, 'zone', None, False, False),
Resource('', 'compute', 'routes', None, None, None, False, True),
Resource('', 'compute', 'routers', None, 'region', None, False, True),
Resource('', 'compute', 'networks', 'subnets', 'region', None, True, True),
Resource('', 'compute', 'networks', None, None, None, False, True),

# logging resources
Resource('', 'logging', 'sinks', None, None, None, False, False),
Expand Down Expand Up @@ -182,18 +181,33 @@ def collect(project, age, resource, filt, clear_all):
if 'name' not in item:
raise ValueError('missing key: name - %r' % item)

if resource.condition and resource.condition in item:
colname = item[resource.condition]
log('looking for items in %s=%s' % (resource.condition, colname))
else:
colname = ''
colname = ''
if resource.condition is not None:
# This subcommand will want either a --global, --region, or --zone
# flag, so segment items accordingly.
if resource.condition == 'global':
if 'zone' in item or 'region' in item:
# This item is zonal or regional, so don't include it in
# the global list.
continue
elif resource.condition in item:
# Looking for zonal or regional items, and this matches.
# The zone or region is sometimes a full URL (why?), but
# subcommands want just the name, not the full URL, so strip it.
colname = item[resource.condition].rsplit('/', 1)[-1]
log('looking for items in %s=%s' % (resource.condition, colname))
else:
# This item doesn't match the condition, so don't include it.
continue

if validate_item(item, age, resource, clear_all):
col[colname].append(item['name'])
return col

def asyncCall(cmd, tolerate, name, errs, lock, hide_output):
log('Call %r' % cmd)
log('%sCall %r' % ('[DRYRUN] ' if ARGS.dryrun else '', cmd))
if ARGS.dryrun:
return
try:
if hide_output:
FNULL = open(os.devnull, 'w')
Expand Down Expand Up @@ -228,11 +242,6 @@ def clear_resources(project, cols, resource, rate_limit):
rate_limit = 1

for col, items in cols.items():
if ARGS.dryrun:
log('Resource type %r(%r) to be deleted: %r' %
(resource.name, resource.subgroup, list(items)))
continue

manage_key = {'Yes': 'managed', 'No': 'unmanaged'}

# construct the customized gcloud command
Expand All @@ -243,11 +252,10 @@ def clear_resources(project, cols, resource, rate_limit):
base.append('--project=%s' % project)

condition = None
if resource.condition:
if col:
condition = '--%s=%s' % (resource.condition, col)
else:
condition = '--global'
if resource.condition and col:
condition = '--%s=%s' % (resource.condition, col)
elif resource.condition == 'global':
condition = '--global'

log('going to delete %d %s' % (len(items), resource.name))
# try to delete at most $rate_limit items at a time
Expand Down Expand Up @@ -290,7 +298,7 @@ def clean_gke_cluster(project, age, filt):
'gcloud', 'container', '-q', 'clusters', 'list',
'--project=%s' % project,
'--filter=%s' % filt,
'--format=json(name,createTime,zone)'
'--format=json(name,createTime,region,zone)'
]
log('running %s' % cmd)

Expand All @@ -304,8 +312,10 @@ def clean_gke_cluster(project, age, filt):

for item in json.loads(output):
log('cluster info: %r' % item)
if 'name' not in item or 'createTime' not in item or 'zone' not in item:
raise ValueError('name, createTime and zone must present: %r' % item)
if 'name' not in item or 'createTime' not in item:
raise ValueError('name and createTime must be present: %r' % item)
if not ('zone' in item or 'region' in item):
raise ValueError('either zone or region must be present: %r' % item)

# The raw createTime string looks like 2017-08-30T18:33:14+00:00
# Which python 2.7 does not support timezones.
Expand All @@ -321,8 +331,11 @@ def clean_gke_cluster(project, age, filt):
'gcloud', 'container', '-q', 'clusters', 'delete',
item['name'],
'--project=%s' % project,
'--zone=%s' % item['zone'],
]
if 'zone' in item:
delete.append('--zone=%s' % item['zone'])
elif 'region' in item:
delete.append('--region=%s' % item['region'])
thread = threading.Thread(
target=asyncCall, args=(delete, False, item['name'], errs, lock, True))
threads.append(thread)
Expand Down Expand Up @@ -374,7 +387,8 @@ def main(project, days, hours, filt, rate_limit, service_account):

if not err:
for res in DEMOLISH_ORDER:
log('Try to search for %r with condition %r' % (res.name, res.condition))
log('Try to search for %r with condition %r, managed %r' % (
res.name, res.condition, res.managed))
try:
col = collect(project, age, res, filt, clear_all)
if col:
Expand Down
8 changes: 8 additions & 0 deletions containers.bzl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,3 +86,11 @@ def repositories():
repository = "cloud-marketplace-containers/google/bazel",
tag = "1.2.0",
)

container_pull(
name = "cloud-sdk-slim",
digest = "sha256:6dafecdad80abf6470eae9e0b57fc083d1f3413fa15b9fab7c2ad3a102d244c4", # 2020/01/21
registry = "gcr.io",
repository = "google.com/cloudsdktool/cloud-sdk",
tag = "277.0.0-slim",
)

0 comments on commit 0a8437a

Please sign in to comment.