docs: added BootstrapConfig for Merge Option

[Anu-Ra-g]

What type of PR is this?
Documentation for Merge Option in Custom bootstrap for EnvoyProxy

What this PR does / why we need it:
This PR contains the requested documentation updates for the custom bootstrap config for envoyproxy along with the Merge option

Which issue(s) this PR fixes:
Fixes #2545

Release Notes: No

Note: Had to previous PR due to some issues.

[arkodg]

thanks, have you tested that the config works ?
also why are all the test helm files deleted ?

[codecov]

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 67.93%. Comparing base (6022624) to head (d375b80).
Report is 2 commits behind head on main.

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #5259      +/-   ##
==========================================
- Coverage   67.94%   67.93%   -0.01%     
==========================================
  Files         214      214              
  Lines       33522    33522              
==========================================
- Hits        22776    22773       -3     
- Misses       9358     9360       +2     
- Partials     1388     1389       +1     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

[Anu-Ra-g]

@arkodg The configs are working fine. I pushed the helm charts in this PR but it's not appearing here. I'm looking into it.

[Anu-Ra-g]

@arkodg The helm charts are getting deleted when I run make generate. I pushed the updates after running make generate. Can you please help me out here?

[zirain]

why remove this?

[zirain]

1. run make -k gen-check to make sure everything is generated
2. do not recreate PRs, EG use squash merge mode for git.

[Anu-Ra-g]

@zirain when I run the make -k gen-check, the helm charts are getting deleted, even without any changes to the branch

This dependency helm-generate, is causing the issue

.PHONY: gen-check
gen-check: format generate manifests protos go.testdata.complete
	@$(LOG_TARGET)
	@if [ ! -z "`git status --porcelain`" ]; then \
		$(call errorlog, ERROR: Some files need to be updated, please run 'make generate', 'make manifests' and 'make protos' to include any changed files to your PR); \
		git diff --exit-code; \
	fi

.PHONY: generate
generate: ## Generate go code from templates and tags
generate: kube-generate docs-api helm-generate go.generate copy-current-release-docs kube-generate-examples

.PHONY: helm-generate
helm-generate:
	@for chart in $(CHARTS); do \
  		$(LOG_TARGET); \
  		$(MAKE) $(addprefix helm-generate., $$(basename $${chart})); \
  	done

[zirain]

AFAIK, it won't cause any unexcepted issues.

[Anu-Ra-g]

@zirain I cloned the repo again in a new folder and ran make -k gen-check, like you said. The result was still the same. The helm charts are getting removed.

[zirain]

@zirain I cloned the repo again in a new folder and ran make -k gen-check, like you said. The result was still the same. The helm charts are getting removed.

you must did something wrong, that why gen-check CI failed.

[Anu-Ra-g]

@zirain My environment is set to go version 1.23.6. That might be a problem?

[Anu-Ra-g]

Thanks for the help @zirain @arkodg

[arkodg]

LGTM thanks !