Generate calico manifests from source #2021
Conversation
k8s-ci-robot
added
do-not-merge/work-in-progress
|
/test pull-cluster-api-provider-azure-e2e-full |
k8s-ci-robot
added
cncf-cla: yes
k8s-ci-robot
added
area/provider/azure
CecileRobertMichon
force-pushed
the
calico-from-source
branch
from
e0b4932 to
a5b8626
Compare
| name: FELIX_IPV6SUPPORT | ||
| value: "true" | ||
|
|
||
|
|
| @@ -386,6 +386,8 @@ generate-e2e-templates: $(KUSTOMIZE) | |||
| .PHONY: generate-addons | |||
| generate-addons: | |||
| $(KUSTOMIZE) build $(ADDONS_DIR)/metrics-server > $(ADDONS_DIR)/metrics-server/metrics-server.yaml | |||
| $(KUSTOMIZE) build $(ADDONS_DIR)/calico > $(ADDONS_DIR)/calico.yaml | |||
| $(KUSTOMIZE) build $(ADDONS_DIR)/calico-ipv6 > $(ADDONS_DIR)/calico-ipv6.yaml | |||
|
We should also bump the Windows calico versions to |
|
tests passed 🎉 going to squash and bump version in a separate commit |
CecileRobertMichon
force-pushed
the
calico-from-source
branch
from
8c7dee4 to
3c11a4c
Compare
|
/test ls |
|
@CecileRobertMichon: The specified target(s) for
The following commands are available to trigger optional jobs:
Use
In response to this:
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. |
|
/test pull-cluster-api-provider-azure-conformance |
CecileRobertMichon
changed the title
k8s-ci-robot
removed
the
do-not-merge/work-in-progress
|
/retest |
|
/hold ipv6 test failing after updating version |
k8s-ci-robot
added
the
do-not-merge/hold
|
/retest |
CecileRobertMichon
force-pushed
the
calico-from-source
branch
from
ff50f40 to
5936ea5
Compare
|
@jsturtevant for some reason 3.22 breaks ipv6. All tests passed with 3.20 (the current version in main). I'm thinking of reverting the bump to 3.22 to unblock this for now and investigate why 3.22 isn't working separately. However the windows templates use 3.20.0, whereas the latest 3.20 release used in the Calico 3.20 manifest is 3.20.3. Does it matter if Windows and Linux aren't on the same patch version? Is it possible to create an image for calico host process with 3.20.3? I don't see one available right now. |
It is likely a good idea to keep them on the same version.
Built a package for this version.
This makes sense. It will be easier to identify the difference between 3.20 and 3.22 |
CecileRobertMichon
force-pushed
the
calico-from-source
branch
from
5936ea5 to
431d162
Compare
|
reverted 1.22 bump and upgraded to 1.20.4 which just came out /test pull-cluster-api-provider-azure-e2e-full |
CecileRobertMichon
force-pushed
the
calico-from-source
branch
from
431d162 to
2a705e9
Compare
|
/test pull-cluster-api-provider-azure-e2e-full |
|
/hold cancel |
k8s-ci-robot
removed
the
do-not-merge/hold
|
prow got stuck /retest |
|
I think the commit history of the version bump and reversion is lost to me, but this idea is a huge lgtm. Since there appears to be Windows impact @jsturtevant can you assign to me after you've given a final lgtm and I'll follow along with a review after that? |
|
/retest 2nd time running into the prow timeout on the full job with no apparent test failure |
|
/assign @jsturtevant |
|
/lgtm |
k8s-ci-robot
added
the
lgtm
|
@CecileRobertMichon: The following test failed, say
Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR. Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here. |
|
I'm going to say this is good to go based on the fact that the last full test run 8/9 tests passed. The one that failed was an AKS provisioning error, and AKS doesn't use the Calico CNI we maintain in this repo, and that the AKS spec passed separately in the exp test. /approve |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: CecileRobertMichon The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
k8s-ci-robot
added
the
approved
|
this looks to have broken the conformance jobs. We ran it early in the cycle but didn't run with latest updates /test pull-cluster-api-provider-azure-conformance |
What type of PR is this?
What this PR does / why we need it: Instead of keeping a static Calico manifests in the repo, this PR uses the Kustomize feature to pull a base manifest from a url to get the vxlan manifest from https://docs.projectcalico.org/v3.20/manifests/calico-vxlan.yaml and makes a few patches necessary for Azure and IPv6. This will make sure we don't drift from the recommended Calico configuration and will make updating the Calico version a lot easier.
Which issue(s) this PR fixes (optional, in
fixes #<issue number>(, fixes #<issue_number>, ...)format, will close the issue(s) when PR gets merged):partly addresses #1917
Special notes for your reviewer:
Please confirm that if this PR changes any image versions, then that's the sole change this PR makes.
TODOs:
Release note: