fix: decouple service from drone config

This commit is contained in:
Markus Pesch 2022-05-16 20:38:45 +02:00
parent 925c713364
commit d968cce280
Signed by: volker.raschek
GPG Key ID: 852BCC170D81A982
3 changed files with 8 additions and 6 deletions

View File

@ -28,9 +28,9 @@ spec:
imagePullPolicy: {{ .Values.image.pullPolicy }} imagePullPolicy: {{ .Values.image.pullPolicy }}
livenessProbe: livenessProbe:
httpGet: httpGet:
scheme: {{ .Values.config.DRONE_SERVER_PROTO | upper | default "HTTP" }} scheme: HTTP
path: /healthz path: /healthz
port: {{ .Values.config.DRONE_SERVER_PROTO | default "http" }} port: http
ports: ports:
- name: http - name: http
containerPort: 80 containerPort: 80
@ -40,9 +40,9 @@ spec:
protocol: TCP protocol: TCP
readinessProbe: readinessProbe:
httpGet: httpGet:
scheme: {{ .Values.config.DRONE_SERVER_PROTO | upper | default "HTTP" }} scheme: HTTP
path: /healthz path: /healthz
port: {{ .Values.config.DRONE_SERVER_PROTO | default "http" }} port: http
resources: resources:
{{- toYaml .Values.resources | nindent 12 }} {{- toYaml .Values.resources | nindent 12 }}
{{- if .Values.config.DRONE_DATABASE_DRIVER | default "sqlite3" | eq "sqlite3" }} {{- if .Values.config.DRONE_DATABASE_DRIVER | default "sqlite3" | eq "sqlite3" }}

View File

@ -29,8 +29,8 @@ spec:
type: {{ .Values.service.type }} type: {{ .Values.service.type }}
ports: ports:
- port: {{ .Values.service.port }} - port: {{ .Values.service.port }}
targetPort: {{ .Values.config.DRONE_SERVER_PROTO | default "http" }} targetPort: {{ .Values.service.targetPort }}
protocol: TCP protocol: TCP
name: {{ .Values.config.DRONE_SERVER_PROTO | default "http" }} name: {{ .Values.service.name }}
selector: selector:
{{- include "drone.selectorLabels" . | nindent 4 }} {{- include "drone.selectorLabels" . | nindent 4 }}

View File

@ -533,6 +533,8 @@ service:
# loadBalancerIP: "" # loadBalancerIP: ""
# loadBalancerSourceRanges: [] # loadBalancerSourceRanges: []
# internalTrafficPolicy: "Cluster" # internalTrafficPolicy: "Cluster"
name: http
targetPort: 80
type: ClusterIP type: ClusterIP
port: 80 port: 80