Make the changes additive

twuni · Aug 5, 2022 · fd7fdca · fd7fdca
1 parent 3b4ff67
commit fd7fdca
Show file tree

Hide file tree

Showing 5 changed files with 346 additions and 218 deletions.
diff --git a/README.md b/README.md
@@ -117,7 +117,7 @@ their default values.
 | `initContainers`            | Init containers to be created in the pod                                                   | `[]`            |
 | `garbageCollect.enabled`    | If true, will deploy garbage-collector cronjob                                             | `false`         |
 | `garbageCollect.deleteUntagged` | If true, garbage-collector will delete manifests that are not currently referenced via tag | `true` |    |
-| `garbageCollect.schedule`   | CronTab schedule, please use standard crontab format                                        | `0 1 * * *` |  |   
+| `garbageCollect.schedule`   | CronTab schedule, please use standard crontab format                                        | `0 1 * * *` |  |
 
 Specify each parameter using the `--set key=value[,key=value]` argument to
 `helm install`.

diff --git a/templates/_helpers.tpl b/templates/_helpers.tpl
@@ -22,190 +22,3 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 {{- end -}}
 {{- end -}}
 {{- end -}}
-
-{{- define "docker-registry.envs" -}}
-{{- if .Values.secrets.htpasswd }}
-- name: REGISTRY_AUTH
-  value: "htpasswd"
-- name: REGISTRY_AUTH_HTPASSWD_REALM
-  value: "Registry Realm"
-- name: REGISTRY_AUTH_HTPASSWD_PATH
-  value: "/auth/htpasswd"
-{{- end }}
-
-- name: REGISTRY_HTTP_SECRET
-  valueFrom:
-    secretKeyRef:
-      name: {{ template "docker-registry.fullname" . }}-secret
-      key: haSharedSecret
-
-{{- if .Values.tlsSecretName }}
-- name: REGISTRY_HTTP_TLS_CERTIFICATE
-  value: /etc/ssl/docker/tls.crt
-- name: REGISTRY_HTTP_TLS_KEY
-  value: /etc/ssl/docker/tls.key
-{{- end }}
-
-{{- if eq .Values.storage "filesystem" }}
-- name: REGISTRY_STORAGE_FILESYSTEM_ROOTDIRECTORY
-  value: "/var/lib/registry"
-{{- else if eq .Values.storage "azure" }}
-- name: REGISTRY_STORAGE_AZURE_ACCOUNTNAME
-  valueFrom:
-    secretKeyRef:
-      name: {{ template "docker-registry.fullname" . }}-secret
-      key: azureAccountName
-- name: REGISTRY_STORAGE_AZURE_ACCOUNTKEY
-  valueFrom:
-    secretKeyRef:
-      name: {{ template "docker-registry.fullname" . }}-secret
-      key: azureAccountKey
-- name: REGISTRY_STORAGE_AZURE_CONTAINER
-  valueFrom:
-    secretKeyRef:
-      name: {{ template "docker-registry.fullname" . }}-secret
-      key: azureContainer
-{{- else if eq .Values.storage "s3" }}
-
-- name: REGISTRY_STORAGE_S3_REGION
-  value: {{ required ".Values.s3.region is required" .Values.s3.region }}
-- name: REGISTRY_STORAGE_S3_BUCKET
-  value: {{ required ".Values.s3.bucket is required" .Values.s3.bucket }}
-
-{{- if or (and .Values.secrets.s3.secretKey .Values.secrets.s3.accessKey) .Values.secrets.s3.secretRef }}
-- name: REGISTRY_STORAGE_S3_ACCESSKEY
-  valueFrom:
-    secretKeyRef:
-      name: {{ if .Values.secrets.s3.secretRef }}{{ .Values.secrets.s3.secretRef }}{{ else }}{{ template "docker-registry.fullname" . }}-secret{{ end }}
-      key: s3AccessKey
-- name: REGISTRY_STORAGE_S3_SECRETKEY
-  valueFrom:
-    secretKeyRef:
-      name: {{ if .Values.secrets.s3.secretRef }}{{ .Values.secrets.s3.secretRef }}{{ else }}{{ template "docker-registry.fullname" . }}-secret{{ end }}
-      key: s3SecretKey
-{{- end }}
-
-{{- if .Values.s3.regionEndpoint }}
-- name: REGISTRY_STORAGE_S3_REGIONENDPOINT
-  value: {{ .Values.s3.regionEndpoint }}
-{{- end }}
-
-{{- if .Values.s3.rootdirectory }}
-- name: REGISTRY_STORAGE_S3_ROOTDIRECTORY
-  value: {{ .Values.s3.rootdirectory | quote }}
-{{- end }}
-
-{{- if .Values.s3.encrypt }}
-- name: REGISTRY_STORAGE_S3_ENCRYPT
-  value: {{ .Values.s3.encrypt | quote }}
-{{- end }}
-
-{{- if .Values.s3.secure }}
-- name: REGISTRY_STORAGE_S3_SECURE
-  value: {{ .Values.s3.secure | quote }}
-{{- end }}
-
-{{- else if eq .Values.storage "swift" }}
-- name: REGISTRY_STORAGE_SWIFT_AUTHURL
-  value: {{ required ".Values.swift.authurl is required" .Values.swift.authurl }}
-- name: REGISTRY_STORAGE_SWIFT_USERNAME
-  valueFrom:
-    secretKeyRef:
-      name: {{ template "docker-registry.fullname" . }}-secret
-      key: swiftUsername
-- name: REGISTRY_STORAGE_SWIFT_PASSWORD
-  valueFrom:
-    secretKeyRef:
-      name: {{ template "docker-registry.fullname" . }}-secret
-      key: swiftPassword
-- name: REGISTRY_STORAGE_SWIFT_CONTAINER
-  value: {{ required ".Values.swift.container is required" .Values.swift.container }}
-{{- end }}
-
-{{- if .Values.proxy.enabled }}
-- name: REGISTRY_PROXY_REMOTEURL
-  value: {{ required ".Values.proxy.remoteurl is required" .Values.proxy.remoteurl }}
-- name: REGISTRY_PROXY_USERNAME
-  valueFrom:
-    secretKeyRef:
-      name: {{ if .Values.proxy.secretRef }}{{ .Values.proxy.secretRef }}{{ else }}{{ template "docker-registry.fullname" . }}-secret{{ end }}
-      key: proxyUsername
-- name: REGISTRY_PROXY_PASSWORD
-  valueFrom:
-    secretKeyRef:
-      name: {{ if .Values.proxy.secretRef }}{{ .Values.proxy.secretRef }}{{ else }}{{ template "docker-registry.fullname" . }}-secret{{ end }}
-      key: proxyPassword
-{{- end }}
-
-{{- if .Values.persistence.deleteEnabled }}
-- name: REGISTRY_STORAGE_DELETE_ENABLED
-  value: "true"
-{{- end }}
-
-{{- with .Values.extraEnvVars }}
-        {{- toYaml . | nindent 12 }}
-{{- end }}
-
-{{- end -}}
-
-{{- define "docker-registry.volumeMounts" -}}
-- name: "{{ template "docker-registry.fullname" . }}-config"
-  mountPath: "/etc/docker/registry"
-
-{{- if .Values.secrets.htpasswd }}
-- name: auth
-  mountPath: /auth
-  readOnly: true
-{{- end }}
-
-{{- if eq .Values.storage "filesystem" }}
-- name: data
-  mountPath: /var/lib/registry/
-{{- end }}
-
-{{- if .Values.tlsSecretName }}
-- mountPath: /etc/ssl/docker
-  name: tls-cert
-  readOnly: true
-{{- end }}
-
-{{- with .Values.extraVolumeMounts }}
-{{- toYaml . }}
-{{- end }}
-
-{{- end -}}
-
-{{- define "docker-registry.volumes" -}}
-- name: {{ template "docker-registry.fullname" . }}-config
-  configMap:
-    name: {{ template "docker-registry.fullname" . }}-config
-
-{{- if .Values.secrets.htpasswd }}
-- name: auth
-  secret:
-    secretName: {{ template "docker-registry.fullname" . }}-secret
-    items:
-    - key: htpasswd
-      path: htpasswd
-{{- end }}
-
-{{- if eq .Values.storage "filesystem" }}
-- name: data
-  {{- if .Values.persistence.enabled }}
-  persistentVolumeClaim:
-    claimName: {{ if .Values.persistence.existingClaim }}{{ .Values.persistence.existingClaim }}{{- else }}{{ template "docker-registry.fullname" . }}{{- end }}
-  {{- else }}
-  emptyDir: {}
-  {{- end -}}
-{{- end }}
-
-{{- if .Values.tlsSecretName }}
-- name: tls-cert
-  secret:
-    secretName: {{ .Values.tlsSecretName }}
-{{- end }}
-
-{{- with .Values.extraVolumes }}
-{{- toYaml . }}
-{{- end }}
-{{- end -}}
diff --git a/templates/cronjob.yaml b/templates/cronjob.yaml
@@ -31,8 +31,135 @@ spec:
               - garbage-collect
               - --delete-untagged={{ .Values.garbageCollect.deleteUntagged }}
               - /etc/docker/registry/config.yml
-              env: {{ include "docker-registry.envs" . | nindent 16 }}
-              volumeMounts: {{ include "docker-registry.volumeMounts" . | nindent 16 }}
+              env:
+{{- if .Values.secrets.htpasswd }}
+              - name: REGISTRY_AUTH
+                value: "htpasswd"
+              - name: REGISTRY_AUTH_HTPASSWD_REALM
+                value: "Registry Realm"
+              - name: REGISTRY_AUTH_HTPASSWD_PATH
+                value: "/auth/htpasswd"
+{{- end }}
+              - name: REGISTRY_HTTP_SECRET
+                valueFrom:
+                  secretKeyRef:
+                    name: {{ template "docker-registry.fullname" . }}-secret
+                    key: haSharedSecret
+{{- if .Values.tlsSecretName }}
+              - name: REGISTRY_HTTP_TLS_CERTIFICATE
+                value: /etc/ssl/docker/tls.crt
+              - name: REGISTRY_HTTP_TLS_KEY
+                value: /etc/ssl/docker/tls.key
+{{- end }}
+{{- if eq .Values.storage "filesystem" }}
+              - name: REGISTRY_STORAGE_FILESYSTEM_ROOTDIRECTORY
+                value: "/var/lib/registry"
+{{- else if eq .Values.storage "azure" }}
+              - name: REGISTRY_STORAGE_AZURE_ACCOUNTNAME
+                valueFrom:
+                  secretKeyRef:
+                    name: {{ template "docker-registry.fullname" . }}-secret
+                    key: azureAccountName
+              - name: REGISTRY_STORAGE_AZURE_ACCOUNTKEY
+                valueFrom:
+                  secretKeyRef:
+                    name: {{ template "docker-registry.fullname" . }}-secret
+                    key: azureAccountKey
+              - name: REGISTRY_STORAGE_AZURE_CONTAINER
+                valueFrom:
+                  secretKeyRef:
+                    name: {{ template "docker-registry.fullname" . }}-secret
+                    key: azureContainer
+{{- else if eq .Values.storage "s3" }}
+              {{- if or (and .Values.secrets.s3.secretKey .Values.secrets.s3.accessKey) .Values.secrets.s3.secretRef }}
+              - name: REGISTRY_STORAGE_S3_ACCESSKEY
+                valueFrom:
+                  secretKeyRef:
+                    name: {{ if .Values.secrets.s3.secretRef }}{{ .Values.secrets.s3.secretRef }}{{ else }}{{ template "docker-registry.fullname" . }}-secret{{ end }}
+                    key: s3AccessKey
+              - name: REGISTRY_STORAGE_S3_SECRETKEY
+                valueFrom:
+                  secretKeyRef:
+                    name: {{ if .Values.secrets.s3.secretRef }}{{ .Values.secrets.s3.secretRef }}{{ else }}{{ template "docker-registry.fullname" . }}-secret{{ end }}
+                    key: s3SecretKey
+              {{- end }}
+              - name: REGISTRY_STORAGE_S3_REGION
+                value: {{ required ".Values.s3.region is required" .Values.s3.region }}
+            {{- if .Values.s3.regionEndpoint }}
+              - name: REGISTRY_STORAGE_S3_REGIONENDPOINT
+                value: {{ .Values.s3.regionEndpoint }}
+            {{- end }}
+              - name: REGISTRY_STORAGE_S3_BUCKET
+                value: {{ required ".Values.s3.bucket is required" .Values.s3.bucket }}
+            {{- if .Values.s3.rootdirectory }}
+              - name: REGISTRY_STORAGE_S3_ROOTDIRECTORY
+                value: {{ .Values.s3.rootdirectory | quote }}
+            {{- end }}
+            {{- if .Values.s3.encrypt }}
+              - name: REGISTRY_STORAGE_S3_ENCRYPT
+                value: {{ .Values.s3.encrypt | quote }}
+            {{- end }}
+            {{- if .Values.s3.secure }}
+              - name: REGISTRY_STORAGE_S3_SECURE
+                value: {{ .Values.s3.secure | quote }}
+            {{- end }}
+{{- else if eq .Values.storage "swift" }}
+              - name: REGISTRY_STORAGE_SWIFT_AUTHURL
+                value: {{ required ".Values.swift.authurl is required" .Values.swift.authurl }}
+              - name: REGISTRY_STORAGE_SWIFT_USERNAME
+                valueFrom:
+                  secretKeyRef:
+                    name: {{ template "docker-registry.fullname" . }}-secret
+                    key: swiftUsername
+              - name: REGISTRY_STORAGE_SWIFT_PASSWORD
+                valueFrom:
+                  secretKeyRef:
+                    name: {{ template "docker-registry.fullname" . }}-secret
+                    key: swiftPassword
+              - name: REGISTRY_STORAGE_SWIFT_CONTAINER
+                value: {{ required ".Values.swift.container is required" .Values.swift.container }}
+{{- end }}
+{{- if .Values.proxy.enabled }}
+              - name: REGISTRY_PROXY_REMOTEURL
+                value: {{ required ".Values.proxy.remoteurl is required" .Values.proxy.remoteurl }}
+              - name: REGISTRY_PROXY_USERNAME
+                valueFrom:
+                  secretKeyRef:
+                    name: {{ if .Values.proxy.secretRef }}{{ .Values.proxy.secretRef }}{{ else }}{{ template "docker-registry.fullname" . }}-secret{{ end }}
+                    key: proxyUsername
+              - name: REGISTRY_PROXY_PASSWORD
+                valueFrom:
+                  secretKeyRef:
+                    name: {{ if .Values.proxy.secretRef }}{{ .Values.proxy.secretRef }}{{ else }}{{ template "docker-registry.fullname" . }}-secret{{ end }}
+                    key: proxyPassword
+{{- end }}
+{{- if .Values.persistence.deleteEnabled }}
+              - name: REGISTRY_STORAGE_DELETE_ENABLED
+                value: "true"
+{{- end }}
+{{- with .Values.extraEnvVars }}
+              {{- toYaml . | nindent 14 }}
+{{- end }}
+              volumeMounts:
+{{- if .Values.secrets.htpasswd }}
+                - name: auth
+                  mountPath: /auth
+                  readOnly: true
+{{- end }}
+{{- if eq .Values.storage "filesystem" }}
+                - name: data
+                  mountPath: /var/lib/registry/
+{{- end }}
+                - name: "{{ template "docker-registry.fullname" . }}-config"
+                  mountPath: "/etc/docker/registry"
+{{- if .Values.tlsSecretName }}
+                - mountPath: /etc/ssl/docker
+                  name: tls-cert
+                  readOnly: true
+{{- end }}
+{{- with .Values.extraVolumeMounts }}
+                {{- toYaml . | nindent 16 }}
+{{- end }}
           restartPolicy: OnFailure
           {{- if .Values.nodeSelector }}
           nodeSelector: {{ toYaml .Values.nodeSelector | nindent 12 }}
@@ -43,5 +170,33 @@ spec:
           {{- if .Values.tolerations }}
           tolerations: {{ toYaml .Values.tolerations | nindent 12 }}
           {{- end }}
-          volumes: {{ include "docker-registry.volumes" . | nindent 12 }}
+          volumes:
+{{- if .Values.secrets.htpasswd }}
+            - name: auth
+              secret:
+                secretName: {{ template "docker-registry.fullname" . }}-secret
+                items:
+                - key: htpasswd
+                  path: htpasswd
+{{- end }}
+{{- if eq .Values.storage "filesystem" }}
+            - name: data
+          {{- if .Values.persistence.enabled }}
+              persistentVolumeClaim:
+                claimName: {{ if .Values.persistence.existingClaim }}{{ .Values.persistence.existingClaim }}{{- else }}{{ template "docker-registry.fullname" . }}{{- end }}
+          {{- else }}
+              emptyDir: {}
+          {{- end -}}
+{{- end }}
+            - name: {{ template "docker-registry.fullname" . }}-config
+              configMap:
+                name: {{ template "docker-registry.fullname" . }}-config
+{{- if .Values.tlsSecretName }}
+            - name: tls-cert
+              secret:
+                secretName: {{ .Values.tlsSecretName }}
+{{- end }}
+{{- with .Values.extraVolumes }}
+            {{- toYaml . | nindent 12 }}
+{{- end }}
 {{- end }}