diff --git a/paasta_tools/cleanup_kubernetes_cr.py b/paasta_tools/cleanup_kubernetes_cr.py index b589ac6377..2498878e45 100644 --- a/paasta_tools/cleanup_kubernetes_cr.py +++ b/paasta_tools/cleanup_kubernetes_cr.py @@ -31,7 +31,6 @@ from paasta_tools.kubernetes_tools import list_custom_resources from paasta_tools.kubernetes_tools import load_custom_resource_definitions from paasta_tools.kubernetes_tools import paasta_prefixed -from paasta_tools.setup_kubernetes_cr import INSTANCE_TYPE_TO_NAMESPACE_LOADER from paasta_tools.utils import DEFAULT_SOA_DIR from paasta_tools.utils import load_all_configs from paasta_tools.utils import load_system_paasta_config @@ -106,16 +105,11 @@ def cleanup_all_custom_resources( ) if not config_dicts: continue - if crd.file_prefix in INSTANCE_TYPE_TO_NAMESPACE_LOADER: - namespace = INSTANCE_TYPE_TO_NAMESPACE_LOADER[crd.file_prefix] - else: - namespace = "" crs = list_custom_resources( kube_client=kube_client, kind=crd.kube_kind, version=crd.version, group=crd.group, - namespace=namespace, ) for cr in crs: service = config_dicts.get(cr.service) diff --git a/paasta_tools/kubernetes_tools.py b/paasta_tools/kubernetes_tools.py index 1e99d3fc87..9f8730c7a0 100644 --- a/paasta_tools/kubernetes_tools.py +++ b/paasta_tools/kubernetes_tools.py @@ -3081,14 +3081,11 @@ def create_custom_resource( version: str, kind: KubeKind, group: str, - namespace: str = "", ) -> None: - if not namespace: - namespace = f"paasta-{kind.plural}" return kube_client.custom.create_namespaced_custom_object( group=group, version=version, - namespace=namespace, + namespace=f"paasta-{kind.plural}", plural=kind.plural, body=formatted_resource, ) @@ -3101,15 +3098,12 @@ def update_custom_resource( name: str, kind: KubeKind, group: str, - namespace: str = "", ) -> None: - if not namespace: - namespace = f"paasta-{kind.plural}" co = kube_client.custom.get_namespaced_custom_object( name=name, group=group, version=version, - namespace=namespace, + namespace=f"paasta-{kind.plural}", plural=kind.plural, ) formatted_resource["metadata"]["resourceVersion"] = co["metadata"][ @@ -3119,7 +3113,7 @@ def update_custom_resource( name=name, group=group, version=version, - namespace=namespace, + namespace=f"paasta-{kind.plural}", plural=kind.plural, body=formatted_resource, ) @@ -3131,16 +3125,13 @@ def list_custom_resources( kube_client: KubeClient, group: str, label_selector: str = "", - namespace: str = "", ) -> Sequence[KubeCustomResource]: - if not namespace: - namespace = f"paasta-{kind.plural}" crs = kube_client.custom.list_namespaced_custom_object( group=group, version=version, label_selector=label_selector, plural=kind.plural, - namespace=namespace, + namespace=f"paasta-{kind.plural}", ) kube_custom_resources = [] for cr in crs["items"]: diff --git a/paasta_tools/setup_kubernetes_cr.py b/paasta_tools/setup_kubernetes_cr.py index 6b8da97bb6..50647e1899 100644 --- a/paasta_tools/setup_kubernetes_cr.py +++ b/paasta_tools/setup_kubernetes_cr.py @@ -50,11 +50,8 @@ from paasta_tools.utils import load_all_configs from paasta_tools.utils import load_system_paasta_config from paasta_tools.vitesscell_tools import load_vitess_cell_instance_configs -from paasta_tools.vitesscell_tools import VITESSCELL_KUBERNETES_NAMESPACE from paasta_tools.vitesscluster_tools import load_vitess_cluster_instance_configs -from paasta_tools.vitesscluster_tools import VITESSCLUSTER_KUBERNETES_NAMESPACE from paasta_tools.vitesskeyspace_tools import load_vitess_keyspace_instance_configs -from paasta_tools.vitesskeyspace_tools import VITESSKEYSPACE_KUBERNETES_NAMESPACE log = logging.getLogger(__name__) @@ -67,13 +64,6 @@ } -INSTANCE_TYPE_TO_NAMESPACE_LOADER = { - "vitesscluster": VITESSCLUSTER_KUBERNETES_NAMESPACE, - "vitesscell": VITESSCELL_KUBERNETES_NAMESPACE, - "vitesskeyspace": VITESSKEYSPACE_KUBERNETES_NAMESPACE, -} - - class StdoutKubeClient: """Replace all destructive operations in Kubernetes APIs with writing out YAML to stdout.""" @@ -250,16 +240,8 @@ def setup_custom_resources( ) -> bool: succeded = True if config_dicts: - if crd.file_prefix in INSTANCE_TYPE_TO_NAMESPACE_LOADER: - namespace = INSTANCE_TYPE_TO_NAMESPACE_LOADER[crd.file_prefix] - else: - namespace = f"paasta-{kind.plural}" crs = list_custom_resources( - kube_client=kube_client, - kind=kind, - version=version, - group=group, - namespace=namespace, + kube_client=kube_client, kind=kind, version=version, group=group ) for svc, config in config_dicts.items(): if service is not None and service != svc: @@ -387,10 +369,6 @@ def reconcile_kubernetes_resource( cluster=cluster, soa_dir=DEFAULT_SOA_DIR, ) - if crd.file_prefix in INSTANCE_TYPE_TO_NAMESPACE_LOADER: - namespace = INSTANCE_TYPE_TO_NAMESPACE_LOADER[crd.file_prefix] - else: - namespace = f"paasta-{kind.plural}" git_sha = get_git_sha_from_dockerurl(soa_config.get_docker_url(), long=True) formatted_resource = format_custom_resource( instance_config=config, @@ -400,7 +378,7 @@ def reconcile_kubernetes_resource( kind=kind.singular, version=version, group=group, - namespace=namespace, + namespace=f"paasta-{kind.plural}", git_sha=git_sha, is_eks=is_eks, ) @@ -415,7 +393,7 @@ def reconcile_kubernetes_resource( ), kind=kind.singular, name=formatted_resource["metadata"]["name"], - namespace=namespace, + namespace=f"paasta-{kind.plural}", ) if not (service, inst, kind.singular) in [ (c.service, c.instance, c.kind) for c in custom_resources @@ -427,7 +405,6 @@ def reconcile_kubernetes_resource( kind=kind, formatted_resource=formatted_resource, group=group, - namespace=namespace, ) elif desired_resource not in custom_resources: sanitised_service = sanitise_kubernetes_name(service) @@ -440,7 +417,6 @@ def reconcile_kubernetes_resource( kind=kind, formatted_resource=formatted_resource, group=group, - namespace=namespace, ) else: log.info(f"{desired_resource} is up to date, no action taken") diff --git a/paasta_tools/vitesscell_tools.py b/paasta_tools/vitesscell_tools.py index 2b4e2fc2a2..0bdb9918f7 100644 --- a/paasta_tools/vitesscell_tools.py +++ b/paasta_tools/vitesscell_tools.py @@ -30,7 +30,7 @@ log.addHandler(logging.NullHandler()) -VITESSCELL_KUBERNETES_NAMESPACE = "paasta-vitessclusters" +KUBERNETES_NAMESPACE = "paasta-vitessclusters" # Global variables @@ -283,7 +283,7 @@ def cr_id(service: str, instance: str) -> Mapping[str, str]: return dict( group="planetscale.com", version="v2", - namespace=VITESSCELL_KUBERNETES_NAMESPACE, + namespace=KUBERNETES_NAMESPACE, plural="vitesscells", name=sanitised_cr_name(service, instance), ) diff --git a/paasta_tools/vitesscluster_tools.py b/paasta_tools/vitesscluster_tools.py index 0f1e578956..c64797aff7 100644 --- a/paasta_tools/vitesscluster_tools.py +++ b/paasta_tools/vitesscluster_tools.py @@ -29,7 +29,7 @@ log.addHandler(logging.NullHandler()) -VITESSCLUSTER_KUBERNETES_NAMESPACE = "paasta-vitessclusters" +KUBERNETES_NAMESPACE = "paasta-vitessclusters" # Global variables @@ -249,7 +249,7 @@ class VitessClusterInstanceConfigDict(KubernetesDeploymentConfigDict, total=Fals class VitessDeploymentConfig(KubernetesDeploymentConfig): def get_namespace(self) -> str: - return VITESSCLUSTER_KUBERNETES_NAMESPACE + return KUBERNETES_NAMESPACE def get_env_variables(self) -> List[Union[KVEnvVar, KVEnvVarValueFrom]]: # get all K8s container env vars and format their keys to camel case @@ -493,7 +493,7 @@ def cr_id(service: str, instance: str) -> Mapping[str, str]: return dict( group="planetscale.com", version="v2", - namespace=VITESSCLUSTER_KUBERNETES_NAMESPACE, + namespace=KUBERNETES_NAMESPACE, plural="vitessclusters", name=sanitised_cr_name(service, instance), ) diff --git a/paasta_tools/vitesskeyspace_tools.py b/paasta_tools/vitesskeyspace_tools.py index 9b9e36cc57..90e3067369 100644 --- a/paasta_tools/vitesskeyspace_tools.py +++ b/paasta_tools/vitesskeyspace_tools.py @@ -31,7 +31,7 @@ log.addHandler(logging.NullHandler()) -VITESSKEYSPACE_KUBERNETES_NAMESPACE = "paasta-vitessclusters" +KUBERNETES_NAMESPACE = "paasta-vitessclusters" # Global variables @@ -533,7 +533,7 @@ def cr_id(service: str, instance: str) -> Mapping[str, str]: return dict( group="planetscale.com", version="v2", - namespace=VITESSKEYSPACE_KUBERNETES_NAMESPACE, + namespace=KUBERNETES_NAMESPACE, plural="vitesskeyspaces", name=sanitised_cr_name(service, instance), ) diff --git a/tests/test_setup_kubernetes_cr.py b/tests/test_setup_kubernetes_cr.py index 10a4cc2089..77b25607ae 100644 --- a/tests/test_setup_kubernetes_cr.py +++ b/tests/test_setup_kubernetes_cr.py @@ -457,7 +457,6 @@ def test_reconcile_kubernetes_resource(mock_LONG_RUNNING_INSTANCE_TYPE_HANDLERS) kind=mock_kind, formatted_resource=mock_format_custom_resource.return_value, group="yelp.com", - namespace="paasta-flinks", ) # instance not exist, create @@ -478,7 +477,6 @@ def test_reconcile_kubernetes_resource(mock_LONG_RUNNING_INSTANCE_TYPE_HANDLERS) kind=mock_kind, formatted_resource=mock_format_custom_resource.return_value, group="yelp.com", - namespace="paasta-flinks", ) # instance not exist, create but error with k8s @@ -500,5 +498,4 @@ def test_reconcile_kubernetes_resource(mock_LONG_RUNNING_INSTANCE_TYPE_HANDLERS) kind=mock_kind, formatted_resource=mock_format_custom_resource.return_value, group="yelp.com", - namespace="paasta-flinks", )