Skip to content

Commit 0654a4c

Browse files
committed
Some more refactoring
1 parent 38d7eec commit 0654a4c

File tree

2 files changed

+2
-30
lines changed

2 files changed

+2
-30
lines changed

src/zenml/integrations/kubernetes/orchestrators/kubernetes_orchestrator.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -693,12 +693,9 @@ def _create_image_pull_secrets(
693693
Args:
694694
secret_manifests: List of secret manifests for imagePullSecrets.
695695
"""
696-
# Create imagePullSecrets first
697696
create_image_pull_secrets_from_manifests(
698697
secret_manifests=secret_manifests,
699698
core_api=self._k8s_core_api,
700-
namespace=self.config.kubernetes_namespace,
701-
reuse_existing=False, # Orchestrator creates/updates all secrets
702699
)
703700

704701
def get_orchestrator_run_id(self) -> str:

src/zenml/integrations/kubernetes/orchestrators/manifest_utils.py

Lines changed: 2 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -231,41 +231,16 @@ def _generate_image_pull_secrets(
231231
def create_image_pull_secrets_from_manifests(
232232
secret_manifests: List[Dict[str, Any]],
233233
core_api,
234-
namespace: str,
235-
reuse_existing: bool = True,
236234
) -> None:
237-
"""Create imagePullSecrets from manifests with optional reuse logic.
235+
"""Create imagePullSecrets from manifests.
238236
239237
Args:
240238
secret_manifests: List of secret manifests to create.
241239
core_api: Kubernetes Core API client.
242-
namespace: Kubernetes namespace.
243-
reuse_existing: If True, reuses existing secrets and only creates new ones.
244-
If False, creates/updates all secrets.
245240
"""
246241
for secret_manifest in secret_manifests:
247242
secret_name = secret_manifest["metadata"]["name"]
248-
249-
if reuse_existing:
250-
# Check if secret already exists
251-
try:
252-
core_api.read_namespaced_secret(
253-
name=secret_name, namespace=namespace
254-
)
255-
logger.debug(
256-
f"imagePullSecret {secret_name} already exists, reusing it"
257-
)
258-
continue # Skip creation, secret already exists
259-
except k8s_client.rest.ApiException as e:
260-
if e.status != 404:
261-
# Some other error, re-raise
262-
logger.warning(
263-
f"Error checking existence of secret {secret_name}: {e}"
264-
)
265-
raise
266-
# Secret doesn't exist (404), proceed to create it
267-
268-
# Create or update the secret
243+
269244
try:
270245
kube_utils.create_or_update_secret_from_manifest(
271246
core_api=core_api,

0 commit comments

Comments
 (0)