Separate the create and shutdown of local-registry from kind-cluster

Author: linhdangduy

Makefile

@@ -285,12 +285,19 @@ release/docs:
 
 # Other commands
 
-.PHONY: kind-up
-kind-up:
+.PHONY: up/local-registry
+up/local-registry:
+	./hack/create-local-registry.sh
+
+.PHONY: up/kind-cluster
+up/kind-cluster:
 	./hack/create-kind-cluster.sh pipecd
 
-.PHONY: kind-down
-kind-down:
+.PHONY: up/local-cluster
+up/local-cluster: up/local-registry up/kind-cluster
+
+.PHONY: down/local-cluster
+down/local-cluster:
 	kind delete cluster --name pipecd
 	docker container rm -f kind-registry 2>/dev/null
 

hack/create-kind-cluster.sh

@@ -36,16 +36,6 @@ CLUSTER=$1
 REG_NAME='kind-registry'
 REG_PORT='5001'
 
-# Create registry container unless it already exists
-echo "Creating local registry container..."
-running="$(docker inspect -f '{{.State.Running}}' "${REG_NAME}" 2>/dev/null || true)"
-if [ "${running}" != 'true' ]; then
-  docker run \
-    -e REGISTRY_HTTP_ADDR=0.0.0.0:5001 \
-    -d --restart=always -p "127.0.0.1:${REG_PORT}:5001" --name "${REG_NAME}" \
-    registry:2
-fi
-
 # Create a cluster with the local registry enabled in containerd
 REG_CONFIG_DIR="/etc/containerd/certs.d"
 cat <<EOF | kind create cluster --name ${CLUSTER} --config=-
@@ -57,7 +47,7 @@ containerdConfigPatches:
     config_path = "${REG_CONFIG_DIR}"
 EOF
 
-# Connect the registry to the cluster network
+# Connect the local registry to the cluster network
 if [ "$(docker inspect -f='{{json .NetworkSettings.Networks.kind}}' "${REG_NAME}")" = 'null' ]; then
   docker network connect "kind" "${REG_NAME}"
 fi

hack/create-local-registry.sh

@@ -0,0 +1,32 @@
+#!/usr/bin/env bash
+
+# Copyright 2025 The PipeCD Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -o errexit
+set -o nounset
+set -o pipefail
+
+REG_NAME='kind-registry'
+REG_PORT='5001'
+
+# Create registry container unless it already exists
+echo "Creating local registry container..."
+running="$(docker inspect -f '{{.State.Running}}' "${REG_NAME}" 2>/dev/null || true)"
+if [ "${running}" != 'true' ]; then
+  docker run \
+    -e REGISTRY_HTTP_ADDR=0.0.0.0:5001 \
+    -d --restart=always -p "127.0.0.1:${REG_PORT}:5001" --name "${REG_NAME}" \
+    registry:2
+fi