Cherry pick: Fix recurring runs (#533)

* Change namespace in kfp-schedwf * Change namespace in kfp-schedwf * Fix linting * Fix linting * Fix cherry-picking * Remove log_level field
canonical · Jul 2, 2024 · e66facb · e66facb
1 parent 29a6541
commit e66facb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/charms/kfp-schedwf/src/charm.py b/charms/kfp-schedwf/src/charm.py
@@ -73,7 +73,6 @@ def __init__(self, *args):
                 container_name="ml-pipeline-scheduledworkflow",
                 service_name="controller",
                 timezone=self.model.config["timezone"],
-                namespace=self.model.name,
             ),
             depends_on=[self.kubernetes_resources],
         )

diff --git a/charms/kfp-schedwf/src/components/pebble_component.py b/charms/kfp-schedwf/src/components/pebble_component.py
@@ -13,13 +13,14 @@ def __init__(
         self,
         *args,
         timezone: str,
-        namespace: str,
         **kwargs,
     ):
         """Pebble service container component in order to configure Pebble layer"""
         super().__init__(*args, **kwargs)
-        self.environment = {"CRON_SCHEDULE_TIMEZONE": timezone}
-        self.namespace = namespace
+        self.environment = {
+            "CRON_SCHEDULE_TIMEZONE": timezone,
+            "NAMESPACE": "",
+        }
 
     def get_layer(self) -> Layer:
         """Defines and returns Pebble layer configuration
@@ -41,8 +42,7 @@ def get_layer(self) -> Layer:
                         "override": "replace",
                         "summary": "scheduled workflow controller service",
                         "startup": "enabled",
-                        "command": "/bin/controller --logtostderr=true"
-                        " --namespace={self.namespace}",
+                        "command": "/bin/controller --logtostderr=true" ' --namespace=""',
                         "environment": self.environment,
                     }
                 },