保防止测试修改

clickhouse/templates/service-headless.yaml

@@ -26,44 +26,44 @@ spec:
       targetPort: http
       port: {{ .Values.service.ports.http }}
       protocol: TCP
-    - name: tcp
-      targetPort: tcp
-      port: {{ .Values.service.ports.tcp }}
-      protocol: TCP
-    {{- if .Values.tls.enabled }}
-    - name: tcp-secure
-      targetPort: tcp-secure
-      port: {{ .Values.service.ports.tcpSecure }}
-      protocol: TCP
-    {{- end }}
-    {{- if .Values.keeper.enabled }}
-    - name: tcp-keeper
-      targetPort: tcp-keeper
-      port: {{ .Values.service.ports.keeper }}
-      protocol: TCP
-    - name: tcp-keeperinter
-      targetPort: tcp-keeperinter
-      port: {{ .Values.service.ports.keeperInter }}
-      protocol: TCP
-    {{- if .Values.tls.enabled }}
-    - name: tcp-keepertls
-      targetPort: tcp-keepertls
-      port: {{ .Values.service.ports.keeperSecure }}
-      protocol: TCP
-    {{- end }}
-    {{- end }}
-    - name: tcp-mysql
-      targetPort: tcp-mysql
-      port: {{ .Values.service.ports.mysql }}
-      protocol: TCP
-    - name: tcp-postgresql
-      targetPort: tcp-postgresql
-      port: {{ .Values.service.ports.postgresql }}
-      protocol: TCP
-    - name: http-intersrv
-      targetPort: http-intersrv
-      port: {{ .Values.service.ports.interserver }}
-      protocol: TCP
+    #- name: tcp
+    #  targetPort: tcp
+    #  port: {{ .Values.service.ports.tcp }}
+    #  protocol: TCP
+    #{{- if .Values.tls.enabled }}
+    #- name: tcp-secure
+    #  targetPort: tcp-secure
+    #  port: {{ .Values.service.ports.tcpSecure }}
+    #  protocol: TCP
+    #{{- end }}
+    #{{- if .Values.keeper.enabled }}
+    #- name: tcp-keeper
+    #  targetPort: tcp-keeper
+    #  port: {{ .Values.service.ports.keeper }}
+    #  protocol: TCP
+    #- name: tcp-keeperinter
+    #  targetPort: tcp-keeperinter
+    #  port: {{ .Values.service.ports.keeperInter }}
+    #  protocol: TCP
+    #{{- if .Values.tls.enabled }}
+    #- name: tcp-keepertls
+    #  targetPort: tcp-keepertls
+    #  port: {{ .Values.service.ports.keeperSecure }}
+    #  protocol: TCP
+    #{{- end }}
+    #{{- end }}
+    #- name: tcp-mysql
+    #  targetPort: tcp-mysql
+    #  port: {{ .Values.service.ports.mysql }}
+    #  protocol: TCP
+    #- name: tcp-postgresql
+    #  targetPort: tcp-postgresql
+    #  port: {{ .Values.service.ports.postgresql }}
+    #  protocol: TCP
+    #- name: http-intersrv
+    #  targetPort: http-intersrv
+    #  port: {{ .Values.service.ports.interserver }}
+    #  protocol: TCP
     {{- if .Values.service.extraPorts }}
     {{- include "common.tplvalues.render" (dict "value" .Values.service.extraPorts "context" $) | nindent 4 }}
     {{- end }}

clickhouse/templates/service.yaml

@@ -39,7 +39,7 @@ spec:
   {{- end }}
   ports:
     - name: http
-      targetPort: http
+      targetPort: 8123
       port: {{ .Values.service.ports.http }}
       protocol: TCP
       {{- if and (or (eq .Values.service.type "NodePort") (eq .Values.service.type "LoadBalancer")) (not (empty .Values.service.nodePorts.http)) }}
@@ -47,108 +47,108 @@ spec:
       {{- else if eq .Values.service.type "ClusterIP" }}
       nodePort: null
       {{- end }}
-    {{- if .Values.tls.enabled }}
-    - name: https
-      targetPort: https
-      port: {{ .Values.service.ports.https }}
-      protocol: TCP
-      {{- if and (or (eq .Values.service.type "NodePort") (eq .Values.service.type "LoadBalancer")) (not (empty .Values.service.nodePorts.https)) }}
-      nodePort: {{ .Values.service.nodePorts.https }}
-      {{- else if eq .Values.service.type "ClusterIP" }}
-      nodePort: null
-      {{- end }}
-    {{- end }}
-    - name: tcp
-      targetPort: tcp
-      port: {{ .Values.service.ports.tcp }}
-      protocol: TCP
-      {{- if and (or (eq .Values.service.type "NodePort") (eq .Values.service.type "LoadBalancer")) (not (empty .Values.service.nodePorts.tcp)) }}
-      nodePort: {{ .Values.service.nodePorts.tcp }}
-      {{- else if eq .Values.service.type "ClusterIP" }}
-      nodePort: null
-      {{- end }}
-    {{- if .Values.tls.enabled }}
-    - name: tcp-secure
-      targetPort: tcp-secure
-      port: {{ .Values.service.ports.tcpSecure }}
-      protocol: TCP
-      {{- if and (or (eq .Values.service.type "NodePort") (eq .Values.service.type "LoadBalancer")) (not (empty .Values.service.nodePorts.tcpSecure)) }}
-      nodePort: {{ .Values.service.nodePorts.tcpSecure }}
-      {{- else if eq .Values.service.type "ClusterIP" }}
-      nodePort: null
-      {{- end }}
-    {{- end }}
-    {{- if .Values.keeper.enabled }}
-    - name: tcp-keeper
-      targetPort: tcp-keeper
-      port: {{ .Values.service.ports.keeper }}
-      protocol: TCP
-      {{- if and (or (eq .Values.service.type "NodePort") (eq .Values.service.type "LoadBalancer")) (not (empty .Values.service.nodePorts.tcp)) }}
-      nodePort: {{ .Values.service.nodePorts.keeper }}
-      {{- else if eq .Values.service.type "ClusterIP" }}
-      nodePort: null
-      {{- end }}
-    - name: tcp-keeperinter
-      targetPort: tcp-keeperinter
-      port: {{ .Values.service.ports.keeperInter }}
-      protocol: TCP
-      {{- if and (or (eq .Values.service.type "NodePort") (eq .Values.service.type "LoadBalancer")) (not (empty .Values.service.nodePorts.tcp)) }}
-      nodePort: {{ .Values.service.nodePorts.keeperInter }}
-      {{- else if eq .Values.service.type "ClusterIP" }}
-      nodePort: null
-      {{- end }}
-    {{- if .Values.tls.enabled }}
-    - name: tcp-keepertls
-      targetPort: tcp-keepertls
-      port: {{ .Values.service.ports.keeperSecure }}
-      protocol: TCP
-      {{- if and (or (eq .Values.service.type "NodePort") (eq .Values.service.type "LoadBalancer")) (not (empty .Values.service.nodePorts.tcpSecure)) }}
-      nodePort: {{ .Values.service.nodePorts.keeperSecure }}
-      {{- else if eq .Values.service.type "ClusterIP" }}
-      nodePort: null
-      {{- end }}
-    {{- end }}
-    {{- end }}
-    - name: tcp-mysql
-      targetPort: tcp-mysql
-      port: {{ .Values.service.ports.mysql }}
-      protocol: TCP
-      {{- if and (or (eq .Values.service.type "NodePort") (eq .Values.service.type "LoadBalancer")) (not (empty .Values.service.nodePorts.mysql)) }}
-      nodePort: {{ .Values.service.nodePorts.mysql }}
-      {{- else if eq .Values.service.type "ClusterIP" }}
-      nodePort: null
-      {{- end }}
-    - name: tcp-postgresql
-      targetPort: tcp-postgresql
-      port: {{ .Values.service.ports.postgresql }}
-      protocol: TCP
-      {{- if and (or (eq .Values.service.type "NodePort") (eq .Values.service.type "LoadBalancer")) (not (empty .Values.service.nodePorts.postgresql)) }}
-      nodePort: {{ .Values.service.nodePorts.postgresql }}
-      {{- else if eq .Values.service.type "ClusterIP" }}
-      nodePort: null
-      {{- end }}
-    - name: http-intersrv
-      targetPort: http-intersrv
-      port: {{ .Values.service.ports.interserver }}
-      protocol: TCP
-      {{- if and (or (eq .Values.service.type "NodePort") (eq .Values.service.type "LoadBalancer")) (not (empty .Values.service.nodePorts.interserver)) }}
-      nodePort: {{ .Values.service.nodePorts.interserver }}
-      {{- else if eq .Values.service.type "ClusterIP" }}
-      nodePort: null
-      {{- end }}
-    {{- if .Values.metrics.enabled }}
-    - name: http-metrics
-      targetPort: http-metrics
-      port: {{ .Values.service.ports.metrics }}
-      protocol: TCP
-      {{- if and (or (eq .Values.service.type "NodePort") (eq .Values.service.type "LoadBalancer")) (not (empty .Values.service.nodePorts.metrics)) }}
-      nodePort: {{ .Values.service.nodePorts.metrics }}
-      {{- else if eq .Values.service.type "ClusterIP" }}
-      nodePort: null
-      {{- end }}
-    {{- end }}
-    {{- if .Values.service.extraPorts }}
-    {{- include "common.tplvalues.render" (dict "value" .Values.service.extraPorts "context" $) | nindent 4 }}
-    {{- end }}
+    #{{- if .Values.tls.enabled }}
+    #- name: https
+    #  targetPort: https
+    #  port: {{ .Values.service.ports.https }}
+    #  protocol: TCP
+    #  {{- if and (or (eq .Values.service.type "NodePort") (eq .Values.service.type "LoadBalancer")) (not (empty .Values.service.nodePorts.https)) }}
+    #  nodePort: {{ .Values.service.nodePorts.https }}
+    #  {{- else if eq .Values.service.type "ClusterIP" }}
+    #  nodePort: null
+    #  {{- end }}
+    #{{- end }}
+    #- name: tcp
+    #  targetPort: tcp
+    #  port: {{ .Values.service.ports.tcp }}
+    #  protocol: TCP
+    #  {{- if and (or (eq .Values.service.type "NodePort") (eq .Values.service.type "LoadBalancer")) (not (empty .Values.service.nodePorts.tcp)) }}
+    #  nodePort: {{ .Values.service.nodePorts.tcp }}
+    #  {{- else if eq .Values.service.type "ClusterIP" }}
+    #  nodePort: null
+    #  {{- end }}
+    #{{- if .Values.tls.enabled }}
+    #- name: tcp-secure
+    #  targetPort: tcp-secure
+    #  port: {{ .Values.service.ports.tcpSecure }}
+    #  protocol: TCP
+    #  {{- if and (or (eq .Values.service.type "NodePort") (eq .Values.service.type "LoadBalancer")) (not (empty .Values.service.nodePorts.tcpSecure)) }}
+    #  nodePort: {{ .Values.service.nodePorts.tcpSecure }}
+    #  {{- else if eq .Values.service.type "ClusterIP" }}
+    #  nodePort: null
+    #  {{- end }}
+    #{{- end }}
+    #{{- if .Values.keeper.enabled }}
+    #- name: tcp-keeper
+    #  targetPort: tcp-keeper
+    #  port: {{ .Values.service.ports.keeper }}
+    #  protocol: TCP
+    #  {{- if and (or (eq .Values.service.type "NodePort") (eq .Values.service.type "LoadBalancer")) (not (empty .Values.service.nodePorts.tcp)) }}
+    #  nodePort: {{ .Values.service.nodePorts.keeper }}
+    #  {{- else if eq .Values.service.type "ClusterIP" }}
+    #  nodePort: null
+    #  {{- end }}
+    #- name: tcp-keeperinter
+    #  targetPort: tcp-keeperinter
+    #  port: {{ .Values.service.ports.keeperInter }}
+    #  protocol: TCP
+    #  {{- if and (or (eq .Values.service.type "NodePort") (eq .Values.service.type "LoadBalancer")) (not (empty .Values.service.nodePorts.tcp)) }}
+    #  nodePort: {{ .Values.service.nodePorts.keeperInter }}
+    #  {{- else if eq .Values.service.type "ClusterIP" }}
+    #  nodePort: null
+    #  {{- end }}
+    #{{- if .Values.tls.enabled }}
+    #- name: tcp-keepertls
+    #  targetPort: tcp-keepertls
+    #  port: {{ .Values.service.ports.keeperSecure }}
+    #  protocol: TCP
+    #  {{- if and (or (eq .Values.service.type "NodePort") (eq .Values.service.type "LoadBalancer")) (not (empty .Values.service.nodePorts.tcpSecure)) }}
+    #  nodePort: {{ .Values.service.nodePorts.keeperSecure }}
+    #  {{- else if eq .Values.service.type "ClusterIP" }}
+    #  nodePort: null
+    #  {{- end }}
+    #{{- end }}
+    #{{- end }}
+    #- name: tcp-mysql
+    #  targetPort: tcp-mysql
+    #  port: {{ .Values.service.ports.mysql }}
+    #  protocol: TCP
+    #  {{- if and (or (eq .Values.service.type "NodePort") (eq .Values.service.type "LoadBalancer")) (not (empty .Values.service.nodePorts.mysql)) }}
+    #  nodePort: {{ .Values.service.nodePorts.mysql }}
+    #  {{- else if eq .Values.service.type "ClusterIP" }}
+    #  nodePort: null
+    #  {{- end }}
+    #- name: tcp-postgresql
+    #  targetPort: tcp-postgresql
+    #  port: {{ .Values.service.ports.postgresql }}
+    #  protocol: TCP
+    #  {{- if and (or (eq .Values.service.type "NodePort") (eq .Values.service.type "LoadBalancer")) (not (empty .Values.service.nodePorts.postgresql)) }}
+    #  nodePort: {{ .Values.service.nodePorts.postgresql }}
+    #  {{- else if eq .Values.service.type "ClusterIP" }}
+    #  nodePort: null
+    #  {{- end }}
+    #- name: http-intersrv
+    #  targetPort: http-intersrv
+    #  port: {{ .Values.service.ports.interserver }}
+    #  protocol: TCP
+    #  {{- if and (or (eq .Values.service.type "NodePort") (eq .Values.service.type "LoadBalancer")) (not (empty .Values.service.nodePorts.interserver)) }}
+    #  nodePort: {{ .Values.service.nodePorts.interserver }}
+    #  {{- else if eq .Values.service.type "ClusterIP" }}
+    #  nodePort: null
+    #  {{- end }}
+    #{{- if .Values.metrics.enabled }}
+    #- name: http-metrics
+    #  targetPort: http-metrics
+    #  port: {{ .Values.service.ports.metrics }}
+    #  protocol: TCP
+    #  {{- if and (or (eq .Values.service.type "NodePort") (eq .Values.service.type "LoadBalancer")) (not (empty .Values.service.nodePorts.metrics)) }}
+    #  nodePort: {{ .Values.service.nodePorts.metrics }}
+    #  {{- else if eq .Values.service.type "ClusterIP" }}
+    #  nodePort: null
+    #  {{- end }}
+    #{{- end }}
+    #{{- if .Values.service.extraPorts }}
+    #{{- include "common.tplvalues.render" (dict "value" .Values.service.extraPorts "context" $) | nindent 4 }}
+    #{{- end }}
   selector: {{- include "common.labels.matchLabels" . | nindent 4 }}
     app.kubernetes.io/component: clickhouse