feat(docker): dealing with the change of docker in kubenetes 1.20

Author: duanhongyi

Makefile

@@ -7,7 +7,7 @@ PLATFORM ?= linux/amd64,linux/arm64
 
 include versioning.mk
 
-SHELLCHECK_PREFIX := docker run -v ${CURDIR}:/workdir -w /workdir ${DRYCC_REGISTRY}drycc/go-dev shellcheck
+SHELLCHECK_PREFIX := docker run -v ${CURDIR}:/workdir -w /workdir ${DEV_REGISTRY}/drycc/go-dev shellcheck
 SHELL_SCRIPTS = $(wildcard rootfs/bin/*) $(shell find "rootfs" -name '*.sh') $(wildcard _scripts/*.sh)
 
 # Test processes used in quick unit testing

charts/controller/templates/controller-celery.yaml

@@ -21,9 +21,10 @@ spec:
       labels:
         app: drycc-controller-celery
     spec:
+      serviceAccount: drycc-controller
       containers:
         - name: drycc-controller-celery-high
-          image: {{.Values.image_registry}}{{.Values.org}}/controller:{{.Values.image_tag}}
+          image: {{.Values.image_registry}}/{{.Values.org}}/controller:{{.Values.image_tag}}
           command:
             - /bin/bash
             - -c
@@ -37,7 +38,7 @@ spec:
               name: slugrunner-config
               readOnly: true
         - name: drycc-controller-celery-middle
-          image: {{.Values.image_registry}}{{.Values.org}}/controller:{{.Values.image_tag}}
+          image: {{.Values.image_registry}}/{{.Values.org}}/controller:{{.Values.image_tag}}
           command:
             - /bin/bash
             - -c
@@ -51,7 +52,7 @@ spec:
               readOnly: true
           imagePullPolicy: {{.Values.image_pull_policy}}
         - name: drycc-controller-celery-low
-          image: {{.Values.image_registry}}{{.Values.org}}/controller:{{.Values.image_tag}}
+          image: {{.Values.image_registry}}/{{.Values.org}}/controller:{{.Values.image_tag}}
           command:
             - /bin/bash
             - -c

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

@@ -15,8 +15,9 @@ spec:
       template:
         spec:
           restartPolicy: OnFailure
+          serviceAccount: drycc-controller
           containers:
-          - image: {{.Values.image_registry}}{{.Values.org}}/controller:{{.Values.image_tag}}
+          - image: {{.Values.image_registry}}/{{.Values.org}}/controller:{{.Values.image_tag}}
             imagePullPolicy: {{.Values.image_pull_policy}}
             name: drycc-controller-push-data-to-influxdb
             command:
@@ -29,7 +30,7 @@ spec:
             - mountPath: /etc/slugrunner
               name: slugrunner-config
               readOnly: true
-          - image: {{.Values.image_registry}}{{.Values.org}}/controller:{{.Values.image_tag}}
+          - image: {{.Values.image_registry}}/{{.Values.org}}/controller:{{.Values.image_tag}}
             imagePullPolicy: {{.Values.pull_policy}}
             name: drycc-controller-measure-app
             command:
@@ -42,7 +43,7 @@ spec:
             - mountPath: /etc/slugrunner
               name: slugrunner-config
               readOnly: true
-          - image: {{.Values.image_registry}}{{.Values.org}}/controller:{{.Values.image_tag}}
+          - image: {{.Values.image_registry}}/{{.Values.org}}/controller:{{.Values.image_tag}}
             imagePullPolicy: {{.Values.pull_policy}}
             name: drycc-controller-measure-config
             command:
@@ -55,7 +56,7 @@ spec:
             - mountPath: /etc/slugrunner
               name: slugrunner-config
               readOnly: true
-          - image: {{.Values.image_registry}}{{.Values.org}}/controller:{{.Values.image_tag}}
+          - image: {{.Values.image_registry}}/{{.Values.org}}/controller:{{.Values.image_tag}}
             imagePullPolicy: {{.Values.pull_policy}}
             name: drycc-controller-measure-resources
             command:
@@ -68,7 +69,7 @@ spec:
             - mountPath: /etc/slugrunner
               name: slugrunner-config
               readOnly: true
-          - image: {{.Values.image_registry}}{{.Values.org}}/controller:{{.Values.image_tag}}
+          - image: {{.Values.image_registry}}/{{.Values.org}}/controller:{{.Values.image_tag}}
             imagePullPolicy: {{.Values.pull_policy}}
             name: drycc-controller-measure-volumes
             command:

charts/controller/templates/controller-deployment.yaml

@@ -24,7 +24,7 @@ spec:
       serviceAccount: drycc-controller
       containers:
         - name: drycc-controller
-          image: {{.Values.image_registry}}{{.Values.org}}/controller:{{.Values.image_tag}}
+          image: {{.Values.image_registry}}/{{.Values.org}}/controller:{{.Values.image_tag}}
           imagePullPolicy: {{.Values.image_pull_policy}}
           livenessProbe:
             httpGet:
@@ -45,4 +45,4 @@ spec:
           {{- include "controller.limits" . | indent 10 }}
           {{- include "controller.envs" . | indent 10 }}
           {{- include "controller.volumeMounts" . | indent 10 }}
-      {{- include "controller.volumes" . | indent 6 }}
+      {{- include "controller.volumes" . | indent 6 }}

charts/controller/values.yaml

@@ -1,7 +1,7 @@
 org: "drycc"
 image_pull_policy: "Always"
 image_tag: "canary"
-image_registry: ""
+image_registry: "docker.io"
 app_image_pull_policy: "Always"
 # A comma-separated list of URLs to send app release information to
 # See https://drycc.com/docs/workflow/managing-workflow/deploy-hooks

rootfs/api/settings/celery.py

@@ -1,5 +1,5 @@
 import os
-from celery import Celery
+from celery import Celery, platforms
 
 os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'api.settings.production')
 app = Celery('drycc')
@@ -10,3 +10,5 @@
     },
 )
 app.autodiscover_tasks()
+platforms.C_FORCE_ROOT = True
+

versioning.mk

@@ -1,8 +1,8 @@
 MUTABLE_VERSION ?= canary
 VERSION ?= git-$(shell git rev-parse --short HEAD)
 
-IMAGE := ${DRYCC_REGISTRY}${IMAGE_PREFIX}/${SHORT_NAME}:${VERSION}
-MUTABLE_IMAGE := ${DRYCC_REGISTRY}${IMAGE_PREFIX}/${SHORT_NAME}:${MUTABLE_VERSION}
+IMAGE := ${DRYCC_REGISTRY}/${IMAGE_PREFIX}/${SHORT_NAME}:${VERSION}
+MUTABLE_IMAGE := ${DRYCC_REGISTRY}/${IMAGE_PREFIX}/${SHORT_NAME}:${MUTABLE_VERSION}
 
 info:
 	@echo "Build tag:       ${VERSION}"