diff --git a/kind/v1alpha4/kind_x-k8s_io_v1alpha4_cluster.k b/kind/v1alpha4/kind_x-k8s_io_v1alpha4_cluster.k index 4d6ae284..7e888f24 100644 --- a/kind/v1alpha4/kind_x-k8s_io_v1alpha4_cluster.k +++ b/kind/v1alpha4/kind_x-k8s_io_v1alpha4_cluster.k @@ -12,6 +12,7 @@ schema Networking: podSubnet?: str ipFamily?: str kubeProxyMode?: str + disableDefaultCNI?: bool schema ExtraPortMapping: containerPort?: int diff --git a/scripts/reg.sh b/scripts/reg.sh index bdb3484a..cd2890c9 100755 --- a/scripts/reg.sh +++ b/scripts/reg.sh @@ -7,16 +7,17 @@ mkdir -p ./scripts/registry_auth htpasswd -Bbn test 1234 > ./scripts/registry_auth/htpasswd # check if there is a container named registry -if [ "$(docker ps -aq -f name=registry)" ]; then +if [ "$(docker ps -aq -f name=kcl-registry)" ]; then # stop and remove the container named registry - docker stop registry - docker rm registry + docker stop kcl-registry + docker rm kcl-registry fi +export KCL_REGISTRY_PORT=${KCL_REGISTRY_PORT:-"5001"} # start the Docker Registry with authentication -docker run -p 5001:5000 \ +docker run -p ${KCL_REGISTRY_PORT}:5000 \ --restart=always \ ---name registry \ +--name kcl-registry \ -v /var/lib/registry:/var/lib/registry \ -v $PWD/scripts/registry_auth/:/auth/ \ -e "REGISTRY_AUTH=htpasswd" \ @@ -25,9 +26,4 @@ docker run -p 5001:5000 \ -d registry # clean the registry -docker exec registry rm -rf /var/lib/registry/docker/registry/v2/repositories/ - -export LOGIN_WITH_KCL=${LOGIN_WITH_KCL:-"0"} -if [ "$LOGIN_WITH_KCL" = "1" ];then - kcl registry login localhost:5001 -u test -p 1234 -fi +docker exec kcl-registry rm -rf /var/lib/registry/docker/registry/v2/repositories/