Change from DOCKER_REGISTRY to IMAGE_REGISTRY in some scripts (#2757)

* modify DOCKER_REGISTRY in make script
Signed-off-by: YangKeao <yangkeao@chunibyo.icu>

* align the help message
Signed-off-by: YangKeao <yangkeao@chunibyo.icu>
Co-authored-by: Yue Yang <g1enyy0ung@gmail.com>
Co-authored-by: Ti Chi Robot <ti-community-prow-bot@tidb.io>

.github/workflows/upload_image.yml

@@ -57,7 +57,7 @@ jobs:
             IMAGE_DEV_ENV_BUILD=1 \
             IMAGE_BUILD_ENV_BUILD=1 \
             IMAGE_PROJECT=${GITHUB_REPOSITORY_OWNER,,} \
-            DOCKER_REGISTRY=ghcr.io \
+            IMAGE_REGISTRY=ghcr.io \
             UI=$UI \
             image-$IMAGE
 

hack/e2e.sh

@@ -34,7 +34,7 @@ Usage: hack/e2e.sh [-h] -- [extra test args]
     -h      show this message and exit
 Environments:
     PROVIDER                    Kubernetes provider, e.g. kind, gke, eks, defaults: kind
-    DOCKER_REGISTRY             image docker registry
+    IMAGE_REGISTRY              image docker registry
     IMAGE_TAG                   image tag
     SKIP_BUILD                  skip building binaries
     SKIP_IMAGE_BUILD            skip build and push images
@@ -92,7 +92,7 @@ hack::ensure_kubetest2
 echo "ensured kubetest2"
 
 PROVIDER=${PROVIDER:-kind}
-DOCKER_REGISTRY=${DOCKER_REGISTRY:-localhost:5000}
+IMAGE_REGISTRY=${IMAGE_REGISTRY:-localhost:5000}
 IMAGE_TAG=${IMAGE_TAG:-latest}
 CLUSTER=${CLUSTER:-chaos-mesh}
 KUBECONFIG=${KUBECONFIG:-~/.kube/config}
@@ -112,7 +112,7 @@ RUNNER_SUITE_NAME=${RUNNER_SUITE_NAME:-}
 ARTIFACTS=${ARTIFACTS:-}
 
 echo "PROVIDER: $PROVIDER"
-echo "DOCKER_REGISTRY: $DOCKER_REGISTRY"
+echo "IMAGE_REGISTRY: $IMAGE_REGISTRY"
 echo "IMAGE_TAG: $IMAGE_TAG"
 echo "CLUSTER: $CLUSTER"
 echo "KUBECONFIG: $KUBECONFIG"
@@ -152,10 +152,10 @@ function e2e::image_build() {
         echo "info: skip building and pushing images"
         return
     fi
-    DOCKER_REGISTRY=${DOCKER_REGISTRY} GOOS=linux GOARCH=amd64 make image-chaos-mesh-e2e
-    DOCKER_REGISTRY=${DOCKER_REGISTRY} make image-chaos-mesh
-    DOCKER_REGISTRY=${DOCKER_REGISTRY} make image-chaos-daemon
-    DOCKER_REGISTRY=${DOCKER_REGISTRY} make image-e2e-helper
+    IMAGE_REGISTRY=${IMAGE_REGISTRY} GOOS=linux GOARCH=amd64 make image-chaos-mesh-e2e
+    IMAGE_REGISTRY=${IMAGE_REGISTRY} make image-chaos-mesh
+    IMAGE_REGISTRY=${IMAGE_REGISTRY} make image-chaos-daemon
+    IMAGE_REGISTRY=${IMAGE_REGISTRY} make image-e2e-helper
 }
 
 function e2e::create_kindconfig() {
@@ -322,8 +322,8 @@ fi
 export PROVIDER
 export CLUSTER
 export KUBECONFIG
-export E2E_IMAGE=${DOCKER_REGISTRY}/pingcap/chaos-mesh-e2e:${IMAGE_TAG}
-export DOCKER_REGISTRY=${DOCKER_REGISTRY}
+export E2E_IMAGE=${IMAGE_REGISTRY}/pingcap/chaos-mesh-e2e:${IMAGE_TAG}
+export IMAGE_REGISTRY=${IMAGE_REGISTRY}
 export IMAGE_TAG=${IMAGE_TAG}
 export PATH=$OUTPUT_BIN:$PATH
 

hack/local-up-chaos-mesh.sh

@@ -39,7 +39,7 @@ Environments:
     KUBECONFIG            path to the kubeconfig file, defaults: ~/.kube/config
     KUBECONTEXT           context in kubeconfig file, defaults to current context
     NAMESPACE             Kubernetes namespace in which we run our chaos-mesh.
-    DOCKER_REGISTRY       image docker registry
+    IMAGE_REGISTRY        image docker registry
     IMAGE_TAG             image tag
     SKIP_IMAGE_BUILD      skip build and push images
 
@@ -64,7 +64,7 @@ PROVIDER=${PROVIDER:-kind}
 CLUSTER=${CLUSTER:-}
 KUBECONFIG=${KUBECONFIG:-~/.kube/config}
 KUBECONTEXT=${KUBECONTEXT:-}
-DOCKER_REGISTRY_PREFIX=${DOCKER_REGISTRY_PREFIX:-localhost:5000}
+IMAGE_REGISTRY_PREFIX=${IMAGE_REGISTRY_PREFIX:-localhost:5000}
 IMAGE_TAG=${IMAGE_TAG:-latest}
 SKIP_IMAGE_BUILD=${SKIP_IMAGE_BUILD:-}
 NAMESPACE=${NAMESPACE:-chaos-testing}
@@ -107,16 +107,16 @@ fi
 
 if [ -z "$SKIP_IMAGE_BUILD" ]; then
     echo "info: building docker images"
-    DOCKER_REGISTRY_PREFIX=$DOCKER_REGISTRY_PREFIX IMAGE_PROJECT=chaos-mesh IMAGE_TAG=$IMAGE_TAG UI=1 SWAGGER=1 make image
+    IMAGE_REGISTRY_PREFIX=$IMAGE_REGISTRY_PREFIX IMAGE_PROJECT=chaos-mesh IMAGE_TAG=$IMAGE_TAG UI=1 SWAGGER=1 make image
 else
     echo "info: skip building docker images"
 fi
 
 echo "info: loading images into cluster"
 images=(
-    $DOCKER_REGISTRY_PREFIX/chaos-mesh/chaos-mesh:${IMAGE_TAG}
-    $DOCKER_REGISTRY_PREFIX/chaos-mesh/chaos-dashboard:${IMAGE_TAG}
-    $DOCKER_REGISTRY_PREFIX/chaos-mesh/chaos-daemon:${IMAGE_TAG}
+    $IMAGE_REGISTRY_PREFIX/chaos-mesh/chaos-mesh:${IMAGE_TAG}
+    $IMAGE_REGISTRY_PREFIX/chaos-mesh/chaos-dashboard:${IMAGE_TAG}
+    $IMAGE_REGISTRY_PREFIX/chaos-mesh/chaos-daemon:${IMAGE_TAG}
 )
 for n in ${images[@]}; do
     echo "info: loading image $n"
@@ -126,4 +126,4 @@ done
 $KUBECTL_BIN -n "$NAMESPACE" delete deploy -l app.kubernetes.io/name=chaos-mesh
 $KUBECTL_BIN -n "$NAMESPACE" delete pods -l app.kubernetes.io/name=chaos-mesh
 
-${ROOT}/install.sh --runtime containerd --crd ${ROOT}/manifests/crd.yaml --version ${IMAGE_TAG} --docker-registry ${DOCKER_REGISTRY_PREFIX}
+${ROOT}/install.sh --runtime containerd --crd ${ROOT}/manifests/crd.yaml --version ${IMAGE_TAG} --docker-registry ${IMAGE_REGISTRY_PREFIX}

hack/run-e2e.sh

@@ -46,7 +46,7 @@ SKIP_GINKGO=${SKIP_GINKGO:-}
 # We don't finalizers namespace on failure by default for easier debugging in local development.
 # TODO support this feature
 DELETE_NAMESPACE_ON_FAILURE=${DELETE_NAMESPACE_ON_FAILURE:-false}
-DOCKER_REGISTRY=${DOCKER_REGISTRY:-localhost:5000}
+IMAGE_REGISTRY=${IMAGE_REGISTRY:-localhost:5000}
 
 if [ -z "$KUBECONFIG" ]; then
     echo "error: KUBECONFIG is required"
@@ -62,7 +62,7 @@ echo "KUBECONTEXT: $KUBECONTEXT"
 echo "REPORT_DIR: $REPORT_DIR"
 echo "REPORT_PREFIX: $REPORT_PREFIX"
 echo "DELETE_NAMESPACE_ON_FAILURE: $DELETE_NAMESPACE_ON_FAILURE"
-echo "DOCKER_REGISTRY: $DOCKER_REGISTRY"
+echo "IMAGE_REGISTRY: $IMAGE_REGISTRY"
 
 function e2e::image_load() {
     local images=(
@@ -75,7 +75,7 @@ function e2e::image_load() {
         echo $nodes
         echo "info: load images ${images[@]}"
         for image in ${images[@]}; do
-            $KIND_BIN load docker-image --name $CLUSTER ${DOCKER_REGISTRY}/$image:$IMAGE_TAG --nodes $(hack::join ',' ${nodes[@]})
+            $KIND_BIN load docker-image --name $CLUSTER ${IMAGE_REGISTRY}/$image:$IMAGE_TAG --nodes $(hack::join ',' ${nodes[@]})
         done
 
         # bypassing docker pull rate limit inner the kind container: kindest/node has no credentials
@@ -137,13 +137,13 @@ e2e_args=(
     ${ginkgo_args[@]:-}
     /usr/local/bin/e2e.test
     --
-    --manager-image-registry="${DOCKER_REGISTRY}"
+    --manager-image-registry="${IMAGE_REGISTRY}"
     --manager-image="chaos-mesh/chaos-mesh"
     --manager-image-tag="${IMAGE_TAG}"
-    --daemon-image-registry="${DOCKER_REGISTRY}"
+    --daemon-image-registry="${IMAGE_REGISTRY}"
     --daemon-image="chaos-mesh/chaos-daemon"
     --daemon-image-tag="${IMAGE_TAG}"
-    --e2e-image="${DOCKER_REGISTRY}/pingcap/e2e-helper:${IMAGE_TAG}"
+    --e2e-image="${IMAGE_REGISTRY}/pingcap/e2e-helper:${IMAGE_TAG}"
     --install-chaos-mesh
 )
 

hack/update_install_script.sh

@@ -33,9 +33,9 @@ sed -i.bak 's/mountPath: \/var\/run\/docker.sock/mountPath: \$\{mountPath\}/g' $
 sed -i.bak 's/path: \/var\/run\/docker.sock/path: \$\{socketPath\}/g' $tmp_file
 sed -i.bak 's/- docker/- $\{runtime\}/g' $tmp_file
 sed -i.bak 's/hostNetwork: true/hostNetwork: \$\{host_network\}/g' $tmp_file
-sed -i.bak 's/ghcr.io\/chaos-mesh\/chaos-mesh:.*/\${DOCKER_REGISTRY_PREFIX}\/chaos-mesh\/chaos-mesh:\$\{VERSION_TAG\}/g' $tmp_file
-sed -i.bak 's/ghcr.io\/chaos-mesh\/chaos-daemon:.*/\${DOCKER_REGISTRY_PREFIX}\/chaos-mesh\/chaos-daemon:\$\{VERSION_TAG\}/g' $tmp_file
-sed -i.bak 's/ghcr.io\/chaos-mesh\/chaos-dashboard:.*/\${DOCKER_REGISTRY_PREFIX}\/chaos-mesh\/chaos-dashboard:\$\{VERSION_TAG\}/g' $tmp_file
+sed -i.bak 's/ghcr.io\/chaos-mesh\/chaos-mesh:.*/\${IMAGE_REGISTRY_PREFIX}\/chaos-mesh\/chaos-mesh:\$\{VERSION_TAG\}/g' $tmp_file
+sed -i.bak 's/ghcr.io\/chaos-mesh\/chaos-daemon:.*/\${IMAGE_REGISTRY_PREFIX}\/chaos-mesh\/chaos-daemon:\$\{VERSION_TAG\}/g' $tmp_file
+sed -i.bak 's/ghcr.io\/chaos-mesh\/chaos-dashboard:.*/\${IMAGE_REGISTRY_PREFIX}\/chaos-mesh\/chaos-dashboard:\$\{VERSION_TAG\}/g' $tmp_file
 sed -i.bak 's/value: UTC/value: \$\{timezone\}/g' $tmp_file
 mv $tmp_file $tmp_file.bak
 

images/chaos-dlv/README.md

@@ -6,7 +6,7 @@ is configured properly, you can use it to debug the process on remote machine.
 To deploy the `dlv` image, you need to compile the chaos-mesh with symbols:
 
 ```bash
-make DOCKER_REGISTRY="" DEBUGGER=1 image
+make IMAGE_REGISTRY="" DEBUGGER=1 image
 ```
 
 Then you need to install with the corresponding helm configuration to integrate

install.sh

@@ -861,7 +861,7 @@ gen_chaos_mesh_manifests() {
     K8S_NAMESPACE="chaos-testing"
     VERSION_TAG="${version}"
 
-    DOCKER_REGISTRY_PREFIX="${docker_registry}"
+    IMAGE_REGISTRY_PREFIX="${docker_registry}"
     tmpdir=$(mktemp -d)
 
     ensure openssl genrsa -out ${tmpdir}/ca.key 2048 > /dev/null 2>&1
@@ -1297,7 +1297,7 @@ spec:
       priorityClassName: 
       containers:
         - name: chaos-daemon
-          image: ${DOCKER_REGISTRY_PREFIX}/chaos-mesh/chaos-daemon:${VERSION_TAG}
+          image: ${IMAGE_REGISTRY_PREFIX}/chaos-mesh/chaos-daemon:${VERSION_TAG}
           imagePullPolicy: IfNotPresent
           command:
             - /usr/local/bin/chaos-daemon
@@ -1387,7 +1387,7 @@ spec:
       priorityClassName: 
       containers:
         - name: chaos-dashboard
-          image: ${DOCKER_REGISTRY_PREFIX}/chaos-mesh/chaos-dashboard:${VERSION_TAG}
+          image: ${IMAGE_REGISTRY_PREFIX}/chaos-mesh/chaos-dashboard:${VERSION_TAG}
           imagePullPolicy: IfNotPresent
           resources:
             limits: {}
@@ -1491,7 +1491,7 @@ spec:
       priorityClassName: 
       containers:
       - name: chaos-mesh
-        image: ${DOCKER_REGISTRY_PREFIX}/chaos-mesh/chaos-mesh:${VERSION_TAG}
+        image: ${IMAGE_REGISTRY_PREFIX}/chaos-mesh/chaos-mesh:${VERSION_TAG}
         imagePullPolicy: IfNotPresent
         resources:
             limits: {}