templates/deployment.yaml

@@ -26,37 +26,16 @@ spec:
             {{- toYaml .Values.securityContext | nindent 12 }}
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.image.pullPolicy }}
-          livenessProbe:
-            httpGet:
-              scheme: {{ .Values.config.DRONE_SERVER_PROTO | upper | default "HTTP" }}
-              path: /healthz
-              port: {{ .Values.config.DRONE_SERVER_PROTO | default "http" }}
           ports:
-          - name: http
+            - name: http
-            containerPort: 80
+              containerPort: 80
-            protocol: TCP
+              protocol: TCP
-          - name: https
-            containerPort: 443
-            protocol: TCP
-          readinessProbe:
-            httpGet:
-              scheme: {{ .Values.config.DRONE_SERVER_PROTO | upper | default "HTTP" }}
-              path: /healthz
-              port: {{ .Values.config.DRONE_SERVER_PROTO | default "http" }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
           {{- if .Values.config.DRONE_DATABASE_DRIVER | default "sqlite3" | eq "sqlite3" }}
           volumeMounts:
           - name: data
             mountPath: {{ default "/data/database.sqlite" .Values.config.DRONE_DATABASE_DATASOURCE | dir }}
-          {{- with .Values.extraVolumeMounts }}
-            {{- toYaml . | nindent 10 }}
-          {{- end }}
-          {{- else }}
-          {{- with .Values.extraVolumeMounts }}
-          volumeMounts:
-            {{- toYaml . | nindent 10 }}
-          {{- end }}
           {{- end }}
       {{- with .Values.affinity }}
       affinity:
@@ -87,20 +66,9 @@ spec:
       {{- with .Values.persistence.existingClaim }}
           claimName: {{ tpl . $ }}
       {{- end }}
-      {{- with .Values.extraVolumes }}
-        {{- toYaml . | nindent 6 }}
-      {{- end }}
       {{- else if and (.Values.config.DRONE_DATABASE_DRIVER | default "sqlite3" | eq "sqlite3") (not .Values.persistence.existingClaim) }}
       volumes:
       - name: data
         persistentVolumeClaim:
           claimName: {{ include "drone.fullname" . }}
-      {{- with .Values.extraVolumes }}
-        {{- toYaml . | nindent 6 }}
-      {{- end }}
-      {{- else }}
-      {{- with .Values.extraVolumes }}
-      volumes:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
       {{- end }}

templates/service.yaml

@@ -9,28 +9,11 @@ metadata:
     {{- include "drone.labels" . | nindent 4 }}
   name: {{ include "drone.fullname" . }}
 spec:
-  {{- with .Values.service.externalIPs }}
-  externalIPs:
-  {{- toYaml . | nindent 2 }}
-  {{- end }}
-  {{- if .Values.service.externalTrafficPolicy }}
-  externalTrafficPolicy: {{ .Values.service.externalTrafficPolicy }}
-  {{- end }}
-  {{- if and .Values.service.loadBalancerClass (eq .Values.service.type "LoadBalancer") }}
-  loadBalancerClass: {{ .Values.service.loadBalancerClass }}
-  {{- end }}
-  {{- if and .Values.service.loadBalancerIP (eq .Values.service.type "LoadBalancer") }}
-  loadBalancerIP: {{ .Values.service.loadBalancerIP }}
-  {{- end }}
-  {{- with .Values.service.loadBalancerSourceRanges }}
-  loadBalancerSourceRanges:
-  {{- toYaml . | nindent 2 }}
-  {{- end }}
   type: {{ .Values.service.type }}
   ports:
     - port: {{ .Values.service.port }}
-      targetPort: {{ .Values.config.DRONE_SERVER_PROTO | default "http" }}
+      targetPort: http
       protocol: TCP
-      name: {{ .Values.config.DRONE_SERVER_PROTO | default "http" }}
+      name: http
   selector:
     {{- include "drone.selectorLabels" . | nindent 4 }}

values.yaml

@@ -527,12 +527,6 @@ serviceAccount:
 
 service:
   annotations: {}
-  # externalIPs: []
-  # externalTrafficPolicy: "Cluster"
-  # loadBalancerClass: ""
-  # loadBalancerIP: ""
-  # loadBalancerSourceRanges: []
-  # internalTrafficPolicy: "Cluster"
   type: ClusterIP
   port: 80
 
@@ -574,42 +568,10 @@ affinity: {}
 # persistence is only required when config.DATABASE_DRIVER is sqlite3 or
 # undefined.
 persistence:
-  annotation: {}
   # existingClaim:
   size: 5Gi
   accessModes:
   - ReadWriteOnce
   labels: {}
-  # storageClass:
+  annotation: {}
-
+  # storageClass:
-# extra volumes for the pod
-extraVolumes: {}
-# The following example mount the same secret, which contains tls certificates
-# under different names. Each volume mount contains only selected items of the
-# secret. This make it easier to place the items on different locations inside the
-# container filesystem via extraVolumeMounts.
-# - name: custom-ca-anchor
-#   secret:
-#     secretName: drone-custom-tls-certificates
-#     items:
-#     - key: ca.crt
-#       path: ca.crt
-#       mode: 0444
-# - name: custom-tls-certificates
-#   secret:
-#     secretName: drone-custom-tls-certificates
-#     items:
-#     - key: tls.key
-#       path: tls.key
-#       mode: 0400
-#     - key: tls.crt
-#       path: tls.crt
-#       mode: 0444
-
-extraVolumeMounts: {}
-# The following example follows the example of extraVolumes and mounts the
-# volumes to the corresponding paths in the container filesystem.
-# - name: custom-ca-anchor
-#   mountPath: /usr/local/share/ca-certificates
-# - name: custom-tls-certificates
-#   mountPath: /etc/drone/tls