Skip to content

Commit

Permalink
fix(cluster): remove unused config vars and enable cluster job by def…
Browse files Browse the repository at this point in the history
…ault
  • Loading branch information
jdobes authored and psegedy committed Nov 27, 2024
1 parent ca39df3 commit 37ab13e
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 15 deletions.
9 changes: 2 additions & 7 deletions cluster/cluster.py
Original file line number Diff line number Diff line change
Expand Up @@ -117,14 +117,9 @@ def cluster() -> None:
sys.exit(1)

launch_cluster("system_platform", ["rh_account_id"])

launch_cluster("cve_metadata", ["impact_id"])

if CFG.cluster_system_vulnerabilities:
cluster_system_vulnerabilities(conn)

if CFG.cluster_system_vulnerable_package:
cluster_system_vulnerable_package(conn)
cluster_system_vulnerabilities(conn)
cluster_system_vulnerable_package(conn)

conn.close()
LOGGER.info("Finished cluster job")
Expand Down
4 changes: 0 additions & 4 deletions common/config.py
Original file line number Diff line number Diff line change
Expand Up @@ -154,10 +154,6 @@ def __init__(self):
# Manager
self.maximum_page_size = int(os.getenv("MAXIMUM_PAGE_SIZE", "100"))

# Cluster job
self.cluster_system_vulnerabilities = strtobool(os.getenv("CLUSTER_SYSTEM_VULNERABILITIES", "TRUE"))
self.cluster_system_vulnerable_package = strtobool(os.getenv("CLUSTER_SYSTEM_VULNERABLE_PACKAGE", "TRUE"))

# Reporters
self.allowed_reporters = os.getenv("ALLOWED_REPORTERS", "puptoo,rhsm-system-profile-bridge").split(",")

Expand Down
2 changes: 0 additions & 2 deletions conf/cluster.env

This file was deleted.

2 changes: 1 addition & 1 deletion deploy/clowdapp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -796,7 +796,7 @@ parameters:
- name: SUSPEND_CLUSTER
description: Disable Cronjob
required: true
value: "true"
value: "false"
# RESOURCES
- name: CPU_REQUEST_EVALUATOR_RECALC
description: Requested CPU for pod
Expand Down
1 change: 0 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -246,7 +246,6 @@ services:
image: vulnerability-engine-app:latest
env_file:
- ./conf/common.env
- ./conf/cluster.env
- ./conf/database.env
depends_on:
- ve_database
Expand Down

0 comments on commit 37ab13e

Please sign in to comment.