Skip to content

[release-1.28] Platform helm value is no longer used and needed + set OCP default value to false #1801

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.

Sign up for GitHub

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

Merged
istio-testing merged 2 commits into from
Apr 7, 2026
+4 −12
Merged

[release-1.28] Platform helm value is no longer used and needed + set OCP default value to false #1801

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d4041a9
Platform helm value is no longer used and needed
FilipB Mar 31, 2026
ae84b36
Set default value for OCP to false
FilipB Mar 31, 2026
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
14 changes: 4 additions & 10 deletions Makefile.core.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,11 +385,11 @@ deploy-yaml: helm ## Output YAML manifests used by `deploy`.
deploy-openshift: verify-kubeconfig helm ## Deploy controller to an existing OCP cluster.
$(info NAMESPACE: $(NAMESPACE))
kubectl create ns ${NAMESPACE} || echo "namespace ${NAMESPACE} already exists"
$(HELM) template chart chart $(HELM_TEMPL_DEF_FLAGS) --set image='$(IMAGE)' --namespace $(NAMESPACE) --set platform="openshift" | kubectl apply --server-side=true -f -
$(HELM) template chart chart $(HELM_TEMPL_DEF_FLAGS) --set image='$(IMAGE)' --namespace $(NAMESPACE) | kubectl apply --server-side=true -f -

.PHONY: deploy-yaml-openshift
deploy-yaml-openshift: helm ## Output YAML manifests used by `deploy-openshift`.
$(HELM) template chart chart $(HELM_TEMPL_DEF_FLAGS) --set image='$(IMAGE)' --namespace $(NAMESPACE) --set platform="openshift"
$(HELM) template chart chart $(HELM_TEMPL_DEF_FLAGS) --set image='$(IMAGE)' --namespace $(NAMESPACE)"

.PHONY: deploy-olm
deploy-olm: verify-kubeconfig bundle bundle-build bundle-push ## Build and push the operator OLM bundle and deploy the operator using OLM.
Expand Down Expand Up @@ -644,17 +644,11 @@ gitleaks: $(GITLEAKS) ## Download gitleaks to bin directory.
$(GITLEAKS): $(LOCALBIN)
@test -s $(LOCALBIN)/gitleaks || GOBIN=$(LOCALBIN) go install github.com/zricethezav/gitleaks/v8@${GITLEAKS_VERSION}

# Openshift Platform flag
# If is set to true will add `--set platform=openshift` to the helm template command
OCP ?= true
OCP ?= false

.PHONY: bundle
bundle: gen-all-except-bundle helm operator-sdk ## Generate bundle manifests and metadata, then validate generated files.
@TEMPL_FLAGS="$(HELM_TEMPL_DEF_FLAGS)"; \
if [ "$(OCP)" = "true" ]; then \
TEMPL_FLAGS="$$TEMPL_FLAGS --set platform=openshift"; \
fi; \
$(HELM) template chart chart $$TEMPL_FLAGS --set image='$(IMAGE)' --set bundleGeneration=true | $(OPERATOR_SDK) generate bundle $(BUNDLE_GEN_FLAGS)
$(HELM) template chart chart $(HELM_TEMPL_DEF_FLAGS) --set image='$(IMAGE)' --set bundleGeneration=true | $(OPERATOR_SDK) generate bundle $(BUNDLE_GEN_FLAGS)

# operator sdk does not generate sorted relatedImages, we need to sort it here
ifeq ($(USE_IMAGE_DIGESTS), true)
Expand Down
2 changes: 0 additions & 2 deletions chart/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,5 +191,3 @@ operator:
memory: 64Mi
# setting this to true will add resources required to generate the bundle using operator-sdk
bundleGeneration: false
# can be either kubernetes or openshift
platform: kubernetes
Loading