Skip to content

E2E wait for webhook ca injection#6144

Merged
k8s-ci-robot merged 4 commits into
kubernetes-sigs:mainfrom
willie-yao:fix-webhook-cert
Mar 12, 2026
Merged

E2E wait for webhook ca injection#6144
k8s-ci-robot merged 4 commits into
kubernetes-sigs:mainfrom
willie-yao:fix-webhook-cert

Conversation

@willie-yao
Copy link
Copy Markdown
Contributor

@willie-yao willie-yao commented Mar 4, 2026

What type of PR is this?
/kind failing-test

What this PR does / why we need it:
This is a PR attempting to fix webhook certificate errors

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

Special notes for your reviewer:

TODOs:

  • squashed commits
  • includes documentation
  • adds unit tests
  • cherry-pick candidate

Release note:

NONE

@k8s-ci-robot k8s-ci-robot added kind/failing-test Categorizes issue or PR as related to a consistently or frequently failing test. 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. labels Mar 4, 2026
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Mar 4, 2026
@k8s-ci-robot k8s-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Mar 4, 2026
@codecov
Copy link
Copy Markdown

codecov Bot commented Mar 4, 2026

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 44.43%. Comparing base (aa8af32) to head (6990b88).
⚠️ Report is 3 commits behind head on main.

Additional details and impacted files
@@           Coverage Diff           @@
##             main    #6144   +/-   ##
=======================================
  Coverage   44.43%   44.43%           
=======================================
  Files         280      280           
  Lines       25367    25367           
=======================================
  Hits        11272    11272           
  Misses      13283    13283           
  Partials      812      812           

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

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@willie-yao
Copy link
Copy Markdown
Contributor Author

/test pull-cluster-api-provider-azure-apiversion-upgrade
/test pull-cluster-api-provider-azure-e2e
/test pull-cluster-api-provider-azure-e2e-aks
/test pull-cluster-api-provider-azure-e2e-workload-upgrade
/test pull-cluster-api-provider-azure-aks-mgmt-e2e
/test pull-cluster-api-provider-azure-apidiff
/test pull-cluster-api-provider-azure-apiserver-ilb
/test pull-cluster-api-provider-azure-capi-e2e
/test pull-cluster-api-provider-azure-e2e-optional

@willie-yao
Copy link
Copy Markdown
Contributor Author

/test pull-cluster-api-provider-azure-apiversion-upgrade
/test pull-cluster-api-provider-azure-e2e
/test pull-cluster-api-provider-azure-e2e-aks
/test pull-cluster-api-provider-azure-e2e-workload-upgrade
/test pull-cluster-api-provider-azure-aks-mgmt-e2e
/test pull-cluster-api-provider-azure-apidiff
/test pull-cluster-api-provider-azure-apiserver-ilb
/test pull-cluster-api-provider-azure-capi-e2e
/test pull-cluster-api-provider-azure-e2e-optional

2 similar comments
@willie-yao
Copy link
Copy Markdown
Contributor Author

/test pull-cluster-api-provider-azure-apiversion-upgrade
/test pull-cluster-api-provider-azure-e2e
/test pull-cluster-api-provider-azure-e2e-aks
/test pull-cluster-api-provider-azure-e2e-workload-upgrade
/test pull-cluster-api-provider-azure-aks-mgmt-e2e
/test pull-cluster-api-provider-azure-apidiff
/test pull-cluster-api-provider-azure-apiserver-ilb
/test pull-cluster-api-provider-azure-capi-e2e
/test pull-cluster-api-provider-azure-e2e-optional

@willie-yao
Copy link
Copy Markdown
Contributor Author

/test pull-cluster-api-provider-azure-apiversion-upgrade
/test pull-cluster-api-provider-azure-e2e
/test pull-cluster-api-provider-azure-e2e-aks
/test pull-cluster-api-provider-azure-e2e-workload-upgrade
/test pull-cluster-api-provider-azure-aks-mgmt-e2e
/test pull-cluster-api-provider-azure-apidiff
/test pull-cluster-api-provider-azure-apiserver-ilb
/test pull-cluster-api-provider-azure-capi-e2e
/test pull-cluster-api-provider-azure-e2e-optional

@kubernetes-sigs kubernetes-sigs deleted a comment from k8s-ci-robot Mar 10, 2026
@willie-yao
Copy link
Copy Markdown
Contributor Author

/test pull-cluster-api-provider-azure-apiversion-upgrade
/test pull-cluster-api-provider-azure-e2e
/test pull-cluster-api-provider-azure-e2e-aks
/test pull-cluster-api-provider-azure-e2e-workload-upgrade
/test pull-cluster-api-provider-azure-aks-mgmt-e2e
/test pull-cluster-api-provider-azure-apidiff
/test pull-cluster-api-provider-azure-apiserver-ilb
/test pull-cluster-api-provider-azure-capi-e2e
/test pull-cluster-api-provider-azure-e2e-optional

1 similar comment
@willie-yao
Copy link
Copy Markdown
Contributor Author

/test pull-cluster-api-provider-azure-apiversion-upgrade
/test pull-cluster-api-provider-azure-e2e
/test pull-cluster-api-provider-azure-e2e-aks
/test pull-cluster-api-provider-azure-e2e-workload-upgrade
/test pull-cluster-api-provider-azure-aks-mgmt-e2e
/test pull-cluster-api-provider-azure-apidiff
/test pull-cluster-api-provider-azure-apiserver-ilb
/test pull-cluster-api-provider-azure-capi-e2e
/test pull-cluster-api-provider-azure-e2e-optional

Signed-off-by: William Yao <william2000yao@gmail.com>
Signed-off-by: William Yao <william2000yao@gmail.com>
Signed-off-by: William Yao <william2000yao@gmail.com>
@willie-yao willie-yao changed the title WIP: E2E wait for webhook ca injection E2E wait for webhook ca injection Mar 11, 2026
@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 Mar 11, 2026
@willie-yao
Copy link
Copy Markdown
Contributor Author

/label tide/merge-method-squash

@k8s-ci-robot k8s-ci-robot added the tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges. label Mar 11, 2026
Comment thread config/certmanager/certificate.yaml Outdated
kind: Issuer
name: selfsigned-issuer
privateKey:
rotationPolicy: Never
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

is this configuration change isolated to our E2E test environment? we wouldn't want to broadcast this change to release artifacts

cc @mboersma

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Oh you're right, good catch! I think this does affect release artifacts. Let me see if there's another way to do this

@willie-yao
Copy link
Copy Markdown
Contributor Author

/hold

@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 Mar 11, 2026
Signed-off-by: William Yao <william2000yao@gmail.com>
@willie-yao
Copy link
Copy Markdown
Contributor Author

/test pull-cluster-api-provider-azure-apiserver-ilb
/test pull-cluster-api-provider-azure-capi-e2e
/test pull-cluster-api-provider-azure-e2e-optional

apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- ../../../../../../config/default
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

❤️ 😀

Copy link
Copy Markdown
Contributor

@jackfrancis jackfrancis left a comment

Choose a reason for hiding this comment

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

/lgtm
/approve

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

LGTM label has been added.

DetailsGit tree hash: 3a8dc2f96d21040bc0809e7468940c91217bc766

@k8s-ci-robot
Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jackfrancis

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 Mar 11, 2026
@willie-yao
Copy link
Copy Markdown
Contributor Author

/retest

@willie-yao
Copy link
Copy Markdown
Contributor Author

/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 Mar 12, 2026
@willie-yao
Copy link
Copy Markdown
Contributor Author

/retest

@willie-yao
Copy link
Copy Markdown
Contributor Author

Tests are being really flaky. I'll investigate on main and see if it's a problem with this PR or something else going on

@willie-yao
Copy link
Copy Markdown
Contributor Author

/retest

@k8s-ci-robot k8s-ci-robot merged commit 8f15c47 into kubernetes-sigs:main Mar 12, 2026
29 checks passed
@github-project-automation github-project-automation Bot moved this from Todo to Done in CAPZ Planning Mar 12, 2026
@k8s-ci-robot k8s-ci-robot added this to the v1.23 milestone Mar 12, 2026
@mboersma
Copy link
Copy Markdown
Contributor

/cherry-pick release-1.22

@k8s-infra-cherrypick-robot
Copy link
Copy Markdown

@mboersma: #6144 failed to apply on top of branch "release-1.22":

Applying: Wait for webhook ca injection
Applying: refactor
Applying: rotation policy never
Applying: Dont affect E2E test environment
Using index info to reconstruct a base tree...
M	test/e2e/config/azure-dev.yaml
Falling back to patching base and 3-way merge...
Auto-merging test/e2e/config/azure-dev.yaml
CONFLICT (content): Merge conflict in test/e2e/config/azure-dev.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0004 Dont affect E2E test environment

Details

In response to this:

/cherry-pick release-1.22

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.

mboersma pushed a commit to mboersma/cluster-api-provider-azure that referenced this pull request Mar 19, 2026
* Wait for webhook ca injection

Signed-off-by: William Yao <william2000yao@gmail.com>

* refactor

Signed-off-by: William Yao <william2000yao@gmail.com>

* rotation policy never

Signed-off-by: William Yao <william2000yao@gmail.com>

* Dont affect E2E test environment

Signed-off-by: William Yao <william2000yao@gmail.com>

---------

Signed-off-by: William Yao <william2000yao@gmail.com>
openshift-merge-bot Bot pushed a commit to stolostron/cluster-api-provider-azure that referenced this pull request Apr 30, 2026
* Pin RKE2 provider to v0.21.1

* Bump Go toolchain to v1.24.13

* Remove Windows VMSS test

Signed-off-by: William Yao <william2000yao@gmail.com>

* Bump CAPI to v1.11.6

* increase CAPI remote connection grace period to fix HA upgrade flake

Signed-off-by: William Yao <william2000yao@gmail.com>

* E2E wait for webhook ca injection (kubernetes-sigs#6144)

* Wait for webhook ca injection

Signed-off-by: William Yao <william2000yao@gmail.com>

* refactor

Signed-off-by: William Yao <william2000yao@gmail.com>

* rotation policy never

Signed-off-by: William Yao <william2000yao@gmail.com>

* Dont affect E2E test environment

Signed-off-by: William Yao <william2000yao@gmail.com>

---------

Signed-off-by: William Yao <william2000yao@gmail.com>

* Add resource-version stability wait intervals for API upgrade tests

* [release-1.22] Bump CAPI to v1.11.7 (kubernetes-sigs#6174)

* Bump CAPI to v1.11.7

* Clean up AzureClusterID in aks_adopt spec

* Bump google.golang.org/grpc to v1.79.3

Fixes CVE-2026-33186 (GHSA-p77j-4mvh-x3m3): gRPC-Go authorization
bypass via missing leading slash in :path header. All grpc versions
< 1.79.3 are affected. This resolves the dependency-review CI failure.

* Fix MachinePoolScope.Close() recreating machines during deletion

* Fix lint: remove unused getVirtualMachineScaleSet, fix gci formatting

* Improve code comment about MachinePool sync guard

* [release-1.22] Bump CAPI to v1.11.8 (kubernetes-sigs#6218)

* Bump Go toolchain to v1.25.9

* Bump CAPI to v1.11.8

* Bump cert-manager to v1.20.1

* [release-1.22] Update trivy and bump opentelemetry to v1.43.0 (kubernetes-sigs#6223)

* Update trivy version to v0.69.3

* (deps): bump go.opentelemetry.io/otel from 1.40.0 to 1.43.0

* Implement smarter retry for az commands in peer-vnets flow

Signed-off-by: William Yao <william2000yao@gmail.com>

* Merge pull request kubernetes-sigs#6246 from mboersma/bump-cert-manager-v1.20.2

Bump cert-manager to v1.20.2

* Bump CAPI to v1.11.10

* Bump cloudbuild to use gcb-docker-gcloud image with Go v1.25

* Use upstream k8s images if no artifacts are built

Signed-off-by: William Yao <william2000yao@gmail.com>

* post sync upstream/release-1.22 -> stolostron/backplane-2.17

* add tags for Konflux imagex and update stolostron/Dockerfile

---------

Signed-off-by: William Yao <william2000yao@gmail.com>
Co-authored-by: Jon Huhn <nojnhuh@users.noreply.github.com>
Co-authored-by: Matt Boersma <Matt.Boersma@microsoft.com>
Co-authored-by: William Yao <william2000yao@gmail.com>
Co-authored-by: Willie Yao <47200969+willie-yao@users.noreply.github.com>
Co-authored-by: Kubernetes Prow Robot <20407524+k8s-ci-robot@users.noreply.github.com>
RadekCap pushed a commit to stolostron/cluster-api-provider-azure that referenced this pull request May 4, 2026
* Wait for webhook ca injection

Signed-off-by: William Yao <william2000yao@gmail.com>

* refactor

Signed-off-by: William Yao <william2000yao@gmail.com>

* rotation policy never

Signed-off-by: William Yao <william2000yao@gmail.com>

* Dont affect E2E test environment

Signed-off-by: William Yao <william2000yao@gmail.com>

---------

Signed-off-by: William Yao <william2000yao@gmail.com>
@jackfrancis
Copy link
Copy Markdown
Contributor

Can we close #5690 ?

@willie-yao
Copy link
Copy Markdown
Contributor Author

@jackfrancis this didn't actually fix #5690 and Matt is working on a different approach in #6221

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. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/failing-test Categorizes issue or PR as related to a consistently or frequently failing test. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note-none Denotes a PR that doesn't merit a release note. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges.

Projects

Status: Done

Development

Successfully merging this pull request may close these issues.

5 participants