Merge pull request #1698 from P4sca1/helm-service-labels
feat(helm): allow to specify service labels
This commit is contained in:
@@ -217,7 +217,7 @@ The password should be provided with the `SHUFFLE_OPENSEARCH_PASSWORD` env varia
|
||||
| `backend.affinity` | Affinity for backend pods assignment | `{}` |
|
||||
| `backend.nodeSelector` | Node labels for backend pods assignment | `{}` |
|
||||
| `backend.tolerations` | Tolerations for backend pods assignment | `[]` |
|
||||
| `backend.updateStrategy.type` | backend deployment strategy type | `RollingUpdate` |
|
||||
| `backend.updateStrategy.type` | backend deployment strategy type | `Recreate` |
|
||||
| `backend.priorityClassName` | backend pods' priorityClassName | `""` |
|
||||
| `backend.topologySpreadConstraints` | Topology Spread Constraints for backend pod assignment spread across your cluster among failure-domains | `[]` |
|
||||
| `backend.schedulerName` | Name of the k8s scheduler (other than default) for backend pods | `""` |
|
||||
@@ -244,6 +244,7 @@ The password should be provided with the `SHUFFLE_OPENSEARCH_PASSWORD` env varia
|
||||
| `backend.autoscaling.hpa.maxReplicas` | Maximum number of replicas | `""` |
|
||||
| `backend.autoscaling.hpa.targetCPU` | Target CPU utilization percentage | `""` |
|
||||
| `backend.autoscaling.hpa.targetMemory` | Target Memory utilization percentage | `""` |
|
||||
| `backend.service.labels` | Extra labels for backend service | `{}` |
|
||||
| `backend.serviceAccount.create` | Specifies whether a ServiceAccount should be created | `true` |
|
||||
| `backend.serviceAccount.name` | The name of the ServiceAccount to use. | `""` |
|
||||
| `backend.serviceAccount.annotations` | Additional Service Account annotations (evaluated as a template) | `{}` |
|
||||
@@ -359,6 +360,7 @@ The password should be provided with the `SHUFFLE_OPENSEARCH_PASSWORD` env varia
|
||||
| `frontend.autoscaling.hpa.maxReplicas` | Maximum number of replicas | `""` |
|
||||
| `frontend.autoscaling.hpa.targetCPU` | Target CPU utilization percentage | `""` |
|
||||
| `frontend.autoscaling.hpa.targetMemory` | Target Memory utilization percentage | `""` |
|
||||
| `frontend.service.labels` | Extra labels for frontend service | `{}` |
|
||||
| `frontend.serviceAccount.create` | Specifies whether a ServiceAccount should be created | `true` |
|
||||
| `frontend.serviceAccount.name` | The name of the ServiceAccount to use. | `""` |
|
||||
| `frontend.serviceAccount.annotations` | Additional Service Account annotations (evaluated as a template) | `{}` |
|
||||
|
||||
@@ -3,7 +3,8 @@ kind: Service
|
||||
metadata:
|
||||
name: {{ template "shuffle.backend.name" . }}
|
||||
namespace: {{ include "common.names.namespace" . | quote }}
|
||||
labels: {{- include "shuffle.backend.labels" (dict "customLabels" .Values.commonLabels "context" $) | nindent 4 }}
|
||||
{{- $serviceLabels := include "common.tplvalues.merge" (dict "values" (list .Values.backend.service.labels .Values.commonLabels) "context" .) }}
|
||||
labels: {{- include "shuffle.backend.labels" (dict "customLabels" $serviceLabels "context" $) | nindent 4 }}
|
||||
{{- if .Values.commonAnnotations }}
|
||||
annotations: {{- include "common.tplvalues.render" (dict "value" .Values.commonAnnotations "context" $) | nindent 4 }}
|
||||
{{- end }}
|
||||
@@ -14,5 +15,6 @@ spec:
|
||||
port: {{ .Values.backend.containerPorts.http }}
|
||||
targetPort: http
|
||||
protocol: TCP
|
||||
appProtocol: http
|
||||
{{- $podLabels := include "common.tplvalues.merge" (dict "values" (list .Values.backend.podLabels .Values.commonLabels) "context" .) }}
|
||||
selector: {{- include "shuffle.backend.matchLabels" (dict "customLabels" $podLabels "context" $) | nindent 4 }}
|
||||
|
||||
@@ -3,7 +3,8 @@ kind: Service
|
||||
metadata:
|
||||
name: {{ template "shuffle.frontend.name" . }}
|
||||
namespace: {{ include "common.names.namespace" . | quote }}
|
||||
labels: {{- include "shuffle.frontend.labels" (dict "customLabels" .Values.commonLabels "context" $) | nindent 4 }}
|
||||
{{- $serviceLabels := include "common.tplvalues.merge" (dict "values" (list .Values.frontend.service.labels .Values.commonLabels) "context" .) }}
|
||||
labels: {{- include "shuffle.frontend.labels" (dict "customLabels" $serviceLabels "context" $) | nindent 4 }}
|
||||
{{- if .Values.commonAnnotations }}
|
||||
annotations: {{- include "common.tplvalues.render" (dict "value" .Values.commonAnnotations "context" $) | nindent 4 }}
|
||||
{{- end }}
|
||||
@@ -14,11 +15,13 @@ spec:
|
||||
port: {{ .Values.frontend.containerPorts.http }}
|
||||
targetPort: http
|
||||
protocol: TCP
|
||||
appProtocol: http
|
||||
{{- if .Values.frontend.containerPorts.https }}
|
||||
- name: https
|
||||
port: {{ .Values.frontend.containerPorts.https }}
|
||||
targetPort: https
|
||||
protocol: TCP
|
||||
appProtocol: https
|
||||
{{- end }}
|
||||
{{- $podLabels := include "common.tplvalues.merge" (dict "values" (list .Values.frontend.podLabels .Values.commonLabels) "context" .) }}
|
||||
selector: {{- include "shuffle.frontend.matchLabels" (dict "customLabels" $podLabels "context" $) | nindent 4 }}
|
||||
|
||||
@@ -517,7 +517,7 @@
|
||||
"type": {
|
||||
"type": "string",
|
||||
"description": "backend deployment strategy type",
|
||||
"default": "RollingUpdate"
|
||||
"default": "Recreate"
|
||||
}
|
||||
}
|
||||
},
|
||||
@@ -683,6 +683,16 @@
|
||||
}
|
||||
}
|
||||
},
|
||||
"service": {
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"labels": {
|
||||
"type": "object",
|
||||
"description": "Extra labels for backend service",
|
||||
"default": {}
|
||||
}
|
||||
}
|
||||
},
|
||||
"serviceAccount": {
|
||||
"type": "object",
|
||||
"properties": {
|
||||
@@ -1362,6 +1372,16 @@
|
||||
}
|
||||
}
|
||||
},
|
||||
"service": {
|
||||
"type": "object",
|
||||
"properties": {
|
||||
"labels": {
|
||||
"type": "object",
|
||||
"description": "Extra labels for frontend service",
|
||||
"default": {}
|
||||
}
|
||||
}
|
||||
},
|
||||
"serviceAccount": {
|
||||
"type": "object",
|
||||
"properties": {
|
||||
|
||||
@@ -310,14 +310,14 @@ backend:
|
||||
## ref: https://kubernetes.io/docs/concepts/configuration/taint-and-toleration/
|
||||
##
|
||||
tolerations: []
|
||||
## ONLY FOR DEPLOYMENTS:
|
||||
## @param backend.updateStrategy.type backend deployment strategy type
|
||||
## ref: https://kubernetes.io/docs/concepts/workloads/controllers/deployment/#strategy
|
||||
##
|
||||
updateStrategy:
|
||||
## Can be set to RollingUpdate or Recreate
|
||||
## Backend uses ReadWriteOnce volumes by default, which is incompatible with RollingUpdate
|
||||
##
|
||||
type: RollingUpdate
|
||||
type: Recreate
|
||||
## @param backend.priorityClassName backend pods' priorityClassName
|
||||
##
|
||||
priorityClassName: ""
|
||||
@@ -421,6 +421,14 @@ backend:
|
||||
targetCPU: ""
|
||||
targetMemory: ""
|
||||
|
||||
## Service configuration
|
||||
##
|
||||
service:
|
||||
## @param backend.service.labels Extra labels for backend service
|
||||
## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/
|
||||
##
|
||||
labels: {}
|
||||
|
||||
## ServiceAccount configuration
|
||||
##
|
||||
serviceAccount:
|
||||
@@ -870,6 +878,14 @@ frontend:
|
||||
targetCPU: ""
|
||||
targetMemory: ""
|
||||
|
||||
## Service configuration
|
||||
##
|
||||
service:
|
||||
## @param frontend.service.labels Extra labels for frontend service
|
||||
## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/
|
||||
##
|
||||
labels: {}
|
||||
|
||||
## ServiceAccount configuration
|
||||
##
|
||||
serviceAccount:
|
||||
|
||||
Reference in New Issue
Block a user