Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Unify all chart files under .obs/charfile #572

Merged
merged 2 commits into from
Nov 28, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
File renamed without changes.
File renamed without changes.
26 changes: 13 additions & 13 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down
11 changes: 0 additions & 11 deletions charts/crds/Chart.yaml

This file was deleted.

20 changes: 0 additions & 20 deletions charts/operator/Chart.yaml

This file was deleted.

5 changes: 0 additions & 5 deletions charts/operator/README.md

This file was deleted.

42 changes: 0 additions & 42 deletions charts/operator/values.yaml

This file was deleted.