fix bug

Signed-off-by: root <[email protected]>
goharbor · Mar 19, 2022 · 34df3a1 · 34df3a1
1 parent ba2cb88
commit 34df3a1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/.gitignore b/.gitignore
@@ -39,3 +39,4 @@ vendor/
 
 ## local development test files
 config/samples/harborcluster-standard-dev/
+config/samples/harborcluster-minimal-dev/
diff --git a/scripts/harbor_operator_kind.sh b/scripts/harbor_operator_kind.sh
@@ -51,12 +51,12 @@ main() {
     arch=$(uname -m)
     local cache_dir="$RUNNER_TOOL_CACHE/tools/$version/$arch"
 
-    local kind_dir="$cache_dir/kind/bin/"
+    local kind_dir="$cache_dir/kind/bin"
     if [[ ! -x "$kind_dir/kind" ]]; then
         install_kind
     fi
 
-    local kubectl_dir="$cache_dir/kubectl/bin/"
+    local kubectl_dir="$cache_dir/kubectl/bin"
     if [[ ! -x "$kubectl_dir/kubectl" ]]; then
         install_kubectl
     fi
@@ -234,9 +234,9 @@ install_ingress() {
 build_load_harbor_operator_image() {
     echo 'Building and load harbor-operator image...'
     cd $PROJECT_ROOT
-    make manifests docker-build IMG=$DEFAULT_DEV_HABOR_OPERATOR_IMAGE &>/dev/null
+    make manifests docker-build IMG=$DEFAULT_DEV_HABOR_OPERATOR_IMAGE &> /dev/null
     cd - &>/dev/null
-    $kind_dir/kind load docker-image $DEFAULT_DEV_HABOR_OPERATOR_IMAGE --name $DEFAULT_CLUSTER_NAME &>/dev/null
+    $kind_dir/kind load docker-image $DEFAULT_DEV_HABOR_OPERATOR_IMAGE --name $DEFAULT_CLUSTER_NAME &> /dev/null
 }
 
 install_harbor_operator() {
@@ -261,12 +261,19 @@ install_harbor() {
 
     # clean up
     rm -fr config/samples/harborcluster-standard-dev
+    rm -fr config/samples/harborcluster-minimal-dev
 
     cp -a config/samples/harborcluster-standard config/samples/harborcluster-standard-dev
+    cp -a config/samples/harborcluster-minimal config/samples/harborcluster-minimal-dev
 
+    sed -i "s/core.harbor.domain/$CORE_HOST/g" config/samples/harborcluster-minimal-dev/*.yaml
+    sed -i "s/notary.harbor.domain/$NOTARY_HOST/g" config/samples/harborcluster-minimal-dev/*.yaml
     sed -i "s/core.harbor.domain/$CORE_HOST/g" config/samples/harborcluster-standard-dev/*.yaml
     sed -i "s/notary.harbor.domain/$NOTARY_HOST/g" config/samples/harborcluster-standard-dev/*.yaml
 
+    sed -i "s/harborcluster-minimal/harborcluster-minimal-dev/g" config/samples/harborcluster-standard-dev/*.yaml
+
+
     make sample-harborcluster-standard-dev
 
     for i in $(seq 1 7); do
Original file line number	Diff line number	Diff line change
Expand Up		@@ -39,3 +39,4 @@ vendor/

		## local development test files
		config/samples/harborcluster-standard-dev/
		config/samples/harborcluster-minimal-dev/