Skip to content

🌱 Update CAPI to v0.3.11-rc.0 and Calico addon template to v3.16.3#991

Merged
k8s-ci-robot merged 2 commits into
kubernetes-sigs:masterfrom
CecileRobertMichon:calico-1.16
Nov 19, 2020
Merged

🌱 Update CAPI to v0.3.11-rc.0 and Calico addon template to v3.16.3#991
k8s-ci-robot merged 2 commits into
kubernetes-sigs:masterfrom
CecileRobertMichon:calico-1.16

Conversation

@CecileRobertMichon
Copy link
Copy Markdown
Contributor

@CecileRobertMichon CecileRobertMichon commented Oct 13, 2020 •
edited
Loading

What type of PR is this?
/kind other

What this PR does / why we need it: Updates the Calico CNI addon template to the latest Calico version, v3.16.3.

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #

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:

  • squashed commits
  • includes documentation
  • adds unit tests

Release note:

Update Calico addon template to v3.16.3

@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. area/provider/azure Issues or PRs related to azure provider sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. labels Oct 13, 2020
@k8s-ci-robot k8s-ci-robot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Oct 13, 2020
CecileRobertMichon
CecileRobertMichon commented Oct 13, 2020
View reviewed changes
Comment thread templates/addons/calico-ipv6.yaml
@@ -12,9 +12,8 @@ data:
# Configure the backend to use.
calico_backend: "none"

# The CNI network configuration to install on each node. The special
Copy link
Copy Markdown
Contributor Author

@CecileRobertMichon CecileRobertMichon Oct 13, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jsturtevant could you please take look to make sure I didn't undo any ipv6 specific changes in here? this is the original 1.16 template https://docs.projectcalico.org/v3.16/manifests/calico.yaml

I tested and everything looks good

Copy link
Copy Markdown
Contributor

@jsturtevant jsturtevant Oct 13, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

didn't see any changes specific to the configuration. LGTM

@CecileRobertMichon
Copy link
Copy Markdown
Contributor Author

CecileRobertMichon commented Oct 13, 2020

/retest

@CecileRobertMichon
Copy link
Copy Markdown
Contributor Author

CecileRobertMichon commented Oct 13, 2020

test is failing with failed to execute kustomize: : fork/exec /home/prow/go/bin/kustomize: argument list too long now that the calico file is longer :/

@jsturtevant
Copy link
Copy Markdown
Contributor

jsturtevant commented Oct 13, 2020

I ran into that issue using tilt awhile back: #829

Some of the CRD's such as the ones related to BGP, are probably not required since they do not work on Azure. That could trim it down as well. I am not sure if Calico expects them to be there.

@CecileRobertMichon CecileRobertMichon mentioned this pull request Oct 14, 2020
Closed
@CecileRobertMichon
Copy link
Copy Markdown
Contributor Author

CecileRobertMichon commented Oct 14, 2020

/hold

opened kubernetes-sigs/cluster-api#3797

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 14, 2020
@fabriziopandini
Copy link
Copy Markdown
Member

fabriziopandini commented Oct 22, 2020

/test pull-cluster-api-provider-azure-e2e

@fabriziopandini
Copy link
Copy Markdown
Member

fabriziopandini commented Oct 22, 2020

possible fix in kubernetes-sigs/cluster-api#3846

@CecileRobertMichon
Copy link
Copy Markdown
Contributor Author

CecileRobertMichon commented Oct 23, 2020

test is failing because

cluster-api-provider-azure/internal/test/env/env.go

Line 157 in f7f6dfe

func getFilePathToCAPICRDs(root string) string {
expects a released version of CAPI in go.mod, we can ignore for now.

@CecileRobertMichon
Copy link
Copy Markdown
Contributor Author

CecileRobertMichon commented Oct 27, 2020

fixed in kubernetes-sigs/cluster-api#3846

/hold until v0.3.11

@k8s-ci-robot k8s-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 5, 2020
@k8s-ci-robot k8s-ci-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 16, 2020
@CecileRobertMichon CecileRobertMichon changed the title 🌱 Update Calico addon template to v3.16.3 🌱 Update CAPI to v0.3.11 and Calico addon template to v3.16.3 Nov 16, 2020
@CecileRobertMichon
Copy link
Copy Markdown
Contributor Author

CecileRobertMichon commented Nov 16, 2020

/test ls

@k8s-ci-robot
Copy link
Copy Markdown
Contributor

k8s-ci-robot commented Nov 16, 2020

@CecileRobertMichon: The specified target(s) for /test were not found.
The following commands are available to trigger jobs:

  • /test pull-cluster-api-provider-azure-test
  • /test pull-cluster-api-provider-azure-build
  • /test pull-cluster-api-provider-azure-e2e
  • /test pull-cluster-api-provider-azure-e2e-full
  • /test pull-cluster-api-provider-azure-capi-e2e
  • /test pull-cluster-api-provider-azure-verify
  • /test pull-cluster-api-provider-azure-conformance-v1alpha3
  • /test pull-cluster-api-provider-azure-conformance-with-ci-artifacts
  • /test pull-cluster-api-provider-azure-apidiff
  • /test pull-cluster-api-provider-azure-coverage

Use /test all to run the following jobs:

  • pull-cluster-api-provider-azure-test
  • pull-cluster-api-provider-azure-build
  • pull-cluster-api-provider-azure-e2e
  • pull-cluster-api-provider-azure-verify
  • pull-cluster-api-provider-azure-apidiff
  • pull-cluster-api-provider-azure-coverage
Details

In response to this:

/test ls

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.

@CecileRobertMichon
Copy link
Copy Markdown
Contributor Author

CecileRobertMichon commented Nov 16, 2020

/test pull-cluster-api-provider-azure-capi-e2e
/test pull-cluster-api-provider-azure-conformance-v1alpha3

@CecileRobertMichon
Copy link
Copy Markdown
Contributor Author

CecileRobertMichon commented Nov 16, 2020

Succeeded but retesting to gather more data

/test pull-cluster-api-provider-azure-capi-e2e
/test pull-cluster-api-provider-azure-e2e

@CecileRobertMichon CecileRobertMichon mentioned this pull request Nov 16, 2020
Merged
3 tasks
@CecileRobertMichon
Copy link
Copy Markdown
Contributor Author

CecileRobertMichon commented Nov 16, 2020

/test pull-cluster-api-provider-azure-capi-e2e

1 similar comment
@CecileRobertMichon
Copy link
Copy Markdown
Contributor Author

CecileRobertMichon commented Nov 17, 2020

/test pull-cluster-api-provider-azure-capi-e2e

@CecileRobertMichon
Copy link
Copy Markdown
Contributor Author

CecileRobertMichon commented Nov 17, 2020

/retest

@CecileRobertMichon CecileRobertMichon changed the title 🌱 Update CAPI to v0.3.11 and Calico addon template to v3.16.3 🌱 Update CAPI to v0.3.11-rc.0 and Calico addon template to v3.16.3 Nov 18, 2020
@CecileRobertMichon
Copy link
Copy Markdown
Contributor Author

CecileRobertMichon commented Nov 18, 2020

/hold cancel

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 18, 2020
@CecileRobertMichon
Copy link
Copy Markdown
Contributor Author

CecileRobertMichon commented Nov 18, 2020

We should consider merging this to see if it helps with some of the KCP flakes we have been seeing in CI

@nader-ziada
Copy link
Copy Markdown
Contributor

nader-ziada commented Nov 19, 2020

/lgtm
/approve

merging in the bump to capi v0.3.11-rc.0 because we think it will help with the flakes in e2e tests

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 19, 2020
@k8s-ci-robot
Copy link
Copy Markdown
Contributor

k8s-ci-robot commented Nov 19, 2020

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: nader-ziada

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 19, 2020
@k8s-ci-robot k8s-ci-robot merged commit 8e70ad6 into kubernetes-sigs:master Nov 19, 2020
@k8s-ci-robot k8s-ci-robot added this to the v0.4.10 milestone Nov 19, 2020
@CecileRobertMichon CecileRobertMichon deleted the calico-1.16 branch March 19, 2021 17:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@alexeldeib alexeldeib Awaiting requested review from alexeldeib

@juan-lee juan-lee Awaiting requested review from juan-lee

1 more reviewer

@jsturtevant jsturtevant jsturtevant left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

@nader-ziada nader-ziada

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. area/provider/azure Issues or PRs related to azure provider cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/cluster-lifecycle Categorizes an issue or PR as relevant to SIG Cluster Lifecycle. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.

Projects

None yet

Milestone

v0.4.10

Development

Successfully merging this pull request may close these issues.

5 participants

@CecileRobertMichon @jsturtevant @fabriziopandini @k8s-ci-robot @nader-ziada