[v3.29] refactor: backport repo layout-aware targets for VPP kube-test#1040
Merged
Conversation
Backport Makefile targets and kube-test manifest to `release/v3.29.0`. After the unify images and flatten repo layout refactoring, VPP kube-test delegates CalicoVPP repo layout details to generic make targets so it can work with both the old split-image releases (upto `release/v3.32.0`) as well as the new unified image releases (`release/v3.33.0` onwards). - `make vpp` delegates to vpp-manager and passes `VPP_DIR`/`BASE`. - `make kube-test-template` renders `yaml/generated/calico-vpp-kubetest.yaml` with old-layout values: `calicovpp/agent` and `vpp-manager/vpp_build`. - `make kube-test-push-images` pulls, tags, and pushes the v3.29 split images into the local kind registry. Updated vpp-manager's `clone-vpp` target to honor `VPP_DIR` so top-level `make vpp` target's override is used consistently throughout VPP build. Also added new kube-test manifest `yaml/generated/calico-vpp-kubetest.yaml`. The agent's HTTP health-check server (`calico-vpp-agent/health/health.go`) landed in `release/v3.31.0`, so this v3.29 manifest omits the `livenessProbe`/`readinessProbe`/`startupProbe` blocks and the matching `healthCheckPort` field in `CALICOVPP_INITIAL_CONFIG` to stay compatible with the v3.29 agent. This keeps VPP kube-test independent of CalicoVPP's internal repo layout while preserving compatibility with v3.29 split-image release. Signed-off-by: Aritra Basu <aritrbas+gh@cisco.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This patch backports
Makefiletargets andkube-testmanifest torelease/v3.29.0.After the unify images and flatten repo layout refactoring (#994), VPP
kube-testdelegates CalicoVPP repo layout details to genericmaketargets so it can work with both the old split-image releases (uptorelease/v3.32.0) as well as the new unified image releases (release/v3.33.0onwards).Changes:
make vpp, delegating tovpp-managermake kube-test-template, which renders thekube-testmanifest with:CALICOVPP_AGENT_IMAGE=calicovpp/agentVPP_BUILD_REL_PATH=vpp-manager/vpp_buildmake kube-test-push-images, which pulls/tags/pushes the following images:calicovpp/agentcalicovpp/vppcalicovpp/multinet-monitorkube-testmanifest:yaml/generated/calico-vpp-kubetest.yamlvpp-manager/Makefilesoclone-vpphonorsVPP_DIRThis keeps VPP
kube-testindependent of CalicoVPP's internal repo layout while preserving compatibility withv3.29split-image release. We achieve a clean separation as CalicoVPP repo owns layout details whereas VPPkube-testcalls genericmaketargets without internal knowledge of CalicoVPP repo layout.