[v3.31] refactor: switch kube-test backport to kustomize sources#1046
Open
aritrbas wants to merge 1 commit into
Open
[v3.31] refactor: switch kube-test backport to kustomize sources#1046aritrbas wants to merge 1 commit into
aritrbas wants to merge 1 commit into
Conversation
As a follow-up to the previous commit #c5b5a55, replace the
hand-maintained `calico-vpp-kubetest.yaml` + `envsubst`-based
Makefile target with a kustomize-driven design used on master.
CalicoVPP now owns the kube-test manifest as a set of kustomize
sources under `yaml/overlays/kube-test-{kind,baremetal}/` and
`yaml/components/kube-test/`. The split-image specifics for this
release (`calicovpp/vpp` + `calicovpp/agent`, no command override,
VPP build at `/repo/vpp-manager/vpp_build/`, etc.) are baked into
the component patches. Only consumer-owned runtime placeholders
are left in the emitted manifest: ${CALICOVPP_VERSION}, ${HOME},
${ADDITIONAL_VPP_CONFIG}, ${CALICOVPP_ENABLE_MEMIF},
${CALICO_NETWORK_CONFIG} and ${CALICOVPP_INTERFACE} (baremetal)
- `make kube-test-template` now runs `kubectl kustomize` against the
requested flavor ($FLAVOR=kind|baremetal, default: kind) and appends
the tigera-operator Installation/APIServer snippet. The previous
${CALICOVPP_AGENT_IMAGE}/${VPP_BUILD_REL_PATH} envsubst placeholders
are gone - layout knowledge lives only in the kustomize sources.
- `make kube-test-push-images` is now driven by ${KUBE_TEST_IMAGES}
(default: `calicovpp/vpp calicovpp/agent calicovpp/multinet-monitor`
on this split-image `release/v3.32`)
- `yaml/Makefile` regenerates the checked-in
`yaml/generated/calico-vpp-kubetest.yaml` from
`yaml/overlays/kube-test-kind`.
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
1 participant
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.
Summary:
Backport the
kustomize-based VPPkube-testintegration frommaster(unify-images / flatten-repo-layout refactor #994) torelease/v3.31.0. This is a follow-up to the previous repo-layout-awarekube-testbackport (c5b5a55). It replaces the hand-maintainedyaml/generated/calico-vpp-kubetest.yaml+envsubst-basedMakefiletarget with the samekustomize-driven design thatmasteruses, so thekube-testintegration on every release shares one source of truth (kustomizepatches underyaml/components/kube-test/).The previous backport's
CALICOVPP_AGENT_IMAGE/VPP_BUILD_REL_PATHenvsubstplaceholders are removed from the manifest. Only consumer-owned runtime placeholders survive in the emitted manifest:${CALICOVPP_VERSION},${ADDITIONAL_VPP_CONFIG},${HOME},${CALICOVPP_ENABLE_MEMIF},${CALICO_NETWORK_CONFIG}and${CALICOVPP_INTERFACE}(baremetal only) .Changes:
yaml/components/kube-test/-kustomizecomponent shared by thekindandbaremetalflavors. The daemonset patch encodes this release's split-image layout:calicovpp/vppfor thevppcontainer,calicovpp/agentfor theagentcontainer (no command override) and the in-repo VPP build at/repo/vpp-manager/vpp_build/....yaml/components/kube-test/kind/- KinD-flavor adjustments (uplinketh0viaaf_packet, no hugepages).yaml/components/kube-test/baremetal/- baremetal-flavor adjustments (DPDK uplink driven by${CALICOVPP_INTERFACE}, hugepages, larger CPU / buffer allocation,docker.ioregistry withIfNotPresentpull policy).yaml/overlays/kube-test-{kind,baremetal}/- overlays wiring the base daemonset and thekube-testcomponents.yaml/generated/calico-vpp-kubetest.yaml- regenerated from the new sources so the checked-in file matches thekustomizeoutput for this release's base daemonset.yaml/Makefile- regenerates the checked-inkubetest.yamlforkindand sanity-checks thebaremetaloverlay.make kube-test-template FLAVOR={kind,baremetal}(defaultkind) now runskubectl kustomizeagainst the requested overlay and appends the tigera-operatorInstallation/APIServersnippet. The previousCALICOVPP_AGENT_IMAGE/VPP_BUILD_REL_PATHenvsubstplaceholders have been removed - layout knowledge lives only in thekustomizesources.make kube-test-push-imagesis now driven byKUBE_TEST_IMAGES(defaultcalicovpp/vpp calicovpp/agent calicovpp/multinet-monitoron this split-image release).