build: minor upgrades/refactoring to support full CRDs #14048
Merged
Conversation
This file contains 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
This was split off from argoproj#14044 to make it easier to review. This makes a few minor improvements to the build to support the full CRD fixes: 1. Update devcontainer to install k3s 1.29.10, since that's what we use in CI: https://github.com/argoproj/argo-workflows/blob/ef41f83f801a6ff48c87f882a6b75d0e37529134/.github/workflows/ci-build.yaml#L263 1.27 is EOL and doesn't support things like validation rules in CRDs. 2. Update `make install` to use [server-side apply](https://kubernetes.io/docs/reference/using-api/server-side-apply/), which is meant to replace client-side apply and isn't affected by size limitations for the CRDs. Since `kubectl apply --server-side` isn't compatible with `kubectl apply --prune`, I had to switch to [apply sets](https://kubernetes.io/docs/tasks/manage-kubernetes-objects/declarative-config/#alternative-kubectl-apply-f-directory-prune), which is intended to replace allow list pruning, and seems to work just as wlel. 3. Minor refactoring of the manifests under `manifests/` to use [Kustomize Components](https://kubectl.docs.kubernetes.io/guides/config_management/components/) so that we can share code with the the manifests under `test/e2e/manifests` without duplication. See argoproj#14001 for more details on this approach. Signed-off-by: Mason Malone <[email protected]>
|
/retest |
MasonM
changed the title
MasonM
commented
Jan 4, 2025
| labels: | ||
| - includeSelectors: true | ||
| pairs: | ||
| app.kubernetes.io/part-of: dex |
There was a problem hiding this comment.
We don't need to add this anymore since apply-set pruning automatically adds the appropriate label (source):
With ApplySet-based pruning, kubectl adds the applyset.kubernetes.io/part-of= label to each object in the set before they are sent to the server.
Signed-off-by: Mason Malone <[email protected]>
MasonM
commented
Jan 5, 2025
| @@ -530,7 +533,8 @@ ifeq ($(shell uname),Darwin) | |||
| brew tap kitproj/kit --custom-remote https://github.com/kitproj/kit | |||
| brew install kit | |||
| else | |||
| curl -q https://raw.githubusercontent.com/kitproj/kit/main/install.sh | tag=v0.1.8 sh | |||
| @echo "Downloading Kit" | |||
| curl -fsL --retry 99 "https://github.com/kitproj/kit/releases/download/v0.1.8/kit_0.1.8_$$(uname)_$$(uname -m | sed 's/aarch64/arm64/').tar.gz" | sudo tar -C /usr/local/bin -xzf - kit | |||
There was a problem hiding this comment.
This is a workaround for CI failures due to a bug introduced in https://raw.githubusercontent.com/kitproj/kit/main/install.sh recently: kitproj/kit@46fe614
isubasinghe
approved these changes
Jan 6, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Motivation
This was split off from #14044 to make it easier to review. This makes a few minor improvements to the build to support those changes.
Modifications
argo-workflows/.github/workflows/ci-build.yaml
Line 263 in ef41f83
make installto use server-side apply, which is meant to replace client-side apply and isn't affected by size limitations for the CRDs. Sincekubectl apply --server-sideisn't compatible withkubectl apply --prune, I had to switch to apply sets, which is intended to replace allow list pruning, and seems to work just as well.manifests/to use Kustomize Components so that we can share code with the the manifests undertest/e2e/manifestswithout duplication. See test: deduplicate test manifests and fix "stress" profile #14001 for more details on this approach.Verification
Built devcontainer locally and ran tests