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

Author: duanhongyi

charts/monitor/templates/monitor-grafana-deployment.yaml

@@ -24,7 +24,7 @@ spec:
     spec:
       containers:
       - name: drycc-monitor-grafana
-        image: {{.Values.grafana.image_registry}}{{.Values.grafana.org}}/grafana:{{.Values.grafana.image_tag}}
+        image: {{.Values.grafana.image_registry}}/{{.Values.grafana.org}}/grafana:{{.Values.grafana.image_tag}}
         imagePullPolicy: {{.Values.grafana.image_pull_policy}}
 {{- if or (.Values.grafana.limits_cpu) (.Values.grafana.limits_memory)}}
         resources:

charts/monitor/templates/monitor-telegraf-daemon.yaml

@@ -22,7 +22,7 @@ spec:
       serviceAccount: drycc-monitor-telegraf
       containers:
         - name: drycc-monitor-telegraf
-          image: {{.Values.telegraf.image_registry}}{{.Values.telegraf.org}}/telegraf:{{.Values.telegraf.image_tag}}
+          image: {{.Values.telegraf.image_registry}}/{{.Values.telegraf.org}}/telegraf:{{.Values.telegraf.image_tag}}
           imagePullPolicy: {{.Values.telegraf.image_pull_policy}}
 {{- if or (.Values.telegraf.limits_cpu) (.Values.telegraf.limits_memory)}}
           resources:

charts/monitor/templates/monitor-telegraf-deployment.yaml

@@ -25,7 +25,7 @@ spec:
       serviceAccount: drycc-monitor-telegraf
       containers:
         - name: drycc-monitor-telegraf
-          image: {{.Values.telegraf.image_registry}}{{.Values.telegraf.org}}/telegraf:{{.Values.telegraf.image_tag}}
+          image: {{.Values.telegraf.image_registry}}/{{.Values.telegraf.org}}/telegraf:{{.Values.telegraf.image_tag}}
           imagePullPolicy: {{.Values.telegraf.image_pull_policy}}
 {{- if or (.Values.telegraf.limits_cpu) (.Values.telegraf.limits_memory)}}
           resources:

charts/monitor/values.yaml

@@ -2,7 +2,7 @@ grafana:
   org: "drycc"
   image_pull_policy: "Always"
   image_tag: "canary"
-  image_registry: ""
+  image_registry: "docker.io"
   # limits_cpu: "100m"
   # limits_memory: "50Mi"
   persistence:
@@ -18,7 +18,7 @@ telegraf:
   org: "drycc"
   image_pull_policy: "Always"
   image_tag: "canary"
-  image_registry: ""
+  image_registry: "docker.io"
   # limits_cpu: "100m"
   # limits_memory: "50Mi"
 

default.mk

@@ -11,7 +11,7 @@ include ../includes.mk
 include ../versioning.mk
 include ../deploy.mk
 
-TEST_ENV_PREFIX := docker run --rm -v ${CURDIR}:/bash -w /bash drycc/go-dev
+TEST_ENV_PREFIX := docker run --rm -v ${CURDIR}:/bash -w /bash ${DEV_REGISTRY}/drycc/go-dev
 
 build: docker-build
 push: docker-push
@@ -35,9 +35,9 @@ test-style:
 .PHONY: build push docker-build clean upgrade deploy test test-style
 
 build-all:
-	docker build ${DOCKER_BUILD_FLAGS} -t ${DRYCC_REGISTRY}${IMAGE_PREFIX}/grafana:${VERSION} ../grafana/rootfs
-	docker build ${DOCKER_BUILD_FLAGS} -t ${DRYCC_REGISTRY}${IMAGE_PREFIX}/telegraf:${VERSION} ../telegraf/rootfs
+	docker build ${DOCKER_BUILD_FLAGS} -t ${DRYCC_REGISTRY}/${IMAGE_PREFIX}/grafana:${VERSION} ../grafana/rootfs
+	docker build ${DOCKER_BUILD_FLAGS} -t ${DRYCC_REGISTRY}/${IMAGE_PREFIX}/telegraf:${VERSION} ../telegraf/rootfs
 
 push-all:
-	docker push ${DRYCC_REGISTRY}${IMAGE_PREFIX}/grafana:${VERSION}
-	docker push ${DRYCC_REGISTRY}${IMAGE_PREFIX}/telegraf:${VERSION}
+	docker push ${DRYCC_REGISTRY}/${IMAGE_PREFIX}/grafana:${VERSION}
+	docker push ${DRYCC_REGISTRY}/${IMAGE_PREFIX}/telegraf:${VERSION}

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}"