Skip to content

Commit 8fbc403

Browse files
committed
infra/feast-operator: move helm generation from manifests to build-installer per maintainer feedback
Signed-off-by: matt <[email protected]>
1 parent 74720d6 commit 8fbc403

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

infra/feast-operator/Makefile

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,6 @@ help: ## Display this help.
9999
.PHONY: manifests
100100
manifests: controller-gen ## Generate WebhookConfiguration, ClusterRole and CustomResourceDefinition objects.
101101
$(CONTROLLER_GEN) rbac:roleName=manager-role crd:maxDescLen=120 webhook paths="./..." output:crd:artifacts:config=config/crd/bases
102-
# Generate dynamic Helm chart from updated manifests
103-
$(MAKE) helm-generate
104102

105103
.PHONY: generate
106104
generate: controller-gen ## Generate code containing DeepCopy, DeepCopyInto, and DeepCopyObject method implementations.
@@ -193,6 +191,8 @@ build-installer: manifests generate-ref kustomize related-image-fs ## Generate a
193191
mkdir -p dist
194192
cd config/manager && $(KUSTOMIZE) edit set image controller=${IMG}
195193
$(KUSTOMIZE) build config/default > dist/install.yaml
194+
# Generate dynamic Helm chart as part of release build flow
195+
$(MAKE) helm-generate
196196

197197
##@ Deployment
198198

@@ -409,10 +409,6 @@ helm-generate: kustomize helmify related-image-fs ## Generate Helm chart dynamic
409409
@rm -rf $(HELM_CHART_DIR)/$(HELM_CHART_NAME)
410410
$(KUSTOMIZE) build config/default | $(HELMIFY) -crd-dir $(HELM_CHART_NAME)
411411
@mv $(HELM_CHART_NAME) $(HELM_CHART_DIR)/
412-
@echo "Setting chart version to $(VERSION)..."
413-
@sed -i.bak 's/version: 0.1.0/version: $(VERSION)/' $(HELM_CHART_DIR)/$(HELM_CHART_NAME)/Chart.yaml
414-
@sed -i.bak 's/appVersion: "0.1.0"/appVersion: "$(VERSION)"/' $(HELM_CHART_DIR)/$(HELM_CHART_NAME)/Chart.yaml
415-
@rm -f $(HELM_CHART_DIR)/$(HELM_CHART_NAME)/Chart.yaml.bak
416412
@echo "Dynamic Helm chart generated at $(HELM_CHART_DIR)/$(HELM_CHART_NAME)"
417413
@echo "Chart replaces the manually maintained chart - review and commit changes"
418414

0 commit comments

Comments
 (0)