Move charts executor service to the right place (#1343)

charts/fission-all/templates/deployment.yaml

@@ -178,22 +178,6 @@ spec:
 {{ toYaml .Values.extraCoreComponentPodConfig | indent 6 -}}
 {{- end }}
 
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: executor
-  labels:
-    svc: executor
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-spec:
-  type: ClusterIP
-  ports:
-  - port: 80
-    targetPort: 8888
-  selector:
-    svc: executor
-
 ---
 apiVersion: apps/v1
 kind: Deployment

charts/fission-all/templates/svc.yaml

@@ -77,3 +77,19 @@ spec:
     targetPort: 8000
   selector:
     svc: storagesvc
+
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: executor
+  labels:
+    svc: executor
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+spec:
+  type: ClusterIP
+  ports:
+    - port: 80
+      targetPort: 8888
+  selector:
+    svc: executor

charts/fission-core/templates/deployment.yaml

@@ -178,22 +178,6 @@ spec:
 {{- end }}
 
 
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: executor
-  labels:
-    svc: executor
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-spec:
-  type: ClusterIP
-  ports:
-  - port: 80
-    targetPort: 8888
-  selector:
-    svc: executor
-
 ---
 apiVersion: apps/v1
 kind: Deployment

charts/fission-core/templates/svc.yaml

@@ -57,3 +57,19 @@ spec:
     targetPort: 8000
   selector:
     svc: storagesvc
+
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: executor
+  labels:
+    svc: executor
+    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
+spec:
+  type: ClusterIP
+  ports:
+    - port: 80
+      targetPort: 8888
+  selector:
+    svc: executor