diff --git a/manifests/overlays/data-cache/jobset_patches/controller_pod_labels.yaml b/manifests/overlays/data-cache/jobset_patches/controller_pod_labels.yaml deleted file mode 100644 index 48f8dfda8f..0000000000 --- a/manifests/overlays/data-cache/jobset_patches/controller_pod_labels.yaml +++ /dev/null @@ -1,12 +0,0 @@ -# Add unique label to JobSet controller pods to distinguish from LWS -# Required to support jobset and lws controllers in the same namespace ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: jobset-controller-manager -spec: - template: - metadata: - labels: - app.kubernetes.io/component: jobset-controller diff --git a/manifests/overlays/data-cache/jobset_patches/metrics_service_selector.yaml b/manifests/overlays/data-cache/jobset_patches/metrics_service_selector.yaml deleted file mode 100644 index 246d3ea253..0000000000 --- a/manifests/overlays/data-cache/jobset_patches/metrics_service_selector.yaml +++ /dev/null @@ -1,10 +0,0 @@ -# Update JobSet metrics service selector to use unique label -# Required to support jobset and lws controllers in the same namespace ---- -apiVersion: v1 -kind: Service -metadata: - name: jobset-controller-manager-metrics-service -spec: - selector: - app.kubernetes.io/component: jobset-controller diff --git a/manifests/overlays/data-cache/jobset_patches/webhook_service_selector.yaml b/manifests/overlays/data-cache/jobset_patches/webhook_service_selector.yaml deleted file mode 100644 index 92536ecdd5..0000000000 --- a/manifests/overlays/data-cache/jobset_patches/webhook_service_selector.yaml +++ /dev/null @@ -1,10 +0,0 @@ -# Update JobSet webhook service selector to use unique label -# Required to support jobset and lws controllers in the same namespace ---- -apiVersion: v1 -kind: Service -metadata: - name: jobset-webhook-service -spec: - selector: - app.kubernetes.io/component: jobset-controller diff --git a/manifests/overlays/data-cache/kustomization.yaml b/manifests/overlays/data-cache/kustomization.yaml index ac29a1a9bf..91249f8df4 100644 --- a/manifests/overlays/data-cache/kustomization.yaml +++ b/manifests/overlays/data-cache/kustomization.yaml @@ -30,24 +30,3 @@ patches: - op: add path: /metadata/namespace value: default - # Add unique label to JobSet controller pods - - path: jobset_patches/controller_pod_labels.yaml - target: - group: apps - version: v1 - kind: Deployment - name: jobset-controller-manager - # Update JobSet webhook service selector to use unique label - - path: jobset_patches/webhook_service_selector.yaml - target: - group: "" - version: v1 - kind: Service - name: jobset-webhook-service - # Update JobSet metrics service selector to use unique label - - path: jobset_patches/metrics_service_selector.yaml - target: - group: "" - version: v1 - kind: Service - name: jobset-controller-manager-metrics-service diff --git a/manifests/third-party/leaderworkerset/kustomization.yaml b/manifests/third-party/leaderworkerset/kustomization.yaml index 729b643d82..92bfe434d0 100644 --- a/manifests/third-party/leaderworkerset/kustomization.yaml +++ b/manifests/third-party/leaderworkerset/kustomization.yaml @@ -15,24 +15,3 @@ patches: group: "" version: v1 kind: Namespace - # Add unique label to LWS controller pods - - path: patches/controller_pod_labels.yaml - target: - group: apps - version: v1 - kind: Deployment - name: lws-controller-manager - # Update LWS webhook service selector to use unique label - - path: patches/webhook_service_selector.yaml - target: - group: "" - version: v1 - kind: Service - name: lws-webhook-service - # Update LWS metrics service selector to use unique label - - path: patches/metrics_service_selector.yaml - target: - group: "" - version: v1 - kind: Service - name: lws-controller-manager-metrics-service diff --git a/manifests/third-party/leaderworkerset/patches/controller_pod_labels.yaml b/manifests/third-party/leaderworkerset/patches/controller_pod_labels.yaml deleted file mode 100644 index f9c9078eb7..0000000000 --- a/manifests/third-party/leaderworkerset/patches/controller_pod_labels.yaml +++ /dev/null @@ -1,12 +0,0 @@ -# Add unique label to LWS controller pods to distinguish from JobSet -# Required to support jobset and lws controllers in the same namespace ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: lws-controller-manager -spec: - template: - metadata: - labels: - app.kubernetes.io/component: lws-controller diff --git a/manifests/third-party/leaderworkerset/patches/metrics_service_selector.yaml b/manifests/third-party/leaderworkerset/patches/metrics_service_selector.yaml deleted file mode 100644 index d64c5f2416..0000000000 --- a/manifests/third-party/leaderworkerset/patches/metrics_service_selector.yaml +++ /dev/null @@ -1,10 +0,0 @@ -# Update LWS metrics service selector to use unique label -# Required to support jobset and lws controllers in the same namespace ---- -apiVersion: v1 -kind: Service -metadata: - name: lws-controller-manager-metrics-service -spec: - selector: - app.kubernetes.io/component: lws-controller diff --git a/manifests/third-party/leaderworkerset/patches/webhook_service_selector.yaml b/manifests/third-party/leaderworkerset/patches/webhook_service_selector.yaml deleted file mode 100644 index 25eb0ab037..0000000000 --- a/manifests/third-party/leaderworkerset/patches/webhook_service_selector.yaml +++ /dev/null @@ -1,10 +0,0 @@ -# Update LWS webhook service selector to use unique label -# Required to support jobset and lws controllers in the same namespace ---- -apiVersion: v1 -kind: Service -metadata: - name: lws-webhook-service -spec: - selector: - app.kubernetes.io/component: lws-controller