Unify all chart files under .obs/charfile

Signed-off-by: David Cassany <[email protected]>
rancher · Nov 24, 2023 · 0c5a036 · 0c5a036
1 parent 20ce1e0
commit 0c5a036
Show file tree

Hide file tree

Showing 20 changed files with 13 additions and 91 deletions.
diff --git a/charts/README.md → .obs/chartfile/README.md b/charts/README.md → .obs/chartfile/README.md
diff --git a/charts/crds/templates/crds.yaml → .obs/chartfile/crds/templates/crds.yaml b/charts/crds/templates/crds.yaml → .obs/chartfile/crds/templates/crds.yaml
diff --git a/...plates/validate-no-pending-deletions.yaml → ...plates/validate-no-pending-deletions.yaml b/...plates/validate-no-pending-deletions.yaml → ...plates/validate-no-pending-deletions.yaml
diff --git a/charts/operator/app-readme.md → .obs/chartfile/operator/app-readme.md b/charts/operator/app-readme.md → .obs/chartfile/operator/app-readme.md
diff --git a/charts/operator/questions.yaml → .obs/chartfile/operator/questions.yaml b/charts/operator/questions.yaml → .obs/chartfile/operator/questions.yaml
diff --git a/charts/operator/templates/_helpers.tpl → ...chartfile/operator/templates/_helpers.tpl b/charts/operator/templates/_helpers.tpl → ...chartfile/operator/templates/_helpers.tpl
diff --git a/charts/operator/templates/apiservice.yaml → ...rtfile/operator/templates/apiservice.yaml b/charts/operator/templates/apiservice.yaml → ...rtfile/operator/templates/apiservice.yaml
diff --git a/charts/operator/templates/capi_rbac.yaml → ...artfile/operator/templates/capi_rbac.yaml b/charts/operator/templates/capi_rbac.yaml → ...artfile/operator/templates/capi_rbac.yaml
diff --git a/charts/operator/templates/channel.yaml → ...chartfile/operator/templates/channel.yaml b/charts/operator/templates/channel.yaml → ...chartfile/operator/templates/channel.yaml
diff --git a/charts/operator/templates/cluster_role.yaml → ...file/operator/templates/cluster_role.yaml b/charts/operator/templates/cluster_role.yaml → ...file/operator/templates/cluster_role.yaml
diff --git a/...rator/templates/cluster_role_binding.yaml → ...rator/templates/cluster_role_binding.yaml b/...rator/templates/cluster_role_binding.yaml → ...rator/templates/cluster_role_binding.yaml
diff --git a/charts/operator/templates/deployment.yaml → ...rtfile/operator/templates/deployment.yaml b/charts/operator/templates/deployment.yaml → ...rtfile/operator/templates/deployment.yaml
diff --git a/charts/operator/templates/globalrole.yaml → ...rtfile/operator/templates/globalrole.yaml b/charts/operator/templates/globalrole.yaml → ...rtfile/operator/templates/globalrole.yaml
diff --git a/...ts/operator/templates/serviceaccount.yaml → ...le/operator/templates/serviceaccount.yaml b/...ts/operator/templates/serviceaccount.yaml → ...le/operator/templates/serviceaccount.yaml
diff --git a/...rator/templates/validate-install-crd.yaml → ...rator/templates/validate-install-crd.yaml b/...rator/templates/validate-install-crd.yaml → ...rator/templates/validate-install-crd.yaml
diff --git a/Makefile b/Makefile
@@ -120,27 +120,27 @@ build-docker-push-seedimage-builder: build-docker-seedimage-builder
 .PHONY: chart
 chart:
 	mkdir -p  $(ROOT_DIR)/build
-	cp -rf $(ROOT_DIR)/charts/crds $(ROOT_DIR)/build/crds
-	helm package --version ${CHART_VERSION} --app-version ${GIT_TAG} -d $(ROOT_DIR)/build/ $(ROOT_DIR)/build/crds
+	cp -rf $(ROOT_DIR)/.obs/chartfile/crds $(ROOT_DIR)/build/crds
+	mv $(ROOT_DIR)/build/crds/_helmignore $(ROOT_DIR)/build/crds/.helmignore
+	yq -i '.version = "${CHART_VERSION}"' $(ROOT_DIR)/build/crds/Chart.yaml
+	yq -i '.appVersion = "${GIT_TAG}"' $(ROOT_DIR)/build/crds/Chart.yaml
+	ls -R $(ROOT_DIR)/build/crds
+	helm package -d $(ROOT_DIR)/build/ $(ROOT_DIR)/build/crds
 	rm -Rf $(ROOT_DIR)/build/crds
-	cp -rf $(ROOT_DIR)/charts/operator $(ROOT_DIR)/build/operator
+	cp -rf $(ROOT_DIR)/.obs/chartfile/operator $(ROOT_DIR)/build/operator
+	mv $(ROOT_DIR)/build/operator/_helmignore $(ROOT_DIR)/build/operator/.helmignore
+	yq -i '.version = "${CHART_VERSION}"' $(ROOT_DIR)/build/operator/Chart.yaml
+	yq -i '.appVersion = "${GIT_TAG}"' $(ROOT_DIR)/build/operator/Chart.yaml
 	yq -i '.image.tag = "${CHART_VERSION}"' $(ROOT_DIR)/build/operator/values.yaml
 	yq -i '.image.repository = "${REPO}"' $(ROOT_DIR)/build/operator/values.yaml
 	yq -i '.seedImage.tag = "${TAG_SEEDIMAGE}"' $(ROOT_DIR)/build/operator/values.yaml
 	yq -i '.seedImage.repository = "${REPO_SEEDIMAGE}"' $(ROOT_DIR)/build/operator/values.yaml
 	yq -i '.channel.tag = "${TAG_CHANNEL}"' $(ROOT_DIR)/build/operator/values.yaml
 	yq -i '.channel.repository = "${REPO_CHANNEL}"' $(ROOT_DIR)/build/operator/values.yaml
 	yq -i '.registryUrl = "${REGISTRY_URL}"' $(ROOT_DIR)/build/operator/values.yaml
-	helm package --version ${CHART_VERSION} --app-version ${CHART_VERSION} -d $(ROOT_DIR)/build/ $(ROOT_DIR)/build/operator
+	helm package -d $(ROOT_DIR)/build/ $(ROOT_DIR)/build/operator
 	rm -Rf $(ROOT_DIR)/build/operator
 
-.PHONY: migration-chart
-migration-chart:
-	mkdir -p $(ROOT_DIR)/build
-	cp -rf $(ROOT_DIR)/charts/crds-migration $(ROOT_DIR)/build/crds-migration
-	helm package -d $(ROOT_DIR)/build/ $(ROOT_DIR)/build/crds-migration
-	rm -Rf $(ROOT_DIR)/build/crds-migration
-
 validate:
 	scripts/validate
 
@@ -218,10 +218,10 @@ generate-go: $(CONTROLLER_GEN) ## Runs Go related generate targets for the opera
 	./scripts/generate_mocks.sh
 
 build-crds: $(KUSTOMIZE)
-	$(KUSTOMIZE) build config/crd > charts/crds/templates/crds.yaml
+	$(KUSTOMIZE) build config/crd > .obs/chartfile/crds/templates/crds.yaml
 
 build-rbac: $(KUSTOMIZE)
-	$(KUSTOMIZE) build config/rbac > charts/operator/templates/cluster_role.yaml
+	$(KUSTOMIZE) build config/rbac > .obs/chartfile/operator/templates/cluster_role.yaml
 
 build-manifests: $(KUSTOMIZE) generate
 	$(MAKE) build-crds

diff --git a/charts/crds/Chart.yaml b/charts/crds/Chart.yaml
diff --git a/charts/operator/Chart.yaml b/charts/operator/Chart.yaml
diff --git a/charts/operator/README.md b/charts/operator/README.md
diff --git a/charts/operator/values.yaml b/charts/operator/values.yaml