Merge pull request #229 from Abirdcfly/main

fix: some github action failed due to refactor

.github/workflows/release.yaml

@@ -28,10 +28,10 @@ jobs:
 
       # https://github.com/helm/chart-releaser-action
       - name: Run chart-releaser
-        uses: helm/chart-releaser-action@v1.5.0
+        uses: helm/chart-releaser-action@v1.6.0
         with:
           charts_dir: deploy/charts
-          charts_repo_url: https://kubeagi.github.io/arcadia/
+          skip_existing: true
           # FIXME: uncomment this once customized configuration is needed
           # config: cr.yaml
         env:

Makefile

@@ -258,23 +258,23 @@ build-graphql-server: gql-gen
 # prepare for git push
 .PHONY: prepare-push
 config_rule_line_num = $(shell grep -n "rules:" config/rbac/role.yaml | cut -d: -f1)
-chart_rule_line_num = $(shell grep -n "rules:" charts/arcadia/templates/rbac.yaml | cut -d: -f1)
+chart_rule_line_num = $(shell grep -n "rules:" deploy/charts/arcadia/templates/rbac.yaml | cut -d: -f1)
 prepare-push: manifests generate fmt vet
 	@echo "install golangci-lint"
 	@go install github.com/golangci/golangci-lint/cmd/golangci-lint@latest
 	@echo "run golangci-lint with auto-fix"
 	@golangci-lint run --fix -v ./...
 	@echo "copy crds to charts"
-	@cp config/crd/bases/* charts/arcadia/crds
+	@cp config/crd/bases/* deploy/charts/arcadia/crds
 	@echo "copy role to charts"
 	@sed -n '$(config_rule_line_num),$$p' config/rbac/role.yaml > tmp_role.yaml
-	@sed -i '' '$(chart_rule_line_num),$$d' charts/arcadia/templates/rbac.yaml
-	@cat tmp_role.yaml >> charts/arcadia/templates/rbac.yaml
+	@sed -i '' '$(chart_rule_line_num),$$d' deploy/charts/arcadia/templates/rbac.yaml
+	@cat tmp_role.yaml >> deploy/charts/arcadia/templates/rbac.yaml
 	@rm -f tmp_role.yaml
 
 # Commands for Data-Processing
 DATA_PROCESSING_IMAGE ?= kubebb/dp-base
 
 .PHONY: docker-build-dp-base
 docker-build-dp-base:
-	docker build -f ./data-process/Dockerfile.base -t $(DATA_PROCESSING_IMAGE):$(VERSION) ./data-process/
+	docker build -f ./data-process/Dockerfile.base -t $(DATA_PROCESSING_IMAGE):$(VERSION) ./data-process/

tests/example-test.sh

@@ -179,7 +179,7 @@ kind load docker-image controller:example-e2e --name=$KindName
 
 info "3. install arcadia"
 kubectl create namespace arcadia
-helm install -narcadia arcadia charts/arcadia --set deployment.image=controller:example-e2e --wait --timeout $HelmTimeout
+helm install -narcadia arcadia deploy/charts/arcadia --set deployment.image=controller:example-e2e --wait --timeout $HelmTimeout
 
 info "4. check system datasource arcadia-minio(system datasource)"
 waitCRDStatusReady "Datasource" "arcadia" "arcadia-minio"