feat(registry): add garbage-collect cronjob

Author: duanhongyi

Dockerfile

@@ -43,6 +43,7 @@ RUN groupadd drycc --gid ${DRYCC_GID} \
   && chown -R ${DRYCC_GID}:${DRYCC_UID} ${DRYCC_HOME_DIR}
 
 COPY --chown=${DRYCC_GID}:${DRYCC_UID} rootfs/config-example.yml /opt/drycc/registry/etc/config.yml
+ENV DRYCC_REGISTRY_CONFIG /opt/drycc/registry/etc/config.yml
 
 USER ${DRYCC_UID}
 VOLUME ["${DRYCC_HOME_DIR}"]

charts/registry/templates/_helper.tpl

@@ -1,4 +1,5 @@
-{{- define "registry.envs" -}}
+{{- define "registry.envs" }}
+env:
 - name: REGISTRY_STORAGE_DELETE_ENABLED
   value: "true"
 - name: REGISTRY_LOG_LEVEL

charts/registry/templates/registry-cronjob-daily.yaml

@@ -0,0 +1,44 @@
+{{- if eq .Values.global.registryLocation "on-cluster" }}
+apiVersion: batch/v1
+kind: CronJob
+metadata:
+  name: drycc-registry-cronjob-daily
+  labels:
+    heritage: drycc
+  annotations:
+    component.drycc.cc/version: {{ .Values.imageTag }}
+spec:
+  schedule: "0 0 * * *"
+  concurrencyPolicy: {{ .Values.concurrencyPolicy }}
+  successfulJobsHistoryLimit: 1
+  failedJobsHistoryLimit: 1
+  jobTemplate:
+    spec:
+      template:
+        spec:
+          restartPolicy: OnFailure
+          serviceAccount: drycc-controller
+          initContainers:
+          - name: drycc-registry-init
+            image: {{.Values.imageRegistry}}/{{.Values.imageOrg}}/python-dev:latest
+            imagePullPolicy: {{.Values.imagePullPolicy}}
+            args:
+              - netcat
+              - -v
+              - -u
+              - $(DRYCC_MINIO_ENDPOINT)
+            {{- include "builder.envs" . | indent 12 }}
+          containers:
+          - image: {{.Values.imageRegistry}}/{{.Values.imageOrg}}/registry:{{.Values.imageTag}}
+            imagePullPolicy: {{.Values.imagePullPolicy}}
+            name: drycc-registry-garbage-collect
+            args:
+            - /bin/bash
+            - -c
+            - /opt/registry/bin/registry
+            - garbage-collect
+            - $(DRYCC_REGISTRY_CONFIG)
+            - --dry-run
+            - --delete-untagged
+            {{- include "builder.envs" . | indent 12 }}
+{{- end }}

charts/registry/templates/registry-deployment.yaml

@@ -33,22 +33,22 @@ spec:
           - -v
           - -u
           - $(DRYCC_MINIO_ENDPOINT)
-        {{- include "builder.envs" . | indent 8 }}
+        {{- include "registry.envs" . | indent 8 }}
       containers:
       - name: drycc-registry
         image: {{.Values.imageRegistry}}/{{.Values.imageOrg}}/registry:{{.Values.imageTag}}
         imagePullPolicy: {{.Values.imagePullPolicy}}
-        {{- include "builder.limits" . | indent 8 }}
-        {{- include "builder.envs" . | indent 8 }}
+        {{- include "registry.limits" . | indent 8 }}
+        {{- include "registry.envs" . | indent 8 }}
         livenessProbe:
           httpGet:
-            path: /v2/
+            path: /
             port: 5000
           initialDelaySeconds: 1
           timeoutSeconds: 1
         readinessProbe:
           httpGet:
-            path: /v2/
+            path: /
             port: 5000
           initialDelaySeconds: 1
           timeoutSeconds: 1

charts/registry/templates/registry-secret.yaml

@@ -1,4 +1,3 @@
-
 apiVersion: v1
 kind: Secret
 metadata:
@@ -9,8 +8,8 @@ metadata:
     drycc.cc/registry-location: "{{ .Values.global.registryLocation }}"
 type: Opaque
 data:
-  {{- if ne .Values.global.registryLocation "on-cluster" }}
-  host: {{ print "drycc-registry" .Release.Namespace  ".svc." .Values.global.clusterDomain | b64enc }}
+  {{- if eq .Values.global.registryLocation "on-cluster" }}
+  host: {{ printf "drycc-registry.%s.svc.%s:80" .Release.Namespace .Values.global.clusterDomain | b64enc }}
   secret: {{ randAlphaNum 32 | b64enc }}
   {{- else }}
   host: {{ .Values.host | b64enc }}

charts/registry/values.yaml

@@ -4,6 +4,7 @@ imageTag: "canary"
 imageRegistry: "registry.drycc.cc"
 # limitsCpu: "100m"
 # limitsMemory: "50Mi"
+concurrencyPolicy: "Replace"
 
 # Service
 service:

main.go

@@ -11,15 +11,15 @@ import (
 
 const (
 	registryBinary         = "/opt/drycc/registry/bin/registry"
-	registryConfig         = "/opt/drycc/registry/etc/config.yml"
 	registryHtpasswd       = "/opt/drycc/registry/etc/htpasswd"
+	registryConfigEnvVar   = "DRYCC_REGISTRY_CONFIG"
 	registryRedirectEnvVar = "DRYCC_REGISTRY_REDIRECT"
 	minioLookupEnvVar      = "DRYCC_MINIO_LOOKUP"
 	minioBucketEnvVar      = "DRYCC_MINIO_BUCKET"
 	minioEndpointEnvVar    = "DRYCC_MINIO_ENDPOINT"
 	minioAccesskeyEnvVar   = "DRYCC_MINIO_ACCESSKEY"
 	minioSecretkeyEnvVar   = "DRYCC_MINIO_SECRETKEY"
-	command                = "serve"
+	defaultCommand         = "serve"
 )
 
 func main() {
@@ -61,8 +61,12 @@ func main() {
 	if err := cmd.Run(); err != nil {
 		log.Fatal("Error creating the registry bucket: ", err)
 	}
+	if len(os.Args) > 1 {
+		cmd = exec.Command(registryBinary, os.Args[1:]...)
+	} else {
+		cmd = exec.Command(registryBinary, defaultCommand, os.Getenv(registryConfigEnvVar))
+	}
 
-	cmd = exec.Command(registryBinary, command, registryConfig)
 	cmd.Stdout = os.Stdout
 	cmd.Stderr = os.Stderr
 	if err := cmd.Run(); err != nil {