diff --git a/templates/koko/service-koko-web.yaml b/templates/koko/service-koko-web.yaml deleted file mode 100644 index 9e12a4e..0000000 --- a/templates/koko/service-koko-web.yaml +++ /dev/null @@ -1,29 +0,0 @@ -{{- if .Values.koko.enabled }} -{{- with .Values.koko }} -{{- $fullName := printf "%s-%s" (include "jumpserver.fullname" $) "jms-koko-web" }} -apiVersion: v1 -kind: Service -metadata: - name: {{ $fullName }} - labels: - {{- include "jumpserver.labels" $ | nindent 4 }} - {{- toYaml .labels | nindent 4 }} - annotations: - {{- toYaml .service.annotations | nindent 4 }} -spec: - type: {{ .service.web.type }} - ports: - - port: {{ .service.web.port }} - targetPort: web - protocol: TCP - name: web - sessionAffinity: ClientIP - sessionAffinityConfig: - clientIP: - timeoutSeconds: 10800 - selector: - app.kubernetes.io/name: {{ include "jumpserver.name" $ }} - app.kubernetes.io/instance: {{ $.Release.Name }} - {{- toYaml .labels | nindent 4 }} -{{- end }} -{{- end }} diff --git a/templates/koko/service-koko-ssh.yaml b/templates/koko/service-koko.yaml similarity index 84% rename from templates/koko/service-koko-ssh.yaml rename to templates/koko/service-koko.yaml index 8b4c257..268bd1d 100644 --- a/templates/koko/service-koko-ssh.yaml +++ b/templates/koko/service-koko.yaml @@ -1,6 +1,6 @@ {{- if .Values.koko.enabled }} {{- with .Values.koko }} -{{- $fullName := printf "%s-%s" (include "jumpserver.fullname" $) "jms-koko-ssh" }} +{{- $fullName := printf "%s-%s" (include "jumpserver.fullname" $) "jms-koko" }} apiVersion: v1 kind: Service metadata: @@ -11,8 +11,12 @@ metadata: annotations: {{- toYaml .service.annotations | nindent 4 }} spec: - type: {{ .service.ssh.type }} + type: {{ .service.type }} ports: + - port: {{ .service.web.port }} + targetPort: web + protocol: TCP + name: web - port: {{ .service.ssh.port }} targetPort: ssh protocol: TCP diff --git a/values.yaml b/values.yaml index 009f8a0..b0203e5 100644 --- a/values.yaml +++ b/values.yaml @@ -202,12 +202,10 @@ koko: # runAsUser: 1000 service: + type: ClusterIP web: - type: ClusterIP port: 5000 ssh: - type: ClusterIP - # loadBalancerIP: port: 2222 resources: {}