From 684dcac6abe6ca8a523e90149eade4b87c3db0a6 Mon Sep 17 00:00:00 2001 From: David Wertenteil Date: Wed, 1 Nov 2023 08:16:23 +0200 Subject: [PATCH] fix configmap name Signed-off-by: David Wertenteil --- systest_utils/statics.py | 2 +- tests_scripts/kubescape/config.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/systest_utils/statics.py b/systest_utils/statics.py index 27db1f0a..478594bf 100644 --- a/systest_utils/statics.py +++ b/systest_utils/statics.py @@ -115,9 +115,9 @@ HELM_REPO = "kubescape/kubescape-operator" CA_NAMESPACE_NAME = "kubescape" CA_NAMESPACE_FROM_HELM_NAME = "kubescape" -CA_KUBESCAPE_CONFIGMAP_NAME = "kubescape-config" CA_HELM_NAME = "kubescape" CA_CONFIG = "ks-cloud-config" +KS_SECRET = "cloud-secret" CA_CONFIGMAP_SERVICE_DISCOVERY_KEY = "services" CA_OPERATOR_CONTAINER_FROM_HELM_NAME = "operator" CA_OPERATOR_DEPLOYMENT_FROM_HELM_NAME = "operator" diff --git a/tests_scripts/kubescape/config.py b/tests_scripts/kubescape/config.py index 6cddfcc2..7a993f91 100644 --- a/tests_scripts/kubescape/config.py +++ b/tests_scripts/kubescape/config.py @@ -34,7 +34,7 @@ def start(self): return self.cleanup() def compare_view_result(self): - ks_cm_obj = self.kubernetes_obj.get_config_map(namespace=statics.CA_NAMESPACE_FROM_HELM_NAME, name=statics.CA_KUBESCAPE_CONFIGMAP_NAME) + ks_cm_obj = self.kubernetes_obj.get_config_map(namespace=statics.CA_NAMESPACE_FROM_HELM_NAME, name=statics.KS_CONFIG) cm_data = ks_cm_obj.data["config.json"] cm_dict = json.loads(cm_data) @@ -88,7 +88,7 @@ def compare_set_result(self): with open(self.get_kubescape_config_file()) as f: file_dict = json.load(f) assert self.test_obj.kwargs["set_key"] in file_dict.keys(), f'key {self.test_obj.kwargs["set_key"]} should exist in the file {self.get_kubescape_config_file()}' - cm_obj = self.kubernetes_obj.get_config_map(namespace=statics.CA_NAMESPACE_FROM_HELM_NAME, name=statics.CA_KUBESCAPE_CONFIGMAP_NAME) + cm_obj = self.kubernetes_obj.get_config_map(namespace=statics.CA_NAMESPACE_FROM_HELM_NAME, name=statics.KS_CONFIG) cm_data = cm_obj.data["config.json"] cm_dict = json.loads(cm_data) assert self.test_obj.kwargs["set_key"] not in cm_dict.keys() or self.test_obj.kwargs["set_key"] in cm_dict.keys() and cm_dict[self.test_obj.kwargs["set_key"]] != self.test_obj.kwargs["set_value"], f'key {self.test_obj.kwargs["set_key"]} should mot exist in the kubescape configmap:{cm_dict}' @@ -123,7 +123,7 @@ def start(self): def compare_view_result(self): kubescape_config_file_path=self.get_kubescape_config_file() - cm_obj = self.kubernetes_obj.get_config_map(namespace=statics.CA_NAMESPACE_FROM_HELM_NAME, name=statics.CA_KUBESCAPE_CONFIGMAP_NAME) + cm_obj = self.kubernetes_obj.get_config_map(namespace=statics.CA_NAMESPACE_FROM_HELM_NAME, name=statics.KS_CONFIG) assert not(cm_obj) == False, f'the kubescape configmap should not be deleted' assert os.path.exists(kubescape_config_file_path) == False, f'kubescape config file in path: {kubescape_config_file_path} should be deleted' \ No newline at end of file