From 9681d859995af199da3f85112ecbc6fa1b472c3f Mon Sep 17 00:00:00 2001 From: Denis Krivenko Date: Mon, 8 May 2023 18:15:37 +0200 Subject: [PATCH] chore(helm): Split service templates into separate files (#23923) --- helm/superset/templates/service-flower.yaml | 50 +++++++++++++++ helm/superset/templates/service-ws.yaml | 50 +++++++++++++++ helm/superset/templates/service.yaml | 64 ------------------- ...rvice-account.yaml => serviceaccount.yaml} | 0 4 files changed, 100 insertions(+), 64 deletions(-) create mode 100644 helm/superset/templates/service-flower.yaml create mode 100644 helm/superset/templates/service-ws.yaml rename helm/superset/templates/{service-account.yaml => serviceaccount.yaml} (100%) mode change 100755 => 100644 diff --git a/helm/superset/templates/service-flower.yaml b/helm/superset/templates/service-flower.yaml new file mode 100644 index 0000000000000..8c198891b0a57 --- /dev/null +++ b/helm/superset/templates/service-flower.yaml @@ -0,0 +1,50 @@ +{{/* + + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +*/}} + +{{- if .Values.supersetCeleryFlower.enabled }} +apiVersion: v1 +kind: Service +metadata: + name: "{{ template "superset.fullname" . }}-flower" + namespace: {{ .Release.Namespace }} + labels: + app: {{ template "superset.name" . }} + chart: {{ template "superset.chart" . }} + release: {{ .Release.Name }} + heritage: {{ .Release.Service }} + {{- with .Values.supersetCeleryFlower.service.annotations }} + annotations: {{- toYaml . | nindent 4 }} + {{- end }} +spec: + type: {{ .Values.supersetCeleryFlower.service.type }} + ports: + - port: {{ .Values.supersetCeleryFlower.service.port }} + targetPort: flower + protocol: TCP + name: flower + {{- if and (or (eq .Values.supersetCeleryFlower.service.type "NodePort") (eq .Values.supersetCeleryFlower.service.type "LoadBalancer")) (not (empty .Values.supersetCeleryFlower.service.nodePort.http)) }} + nodePort: {{ .Values.supersetCeleryFlower.service.nodePort.http }} + {{- end }} + selector: + app: {{ template "superset.name" . }}-flower + release: {{ .Release.Name }} + {{- if .Values.supersetCeleryFlower.service.loadBalancerIP }} + loadBalancerIP: {{ .Values.supersetCeleryFlower.service.loadBalancerIP }} + {{- end }} +{{- end }} diff --git a/helm/superset/templates/service-ws.yaml b/helm/superset/templates/service-ws.yaml new file mode 100644 index 0000000000000..3dd02b77a6d2e --- /dev/null +++ b/helm/superset/templates/service-ws.yaml @@ -0,0 +1,50 @@ +{{/* + + Licensed to the Apache Software Foundation (ASF) under one or more + contributor license agreements. See the NOTICE file distributed with + this work for additional information regarding copyright ownership. + The ASF licenses this file to You under the Apache License, Version 2.0 + (the "License"); you may not use this file except in compliance with + the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +*/}} + +{{- if .Values.supersetWebsockets.enabled }} +apiVersion: v1 +kind: Service +metadata: + name: "{{ template "superset.fullname" . }}-ws" + namespace: {{ .Release.Namespace }} + labels: + app: {{ template "superset.name" . }} + chart: {{ template "superset.chart" . }} + release: {{ .Release.Name }} + heritage: {{ .Release.Service }} + {{- with .Values.supersetWebsockets.service.annotations }} + annotations: {{- toYaml . | nindent 4 }} + {{- end }} +spec: + type: {{ .Values.supersetWebsockets.service.type }} + ports: + - port: {{ .Values.supersetWebsockets.service.port }} + targetPort: ws + protocol: TCP + name: ws + {{- if and (or (eq .Values.supersetWebsockets.service.type "NodePort") (eq .Values.supersetWebsockets.service.type "LoadBalancer")) (not (empty .Values.supersetWebsockets.service.nodePort.http)) }} + nodePort: {{ .Values.supersetWebsockets.service.nodePort.http }} + {{- end }} + selector: + app: "{{ template "superset.name" . }}-ws" + release: {{ .Release.Name }} + {{- if .Values.supersetWebsockets.service.loadBalancerIP }} + loadBalancerIP: {{ .Values.supersetWebsockets.service.loadBalancerIP }} + {{- end }} +{{- end }} diff --git a/helm/superset/templates/service.yaml b/helm/superset/templates/service.yaml index 04d14dbaeb149..f20c80c78d9ce 100644 --- a/helm/superset/templates/service.yaml +++ b/helm/superset/templates/service.yaml @@ -46,67 +46,3 @@ spec: {{- if .Values.service.loadBalancerIP }} loadBalancerIP: {{ .Values.service.loadBalancerIP }} {{- end }} ---- -{{- if .Values.supersetCeleryFlower.enabled }} -apiVersion: v1 -kind: Service -metadata: - name: "{{ template "superset.fullname" . }}-flower" - namespace: {{ .Release.Namespace }} - labels: - app: {{ template "superset.name" . }} - chart: {{ template "superset.chart" . }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} - {{- with .Values.supersetCeleryFlower.service.annotations }} - annotations: {{- toYaml . | nindent 4 }} - {{- end }} -spec: - type: {{ .Values.supersetCeleryFlower.service.type }} - ports: - - port: {{ .Values.supersetCeleryFlower.service.port }} - targetPort: flower - protocol: TCP - name: flower - {{- if and (or (eq .Values.supersetCeleryFlower.service.type "NodePort") (eq .Values.supersetCeleryFlower.service.type "LoadBalancer")) (not (empty .Values.supersetCeleryFlower.service.nodePort.http)) }} - nodePort: {{ .Values.supersetCeleryFlower.service.nodePort.http }} - {{- end }} - selector: - app: {{ template "superset.name" . }}-flower - release: {{ .Release.Name }} - {{- if .Values.supersetCeleryFlower.service.loadBalancerIP }} - loadBalancerIP: {{ .Values.supersetCeleryFlower.service.loadBalancerIP }} - {{- end }} -{{- end }} ---- -{{- if .Values.supersetWebsockets.enabled }} -apiVersion: v1 -kind: Service -metadata: - name: "{{ template "superset.fullname" . }}-ws" - namespace: {{ .Release.Namespace }} - labels: - app: {{ template "superset.name" . }} - chart: {{ template "superset.chart" . }} - release: {{ .Release.Name }} - heritage: {{ .Release.Service }} - {{- with .Values.supersetWebsockets.service.annotations }} - annotations: {{- toYaml . | nindent 4 }} - {{- end }} -spec: - type: {{ .Values.supersetWebsockets.service.type }} - ports: - - port: {{ .Values.supersetWebsockets.service.port }} - targetPort: ws - protocol: TCP - name: ws - {{- if and (or (eq .Values.supersetWebsockets.service.type "NodePort") (eq .Values.supersetWebsockets.service.type "LoadBalancer")) (not (empty .Values.supersetWebsockets.service.nodePort.http)) }} - nodePort: {{ .Values.supersetWebsockets.service.nodePort.http }} - {{- end }} - selector: - app: "{{ template "superset.name" . }}-ws" - release: {{ .Release.Name }} - {{- if .Values.supersetWebsockets.service.loadBalancerIP }} - loadBalancerIP: {{ .Values.supersetWebsockets.service.loadBalancerIP }} - {{- end }} -{{- end }} diff --git a/helm/superset/templates/service-account.yaml b/helm/superset/templates/serviceaccount.yaml old mode 100755 new mode 100644 similarity index 100% rename from helm/superset/templates/service-account.yaml rename to helm/superset/templates/serviceaccount.yaml