Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix conflict on azure-cni daemonset in AKS e2e #5272

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix conflict on azure-cni daemonset in AKS e2e #5272

wants to merge 1 commit into from

Conversation

nojnhuh
Copy link
Contributor

@nojnhuh nojnhuh commented Nov 13, 2024 •
edited
Loading

What type of PR is this?

/kind flake

What this PR does / why we need it:

This PR fixes the flake in #5189 by removing CAPZ's redundant call to install CNI for AKS clusters, which is already covered by CAPI here: https://github.com/kubernetes-sigs/cluster-api/blob/09f2f6b1758bb4e6eb88122209717b2525469258/test/framework/clusterctl/clusterctl_helpers.go#L444-L452

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 #5189

Special notes for your reviewer:

  • cherry-pick candidate

TODOs:

  • squashed commits
  • includes documentation
  • adds unit tests

Release note:

NONE

@k8s-ci-robot
Copy link
Contributor

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@k8s-ci-robot k8s-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. release-note-none Denotes a PR that doesn't merit a release note. kind/flake Categorizes issue or PR as related to a flaky test. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Nov 13, 2024
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please ask for approval from nojnhuh. For more information see the Kubernetes Code Review Process.

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

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 size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Nov 13, 2024
@nojnhuh
Copy link
Contributor Author

nojnhuh commented Nov 13, 2024

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

@codecov Codecov
Copy link

codecov bot commented Nov 13, 2024 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 52.82%. Comparing base (630e39c) to head (ca70a2d).
Report is 2 commits behind head on main.

Additional details and impacted files 
@@           Coverage Diff           @@
##             main    #5272   +/-   ##
=======================================
  Coverage   52.82%   52.82%           
=======================================
  Files         270      270           
  Lines       29085    29085           
=======================================
  Hits        15365    15365           
  Misses      12928    12928           
  Partials      792      792

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@nojnhuh
Copy link
Contributor Author

nojnhuh commented Nov 13, 2024

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

@k8s-ci-robot k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Nov 13, 2024
@nojnhuh
Copy link
Contributor Author

nojnhuh commented Nov 13, 2024

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

@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Nov 13, 2024
@nojnhuh
Copy link
Contributor Author

nojnhuh commented Nov 13, 2024

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

@nojnhuh
Copy link
Contributor Author

nojnhuh commented Nov 13, 2024

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

@nojnhuh
Copy link
Contributor Author

nojnhuh commented Nov 13, 2024

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

@nojnhuh
Copy link
Contributor Author

nojnhuh commented Nov 14, 2024

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

@nojnhuh
Copy link
Contributor Author

nojnhuh commented Nov 14, 2024

/test ?

@k8s-ci-robot
Copy link
Contributor

@nojnhuh: The following commands are available to trigger required jobs:

  • /test pull-cluster-api-provider-azure-apiversion-upgrade
  • /test pull-cluster-api-provider-azure-build
  • /test pull-cluster-api-provider-azure-ci-entrypoint
  • /test pull-cluster-api-provider-azure-e2e
  • /test pull-cluster-api-provider-azure-e2e-aks
  • /test pull-cluster-api-provider-azure-test
  • /test pull-cluster-api-provider-azure-verify

The following commands are available to trigger optional jobs:

  • /test pull-cluster-api-provider-azure-apidiff
  • /test pull-cluster-api-provider-azure-capi-e2e
  • /test pull-cluster-api-provider-azure-conformance
  • /test pull-cluster-api-provider-azure-conformance-custom-builds
  • /test pull-cluster-api-provider-azure-conformance-dual-stack-with-ci-artifacts
  • /test pull-cluster-api-provider-azure-conformance-ipv6-with-ci-artifacts
  • /test pull-cluster-api-provider-azure-conformance-with-ci-artifacts
  • /test pull-cluster-api-provider-azure-e2e-optional
  • /test pull-cluster-api-provider-azure-e2e-workload-upgrade
  • /test pull-cluster-api-provider-azure-load-test-custom-builds
  • /test pull-cluster-api-provider-azure-windows-custom-builds
  • /test pull-cluster-api-provider-azure-windows-with-ci-artifacts

Use /test all to run the following jobs that were automatically triggered:

  • pull-cluster-api-provider-azure-apidiff
  • pull-cluster-api-provider-azure-build
  • pull-cluster-api-provider-azure-capi-e2e
  • pull-cluster-api-provider-azure-conformance
  • pull-cluster-api-provider-azure-conformance-custom-builds
  • pull-cluster-api-provider-azure-conformance-dual-stack-with-ci-artifacts
  • pull-cluster-api-provider-azure-conformance-ipv6-with-ci-artifacts
  • pull-cluster-api-provider-azure-conformance-with-ci-artifacts
  • pull-cluster-api-provider-azure-e2e
  • pull-cluster-api-provider-azure-e2e-aks
  • pull-cluster-api-provider-azure-test
  • pull-cluster-api-provider-azure-verify
  • pull-cluster-api-provider-azure-windows-custom-builds
  • pull-cluster-api-provider-azure-windows-with-ci-artifacts

In response to this:

/test ?

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-sigs/prow repository.

@nojnhuh
Copy link
Contributor Author

nojnhuh commented Nov 14, 2024

/test pull-cluster-api-provider-azure-apiversion-upgrade
/test pull-cluster-api-provider-azure-capi-e2e
/test pull-cluster-api-provider-azure-conformance
/test pull-cluster-api-provider-azure-e2e-optional
/test pull-cluster-api-provider-azure-e2e-workload-upgrade

@nojnhuh
Copy link
Contributor Author

nojnhuh commented Nov 14, 2024

/test pull-cluster-api-provider-azure-e2e
/test pull-cluster-api-provider-azure-e2e-aks
/test pull-cluster-api-provider-azure-apiversion-upgrade
/test pull-cluster-api-provider-azure-capi-e2e
/test pull-cluster-api-provider-azure-conformance
/test pull-cluster-api-provider-azure-e2e-optional
/test pull-cluster-api-provider-azure-e2e-workload-upgrade

1 similar comment
@nojnhuh
Copy link
Contributor Author

nojnhuh commented Nov 14, 2024

/test pull-cluster-api-provider-azure-e2e
/test pull-cluster-api-provider-azure-e2e-aks
/test pull-cluster-api-provider-azure-apiversion-upgrade
/test pull-cluster-api-provider-azure-capi-e2e
/test pull-cluster-api-provider-azure-conformance
/test pull-cluster-api-provider-azure-e2e-optional
/test pull-cluster-api-provider-azure-e2e-workload-upgrade

@nojnhuh nojnhuh force-pushed the azure-cni-conflict branch 2 times, most recently from 12ebe6c to 53b639e Compare November 14, 2024 17:43
@nojnhuh nojnhuh marked this pull request as ready for review November 14, 2024 18:41
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Nov 14, 2024
@nojnhuh
Copy link
Contributor Author

nojnhuh commented Nov 14, 2024

/hold for squash

@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 Nov 14, 2024
@nojnhuh
Copy link
Contributor Author

nojnhuh commented Nov 14, 2024

/test pull-cluster-api-provider-azure-apiversion-upgrade
/test pull-cluster-api-provider-azure-e2e-optional
/test pull-cluster-api-provider-azure-e2e-workload-upgrade

@nojnhuh
Copy link
Contributor Author

nojnhuh commented Nov 14, 2024

/retest

@nojnhuh
Copy link
Contributor Author

nojnhuh commented Nov 14, 2024

/cherry-pick release-1.17

@k8s-infra-cherrypick-robot
Copy link

@nojnhuh: once the present PR merges, I will cherry-pick it on top of release-1.17 in a new PR and assign it to you.

In response to this:

/cherry-pick release-1.17

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-sigs/prow repository.

@k8s-ci-robot
Copy link
Contributor

@nojnhuh: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
pull-cluster-api-provider-azure-conformance-with-ci-artifacts 53b639e link false /test pull-cluster-api-provider-azure-conformance-with-ci-artifacts
pull-cluster-api-provider-azure-windows-with-ci-artifacts 53b639e link false /test pull-cluster-api-provider-azure-windows-with-ci-artifacts
pull-cluster-api-provider-azure-windows-custom-builds 53b639e link false /test pull-cluster-api-provider-azure-windows-custom-builds

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-sigs/prow repository. I understand the commands that are listed here.

@nojnhuh nojnhuh mentioned this pull request Nov 14, 2024
Merged
4 tasks
@nojnhuh
Copy link
Contributor Author

nojnhuh commented Nov 14, 2024

Making this WIP to try an approach that fixes the AKS flake with less collateral damage.

/retitle [WIP] fix conflict on azure-cni daemonset in AKS e2e

@k8s-ci-robot k8s-ci-robot changed the title fix conflict on azure-cni daemonset in AKS e2e [WIP] fix conflict on azure-cni daemonset in AKS e2e Nov 14, 2024
@k8s-ci-robot k8s-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Nov 14, 2024
@k8s-ci-robot k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Nov 14, 2024
@nojnhuh
Copy link
Contributor Author

nojnhuh commented Nov 14, 2024

Scoped these changes down to just the AKS tests. Ironing out all the addons for self-managed I think is still worthwhile, but not necessary to quash the flake this addresses.

/retitle fix conflict on azure-cni daemonset in AKS e2e

@k8s-ci-robot k8s-ci-robot changed the title [WIP] fix conflict on azure-cni daemonset in AKS e2e fix conflict on azure-cni daemonset in AKS e2e Nov 14, 2024
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Nov 14, 2024
@nojnhuh
Copy link
Contributor Author

nojnhuh commented Nov 15, 2024

squashed!
/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 15, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jackfrancis jackfrancis Awaiting requested review from jackfrancis

@marosset marosset Awaiting requested review from marosset

Assignees
No one assigned
Labels
cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/flake Categorizes issue or PR as related to a flaky test. release-note-none Denotes a PR that doesn't merit a release note. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
CAPZ Planning
Status: Needs Review
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

AKS legacy API tests sometimes hit HTTP 409 on azure-cni DaemonSet
3 participants
@nojnhuh @k8s-ci-robot @k8s-infra-cherrypick-robot