From bbddfc3c1796474d3cde3e749489cad3c52f1390 Mon Sep 17 00:00:00 2001
From: Yuan Tang <terrytangyuan@gmail.com>
Date: Tue, 23 Aug 2022 00:46:56 -0400
Subject: [PATCH] chore: Remove deprecated metrics service from manifests
 (#9399)

Signed-off-by: Yuan Tang <terrytangyuan@gmail.com>

Signed-off-by: Yuan Tang <terrytangyuan@gmail.com>
---
 .../workflow-controller/kustomization.yaml    |  1 -
 .../workflow-controller-metrics-service.yaml  | 19 ------------------
 manifests/quick-start-minimal.yaml            | 20 -------------------
 manifests/quick-start-mysql.yaml              | 20 -------------------
 manifests/quick-start-postgres.yaml           | 20 -------------------
 5 files changed, 80 deletions(-)
 delete mode 100644 manifests/base/workflow-controller/workflow-controller-metrics-service.yaml

diff --git a/manifests/base/workflow-controller/kustomization.yaml b/manifests/base/workflow-controller/kustomization.yaml
index 0168142a3d0d..a0192952c890 100644
--- a/manifests/base/workflow-controller/kustomization.yaml
+++ b/manifests/base/workflow-controller/kustomization.yaml
@@ -5,5 +5,4 @@ resources:
 - workflow-controller-configmap.yaml
 - workflow-controller-deployment.yaml
 - workflow-controller-sa.yaml
-- workflow-controller-metrics-service.yaml
 - workflow-controller-priorityclass.yaml
diff --git a/manifests/base/workflow-controller/workflow-controller-metrics-service.yaml b/manifests/base/workflow-controller/workflow-controller-metrics-service.yaml
deleted file mode 100644
index cdd572b1300c..000000000000
--- a/manifests/base/workflow-controller/workflow-controller-metrics-service.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: workflow-controller-metrics
-  labels:
-    app: workflow-controller
-  annotations:
-    workflows.argoproj.io/description: |
-      This service is deprecated. It will be removed in v3.4.
-      
-      https://github.com/argoproj/argo-workflows/issues/8441
-spec:
-  selector:
-    app: workflow-controller
-  ports:
-    - name: metrics
-      port: 9090
-      targetPort: 9090
-      protocol: TCP
diff --git a/manifests/quick-start-minimal.yaml b/manifests/quick-start-minimal.yaml
index 25534ee6f709..5fe8a45864e5 100644
--- a/manifests/quick-start-minimal.yaml
+++ b/manifests/quick-start-minimal.yaml
@@ -1611,26 +1611,6 @@ spec:
   selector:
     app: minio
 ---
-apiVersion: v1
-kind: Service
-metadata:
-  annotations:
-    workflows.argoproj.io/description: |
-      This service is deprecated. It will be removed in v3.4.
-
-      https://github.com/argoproj/argo-workflows/issues/8441
-  labels:
-    app: workflow-controller
-  name: workflow-controller-metrics
-spec:
-  ports:
-  - name: metrics
-    port: 9090
-    protocol: TCP
-    targetPort: 9090
-  selector:
-    app: workflow-controller
----
 apiVersion: scheduling.k8s.io/v1
 kind: PriorityClass
 metadata:
diff --git a/manifests/quick-start-mysql.yaml b/manifests/quick-start-mysql.yaml
index 983ae74a0299..37f7d52299b1 100644
--- a/manifests/quick-start-mysql.yaml
+++ b/manifests/quick-start-mysql.yaml
@@ -1655,26 +1655,6 @@ spec:
   selector:
     app: mysql
 ---
-apiVersion: v1
-kind: Service
-metadata:
-  annotations:
-    workflows.argoproj.io/description: |
-      This service is deprecated. It will be removed in v3.4.
-
-      https://github.com/argoproj/argo-workflows/issues/8441
-  labels:
-    app: workflow-controller
-  name: workflow-controller-metrics
-spec:
-  ports:
-  - name: metrics
-    port: 9090
-    protocol: TCP
-    targetPort: 9090
-  selector:
-    app: workflow-controller
----
 apiVersion: scheduling.k8s.io/v1
 kind: PriorityClass
 metadata:
diff --git a/manifests/quick-start-postgres.yaml b/manifests/quick-start-postgres.yaml
index 7161d947209c..97ac6c6ff1de 100644
--- a/manifests/quick-start-postgres.yaml
+++ b/manifests/quick-start-postgres.yaml
@@ -1655,26 +1655,6 @@ spec:
   selector:
     app: postgres
 ---
-apiVersion: v1
-kind: Service
-metadata:
-  annotations:
-    workflows.argoproj.io/description: |
-      This service is deprecated. It will be removed in v3.4.
-
-      https://github.com/argoproj/argo-workflows/issues/8441
-  labels:
-    app: workflow-controller
-  name: workflow-controller-metrics
-spec:
-  ports:
-  - name: metrics
-    port: 9090
-    protocol: TCP
-    targetPort: 9090
-  selector:
-    app: workflow-controller
----
 apiVersion: scheduling.k8s.io/v1
 kind: PriorityClass
 metadata: