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.

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

🐛 [release-1.6] docker: ignore kubeadm preflight check for FileContent--proc-sys-net-bridge-bridge-nf-call-ip6tables #10938

Conversation

chrischdi
Copy link
Member

What this PR does / why we need it:

Looks like br-netfilter is not loaded anymore in CI.

This ignores the preflight check which also got dropped in v1.30.

xref Slack

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 #

Area example:
/area provider/infrastructure-docker

@k8s-ci-robot k8s-ci-robot added this to the v1.6 milestone Jul 25, 2024
@k8s-ci-robot k8s-ci-robot added the area/provider/infrastructure-docker Issues or PRs related to the docker infrastructure provider label Jul 25, 2024
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jul 25, 2024
@chrischdi chrischdi changed the title 🐛 docker: ignore kubeadm preflight check for FileContent--proc-sys-net-bridge-bridge-nf-call-ip6tables 🐛 [release-1.6] docker: ignore kubeadm preflight check for FileContent--proc-sys-net-bridge-bridge-nf-call-ip6tables Jul 25, 2024
@k8s-ci-robot k8s-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Jul 25, 2024
@chrischdi
Copy link
Member Author

/test help

@k8s-ci-robot
Copy link
Contributor

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

  • /test pull-cluster-api-build-release-1-6
  • /test pull-cluster-api-e2e-blocking-release-1-6
  • /test pull-cluster-api-e2e-mink8s-release-1-6
  • /test pull-cluster-api-e2e-release-1-6
  • /test pull-cluster-api-e2e-upgrade-1-28-1-29-release-1-6
  • /test pull-cluster-api-test-mink8s-release-1-6
  • /test pull-cluster-api-test-release-1-6
  • /test pull-cluster-api-verify-release-1-6

The following commands are available to trigger optional jobs:

  • /test pull-cluster-api-apidiff-release-1-6

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

  • pull-cluster-api-apidiff-release-1-6
  • pull-cluster-api-build-release-1-6
  • pull-cluster-api-e2e-blocking-release-1-6
  • pull-cluster-api-test-release-1-6
  • pull-cluster-api-verify-release-1-6

In response to this:

/test help

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.

@chrischdi
Copy link
Member Author

/test pull-cluster-api-e2e-mink8s-release-1-6
/test pull-cluster-api-e2e-release-1-6
/test pull-cluster-api-e2e-upgrade-1-28-1-29-release-1-6

/cherry-pick release-1.5

@k8s-infra-cherrypick-robot

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

In response to this:

/test pull-cluster-api-e2e-mink8s-release-1-6
/test pull-cluster-api-e2e-release-1-6
/test pull-cluster-api-e2e-upgrade-1-28-1-29-release-1-6

/cherry-pick release-1.5

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.

@chrischdi
Copy link
Member Author

/hold

We may want this on main first and cherry-pick to all branches.

@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 Jul 25, 2024
@chrischdi chrischdi force-pushed the pr-release-1-6-ignore-ip6tables branch from 4a619f4 to b1d5dd3 Compare July 25, 2024 12:41
@chrischdi
Copy link
Member Author

Forgot to push unit test fix

/test pull-cluster-api-e2e-mink8s-release-1-6
/test pull-cluster-api-e2e-release-1-6
/test pull-cluster-api-e2e-upgrade-1-28-1-29-release-1-6

@chrischdi
Copy link
Member Author

/retest

@sbueringer
Copy link
Member

sbueringer commented Jul 25, 2024

/lgtm
/approve

@chrischdi If we only need this ignore on this branch (and release-1.5), then I would prefer to only ignore it on old branches.

My general goal would be only to ignore what we have to ignore so that we surface as much "real" findings as possible

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 25, 2024
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 9272648f005c8900d2dc2096088ef1897e17d65e

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: sbueringer

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 /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 Jul 25, 2024
@chrischdi
Copy link
Member Author

/lgtm /approve

@chrischdi If we only need this ignore on this branch (and release-1.5), then I would prefer to only ignore it on old branches.

My general goal would be only to ignore what we have to ignore so that we surface as much "real" findings as possible

It anyway only affects CAPD so we're fine to not have it on main :-)

/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 Jul 25, 2024
@sbueringer
Copy link
Member

sbueringer commented Jul 25, 2024

Even older CAPD versions are even ignoring all preflight checks. So we still have a trend of generally ignoring less preflight checks the newer CAPD gets :D (if you only look at latest patch versions)

@chrischdi
Copy link
Member Author

I guess that's a machinepool flake

/retest

@k8s-ci-robot k8s-ci-robot merged commit fa6bda0 into kubernetes-sigs:release-1.6 Jul 25, 2024
23 checks passed
@k8s-infra-cherrypick-robot

@chrischdi: #10938 failed to apply on top of branch "release-1.5":

Applying: docker: ignore kubeadm preflight check for FileContent--proc-sys-net-bridge-bridge-nf-call-ip6tables
Using index info to reconstruct a base tree...
M	test/infrastructure/docker/internal/provisioning/cloudinit/runcmd_test.go
Falling back to patching base and 3-way merge...
Auto-merging test/infrastructure/docker/internal/provisioning/cloudinit/runcmd_test.go
CONFLICT (content): Merge conflict in test/infrastructure/docker/internal/provisioning/cloudinit/runcmd_test.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 docker: ignore kubeadm preflight check for FileContent--proc-sys-net-bridge-bridge-nf-call-ip6tables
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/test pull-cluster-api-e2e-mink8s-release-1-6
/test pull-cluster-api-e2e-release-1-6
/test pull-cluster-api-e2e-upgrade-1-28-1-29-release-1-6

/cherry-pick release-1.5

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/provider/infrastructure-docker Issues or PRs related to the docker infrastructure 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. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants