calico: upstream pr preparation#7
Open
vsoch wants to merge 11 commits into
Open
Conversation
Signed-off-by: vsoch <vsoch@users.noreply.github.com>
The user can install calico (even using the same flannel port) via a CRD for it, adding the rules for it, customizing the Daemonset env and the addresses that the containers use. Signed-off-by: vsoch <vsoch@users.noreply.github.com>
Signed-off-by: vsoch <vsoch@users.noreply.github.com>
Signed-off-by: vsoch <vsoch@users.noreply.github.com>
Open
Signed-off-by: vsoch <vsoch@users.noreply.github.com>
Signed-off-by: vsoch <vsoch@users.noreply.github.com>
vsoch
force-pushed
the
calico-upstream-pr
branch
from
9efd023 to
602ebb4
Compare
Member
Author
|
@AkihiroSuda please take a look at these changes. |
AkihiroSuda
reviewed
Feb 5, 2026
There was a problem hiding this comment.
Why does this need to be a daemonset?
Could be in https://github.com/rootless-containers/usernetes/tree/master/Dockerfile.d
Member
Author
There was a problem hiding this comment.
We also had it as a COPY to the container via a udev rules files, but I don't think it took. At least whatever state changes the initial calico install triggered might have undone it.
AkihiroSuda
reviewed
Feb 5, 2026
AkihiroSuda
reviewed
Feb 5, 2026
AkihiroSuda
reviewed
Feb 5, 2026
AkihiroSuda
reviewed
Feb 5, 2026
| wget https://raw.githubusercontent.com/projectcalico/calico/refs/heads/release-v3.31/manifests/calico.yaml -O $CALICO_FILE | ||
|
|
||
| # backend to vxlan | ||
| yq eval-all -i '(select(.kind == "ConfigMap" and .metadata.name == "calico-config").data.calico_backend) = "vxlan"' $CALICO_FILE |
There was a problem hiding this comment.
Can we use helm with values.yaml ?
https://docs.tigera.io/calico/latest/getting-started/kubernetes/helm
Member
Author
There was a problem hiding this comment.
No we tried for weeks to get helm working - it was too complex. If you want to try and are successful we can do some testing of what you find.
AkihiroSuda
reviewed
Feb 5, 2026
AkihiroSuda
reviewed
Feb 5, 2026
AkihiroSuda
reviewed
Feb 5, 2026
AkihiroSuda
reviewed
Feb 5, 2026
AkihiroSuda
reviewed
Feb 5, 2026
AkihiroSuda
reviewed
Feb 5, 2026
Signed-off-by: Vanessa Sochat <814322+vsoch@users.noreply.github.com>
Signed-off-by: Vanessa Sochat <814322+vsoch@users.noreply.github.com>
Signed-off-by: Vanessa Sochat <814322+vsoch@users.noreply.github.com>
This is for our environment and I do not think is wanted here. Signed-off-by: Vanessa Sochat <814322+vsoch@users.noreply.github.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.
I'm not sure if this will be possible, but I'm trying to cleanup our current calico install. I was able to install from a release and then apply our custom manifests, but (so far) haven't been able to do the entire thing cleanly with yq. It's a weird case of needing to apply the initial setup they have, but then remove it and re-apply the customizations, importantly keeping the IP: autodetect set so the calico.vxlan network shows up with
ip addr. I am finding that when I try to patch from the getgo with yq I run into a myriad of errors. If I don't create our customizations with autodetect the network has issues too. I still think it might be possible, and the next step is to look closely at what we have for the individual configs here and compare with what is being installed upstream.Update: I've now removed all custom manifests - we get the upstream manifest and make all changes with yq. There are quite a few, but I think this is probably the slimmiest I can get it for something to review / easily see changes.