Update cronjob.yaml

Author: wkbrd

templates/cronjob.yaml

@@ -1,28 +1,17 @@
-apiVersion: apps/v1
-kind: Deployment
+{{- if .Values.garbageCollect.enabled }}
+apiVersion: batch/v1
+kind: CronJob
 metadata:
-  name: {{ template "docker-registry.fullname" . }}
+  name: {{ template "docker-registry.fullname" . }}-garbage-collector
   namespace: {{ .Values.namespace | default .Release.Namespace }}
   labels:
     app: {{ template "docker-registry.name" . }}
     chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
-{{- if .Values.deployment.annotations }}
-  annotations:
-{{ toYaml .Values.deployment.annotations | indent 4 }}
-{{- end }}
 spec:
-  selector:
-    matchLabels:
-      app: {{ template "docker-registry.name" . }}
-      release: {{ .Release.Name }}
-  replicas: {{ .Values.replicaCount }}
-  {{- if .Values.updateStrategy }}
-  strategy: {{ toYaml .Values.updateStrategy | nindent 4 }}
-  {{- end }}
-  minReadySeconds: 5
-  template:
+  schedule: {{ .Values.garbageCollect.schedule | quote }}
+  jobTemplate:
     metadata:
       labels:
         app: {{ template "docker-registry.name" . }}
@@ -37,64 +26,44 @@ spec:
         {{ toYaml .Values.podAnnotations | nindent 8 }}
         {{- end }}
     spec:
-      {{- if or (eq .Values.serviceAccount.create true) (ne .Values.serviceAccount.name "") }}
-      serviceAccountName: {{ .Values.serviceAccount.name | default (include "docker-registry.fullname" .) }}
-      {{- end }}
-      {{- if .Values.imagePullSecrets }}
-      imagePullSecrets: {{ toYaml .Values.imagePullSecrets | nindent 8 }}
-      {{- end }}
-      {{- if .Values.priorityClassName }}
-      priorityClassName: "{{ .Values.priorityClassName }}"
-      {{- end }}
-      {{- if .Values.securityContext.enabled }}
-      securityContext: {{ omit .Values.securityContext "enabled" | toYaml | nindent 8 }}
-      {{- end }}
-      {{- with .Values.initContainers }}
-      initContainers:
-        {{- toYaml . | nindent 8 }}
-      {{- end }}
-      containers:
-        - name: {{ .Chart.Name }}
-          image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
-          imagePullPolicy: {{ .Values.image.pullPolicy }}
-          command:
-          - /bin/registry
-          - serve
-          - /etc/docker/registry/config.yml
-          ports:
-            - containerPort: 5000
-            {{- if .Values.metrics.enabled }}
-            - containerPort: {{ (split ":" .Values.configData.http.debug.addr)._1 }}
-              name: http-metrics
-              protocol: TCP
-            {{- end }}
-          livenessProbe:
-            httpGet:
-              {{- if .Values.tlsSecretName }}
-              scheme: HTTPS
-              {{- end }}
-              path: /
-              port: 5000
-          readinessProbe:
-            httpGet:
-              {{- if .Values.tlsSecretName }}
-              scheme: HTTPS
+      template:
+        spec:
+          {{- if or (eq .Values.serviceAccount.create true) (ne .Values.serviceAccount.name "") }}
+          serviceAccountName: {{ .Values.serviceAccount.name | default (include "docker-registry.fullname" .) }}
+          {{- end }}
+          {{- if .Values.imagePullSecrets }}
+          imagePullSecrets: {{ toYaml .Values.imagePullSecrets | nindent 12 }}
+          {{- end }}
+          {{- if .Values.priorityClassName }}
+          priorityClassName: "{{ .Values.priorityClassName }}"
+          {{- end }}
+          {{- if .Values.securityContext.enabled }}
+          securityContext: {{ omit .Values.securityContext "enabled" | toYaml | nindent 12 }}
+          {{- end }}
+          containers:
+            - name: {{ .Chart.Name }}
+              image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
+              imagePullPolicy: {{ .Values.image.pullPolicy }}
+              command:
+              - /bin/registry
+              - garbage-collect
+              - --delete-untagged={{ .Values.garbageCollect.deleteUntagged }}
+              - /etc/docker/registry/config.yml
+              resources: {{ toYaml .Values.garbageCollect.resources | nindent 12 }}
+              env: {{ include "docker-registry.envs" . | nindent 16 }}
+              {{- if .Values.containerSecurityContext.enabled }}
+              securityContext: {{ omit .Values.containerSecurityContext "enabled" | toYaml | nindent 16 }}
               {{- end }}
-              path: /
-              port: 5000
-          resources: {{ toYaml .Values.resources | nindent 12 }}
-          env: {{ include "docker-registry.envs" . | nindent 12 }}
-          {{- if .Values.containerSecurityContext.enabled }}
-          securityContext: {{ omit .Values.containerSecurityContext "enabled" | toYaml | nindent 12 }}
+              volumeMounts: {{ include "docker-registry.volumeMounts" . | nindent 16 }}
+          restartPolicy: OnFailure
+          {{- if .Values.nodeSelector }}
+          nodeSelector: {{ toYaml .Values.nodeSelector | nindent 12 }}
+          {{- end }}
+          {{- if .Values.affinity }}
+          affinity: {{ toYaml .Values.affinity | nindent 12 }}
           {{- end }}
-          volumeMounts: {{ include "docker-registry.volumeMounts" . | nindent 12 }}
-      {{- if .Values.nodeSelector }}
-      nodeSelector: {{ toYaml .Values.nodeSelector | nindent 8 }}
-      {{- end }}
-      {{- if .Values.affinity }}
-      affinity: {{ toYaml .Values.affinity | nindent 8 }}
-      {{- end }}
-      {{- if .Values.tolerations }}
-      tolerations: {{ toYaml .Values.tolerations | nindent 8 }}
-      {{- end }}
-      volumes: {{ include "docker-registry.volumes" . | nindent 8 }}
+          {{- if .Values.tolerations }}
+          tolerations: {{ toYaml .Values.tolerations | nindent 12 }}
+          {{- end }}
+          volumes: {{ include "docker-registry.volumes" . | nindent 12 }}
+{{- end }}