Compare commits

...

No commits in common. "fb5d087b274bc6e2c53c62877e5214219a98ccc4" and "78f329b4cd3a2e08c2bd507931fda73d9083ba99" have entirely different histories.

2 changed files with 5 additions and 13 deletions

View File

@ -1,13 +1,13 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: {{ include "drone.fullname" . }}
name: {{ include "droneRunner.fullname" . }}
labels:
{{- include "drone.labels" . | nindent 4 }}
{{- include "droneRunner.labels" . | nindent 4 }}
spec:
selector:
matchLabels:
{{- include "drone.selectorLabels" . | nindent 6 }}
{{- include "droneRunner.selectorLabels" . | nindent 6 }}
template:
metadata:
{{- with .Values.podAnnotations }}
@ -15,7 +15,7 @@ spec:
{{- toYaml . | nindent 8 }}
{{- end }}
labels:
{{- include "drone.selectorLabels" . | nindent 8 }}
{{- include "droneRunner.selectorLabels" . | nindent 8 }}
spec:
{{- with .Values.imagePullSecrets }}
imagePullSecrets:

View File

@ -1,7 +1,7 @@
apiVersion: v1
kind: Secret
metadata:
name: {{ include "drone.fullname" . }}
name: {{ include "droneRunner.fullname" . }}
type: Opaque
stringData:
@ -9,14 +9,6 @@ stringData:
{{- $_ := set .Values "config" dict -}}
{{- end -}}
{{- if not (hasKey .Values.config "DRONE_SERVER_HOST") -}}
{{- $_ := set .Values.config "DRONE_SERVER_HOST" (index .Values.ingress.hosts 0).host -}}
{{- end -}}
{{- if not (hasKey .Values.config "DRONE_SERVER_PROTO") -}}
{{- $_ := set .Values.config "DRONE_SERVER_PROTO" "https" -}}
{{- end -}}
{{/* SETUP CONFIG */}}
{{ range $key, $value := .Values.config }}
{{ upper $key}}: {{ quote $value }}