OCPCLOUD-3101: Merge https://github.com/kubernetes-sigs/cluster-api-provider-azure:v1.21.1 (8ee5386) into master #350

cloud-team-rebase-bot · 2025-08-21T12:18:59Z

No description provided.

openshift-ci · 2025-08-21T12:26:08Z

Hi @cloud-team-rebase-bot[bot]. Thanks for your PR.

I'm waiting for a openshift member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Details

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.

…ot/cherry-pick-5833-to-release-1.21 [release-1.21] Drop error condition from AKS node public IP prefix e2e test

devguyio · 2025-09-03T14:21:25Z

/ok-to-test

…ot/cherry-pick-5866-to-release-1.21 [release-1.21] Skip AKS Fleet e2e test

…-toolchain-release-1.21 [release-1.21] Get GO_VERSION from toolchain statment

…-ms-auth-lib [release-1.21] update azidentity to v1.12.0

…-1.21 [release-1.21] Bump Go toolchain to v1.24.8

damdo · 2025-11-19T17:28:10Z

CAPZ v1.21.1 doesn't contain CAPI v1.11, we are waiting for a bump to merge upstream to get this synced/tested again.

# Conflicts: # .github/workflows/cover.yaml # .github/workflows/release.yaml # Conflicts: # .github/workflows/cover.yaml # .github/workflows/lint-docs.yaml # .github/workflows/release.yaml # OWNERS_ALIASES # Conflicts: # .github/ISSUE_TEMPLATE/bug_report.md # .github/workflows/cover.yaml # .github/workflows/lint-docs.yaml # .github/workflows/release.yaml # OWNERS_ALIASES # Conflicts: # .github/pull_request_template.md # .github/workflows/cover.yaml # .github/workflows/lint-docs.yaml # .github/workflows/release.yaml # OWNERS_ALIASES # Conflicts: # .github/workflows/cover.yaml # .github/workflows/lint-docs.yaml # .github/workflows/release.yaml # Conflicts: # .github/workflows/cover.yaml # .github/workflows/lint-docs.yaml # .github/workflows/release.yaml # Conflicts: # .github/workflows/cover.yaml # .github/workflows/lint-docs.yaml # .github/workflows/release.yaml # Conflicts: # .github/workflows/cover.yaml # .github/workflows/lint-docs.yaml # .github/workflows/release.yaml # OWNERS_ALIASES # Conflicts: # .github/workflows/cover.yaml # .github/workflows/lint-docs.yaml # .github/workflows/release.yaml # OWNERS_ALIASES

Signed-off-by: Nolan Brubaker <[email protected]>

The CRDs should be added back and the component files re-generated when we have a corresponding deployment and images Signed-off-by: Nolan Brubaker <[email protected]> # Conflicts: # openshift/infrastructure-components-openshift.yaml # openshift/manifests/0000_30_cluster-api_04_cm.infrastructure-azure.yaml

# Conflicts: # openshift/infrastructure-components-openshift.yaml # openshift/manifests/0000_30_cluster-api_04_cm.infrastructure-azure.yaml

…er image to be consistent with ART for 4.19 Reconciling with https://github.com/openshift/ocp-build-data/tree/a39508c86497b4e5e463d7b2c78e51e577be9e7d/images/ose-azure-cluster-api-controllers.yml

# Conflicts: # openshift/infrastructure-components.yaml

# Conflicts: # openshift/tools/vendor/gopkg.in/evanphx/json-patch.v4/.gitignore # openshift/tools/vendor/gopkg.in/evanphx/json-patch.v4/LICENSE # openshift/tools/vendor/gopkg.in/evanphx/json-patch.v4/README.md # openshift/tools/vendor/gopkg.in/evanphx/json-patch.v4/errors.go # openshift/tools/vendor/gopkg.in/evanphx/json-patch.v4/merge.go # openshift/tools/vendor/gopkg.in/evanphx/json-patch.v4/patch.go # openshift/tools/vendor/modules.txt # openshift/tools/vendor/sigs.k8s.io/kustomize/api/filters/imagetag/updater.go # openshift/tools/vendor/sigs.k8s.io/kustomize/api/filters/nameref/nameref.go # openshift/tools/vendor/sigs.k8s.io/kustomize/api/filters/patchjson6902/patchjson6902.go # openshift/tools/vendor/sigs.k8s.io/kustomize/api/filters/replacement/replacement.go # openshift/tools/vendor/sigs.k8s.io/kustomize/api/internal/accumulator/loadconfigfromcrds.go # openshift/tools/vendor/sigs.k8s.io/kustomize/api/internal/builtins/HelmChartInflationGenerator.go # openshift/tools/vendor/sigs.k8s.io/kustomize/api/internal/builtins/PatchJson6902Transformer.go # openshift/tools/vendor/sigs.k8s.io/kustomize/api/internal/builtins/PatchTransformer.go # openshift/tools/vendor/sigs.k8s.io/kustomize/api/internal/builtins/SortOrderTransformer.go # openshift/tools/vendor/sigs.k8s.io/kustomize/api/internal/git/cloner.go # openshift/tools/vendor/sigs.k8s.io/kustomize/api/internal/image/image.go # openshift/tools/vendor/sigs.k8s.io/kustomize/api/internal/konfig/builtinpluginconsts/commonannotations.go # openshift/tools/vendor/sigs.k8s.io/kustomize/api/internal/konfig/builtinpluginconsts/commonlabels.go # openshift/tools/vendor/sigs.k8s.io/kustomize/api/internal/konfig/builtinpluginconsts/defaultconfig.go # openshift/tools/vendor/sigs.k8s.io/kustomize/api/internal/konfig/builtinpluginconsts/doc.go # openshift/tools/vendor/sigs.k8s.io/kustomize/api/internal/konfig/builtinpluginconsts/images.go # openshift/tools/vendor/sigs.k8s.io/kustomize/api/internal/konfig/builtinpluginconsts/metadatalabels.go # openshift/tools/vendor/sigs.k8s.io/kustomize/api/internal/konfig/builtinpluginconsts/nameprefix.go # openshift/tools/vendor/sigs.k8s.io/kustomize/api/internal/konfig/builtinpluginconsts/namereference.go # openshift/tools/vendor/sigs.k8s.io/kustomize/api/internal/konfig/builtinpluginconsts/namespace.go # openshift/tools/vendor/sigs.k8s.io/kustomize/api/internal/konfig/builtinpluginconsts/namesuffix.go # openshift/tools/vendor/sigs.k8s.io/kustomize/api/internal/konfig/builtinpluginconsts/replicas.go # openshift/tools/vendor/sigs.k8s.io/kustomize/api/internal/konfig/builtinpluginconsts/templatelabels.go # openshift/tools/vendor/sigs.k8s.io/kustomize/api/internal/konfig/builtinpluginconsts/varreference.go # openshift/tools/vendor/sigs.k8s.io/kustomize/api/internal/loader/errors.go # openshift/tools/vendor/sigs.k8s.io/kustomize/api/internal/loader/fileloader.go # openshift/tools/vendor/sigs.k8s.io/kustomize/api/internal/loader/loader.go # openshift/tools/vendor/sigs.k8s.io/kustomize/api/internal/loader/loadrestrictions.go # openshift/tools/vendor/sigs.k8s.io/kustomize/api/internal/plugins/builtinconfig/loaddefaultconfig.go # openshift/tools/vendor/sigs.k8s.io/kustomize/api/internal/plugins/builtinconfig/namebackreferences.go # openshift/tools/vendor/sigs.k8s.io/kustomize/api/internal/plugins/builtinconfig/transformerconfig.go # openshift/tools/vendor/sigs.k8s.io/kustomize/api/internal/plugins/execplugin/execplugin.go # openshift/tools/vendor/sigs.k8s.io/kustomize/api/internal/plugins/fnplugin/fnplugin.go # openshift/tools/vendor/sigs.k8s.io/kustomize/api/internal/plugins/loader/loader.go # openshift/tools/vendor/sigs.k8s.io/kustomize/api/internal/target/kusttarget.go # openshift/tools/vendor/sigs.k8s.io/kustomize/api/internal/target/kusttarget_configplugin.go # openshift/tools/vendor/sigs.k8s.io/kustomize/api/internal/utils/errtimeout.go # openshift/tools/vendor/sigs.k8s.io/kustomize/api/internal/utils/timedcall.go # openshift/tools/vendor/sigs.k8s.io/kustomize/api/krusty/kustomizer.go # openshift/tools/vendor/sigs.k8s.io/kustomize/api/provenance/provenance.go # openshift/tools/vendor/sigs.k8s.io/kustomize/api/resmap/reswrangler.go # openshift/tools/vendor/sigs.k8s.io/kustomize/api/resource/factory.go # openshift/tools/vendor/sigs.k8s.io/kustomize/api/resource/resource.go # openshift/tools/vendor/sigs.k8s.io/kustomize/api/types/fieldspec.go # openshift/tools/vendor/sigs.k8s.io/kustomize/api/types/generatorargs.go # openshift/tools/vendor/sigs.k8s.io/kustomize/api/types/helmchartargs.go # openshift/tools/vendor/sigs.k8s.io/kustomize/api/types/kustomization.go # openshift/tools/vendor/sigs.k8s.io/kustomize/api/types/labels.go # openshift/tools/vendor/sigs.k8s.io/kustomize/api/types/pluginconfig.go # openshift/tools/vendor/sigs.k8s.io/kustomize/api/types/pluginrestrictions.go # openshift/tools/vendor/sigs.k8s.io/kustomize/kyaml/fn/runtime/container/container.go # openshift/tools/vendor/sigs.k8s.io/kustomize/kyaml/fn/runtime/runtimeutil/functiontypes.go # openshift/tools/vendor/sigs.k8s.io/kustomize/kyaml/kio/ignorefilesmatcher.go # openshift/tools/vendor/sigs.k8s.io/kustomize/kyaml/openapi/kustomizationapi/swagger.go # openshift/tools/vendor/sigs.k8s.io/kustomize/kyaml/openapi/openapi.go # openshift/tools/vendor/sigs.k8s.io/kustomize/kyaml/runfn/runfn.go # openshift/tools/vendor/sigs.k8s.io/kustomize/kyaml/yaml/alias.go # openshift/tools/vendor/sigs.k8s.io/kustomize/kyaml/yaml/compatibility.go # openshift/tools/vendor/sigs.k8s.io/kustomize/kyaml/yaml/fns.go # openshift/tools/vendor/sigs.k8s.io/kustomize/kyaml/yaml/kfns.go # openshift/tools/vendor/sigs.k8s.io/kustomize/kyaml/yaml/match.go # openshift/tools/vendor/sigs.k8s.io/kustomize/kyaml/yaml/merge2/merge2.go # openshift/tools/vendor/sigs.k8s.io/kustomize/kyaml/yaml/rnode.go # openshift/tools/vendor/sigs.k8s.io/kustomize/kyaml/yaml/types.go # openshift/tools/vendor/sigs.k8s.io/kustomize/kyaml/yaml/walk/map.go # openshift/tools/vendor/sigs.k8s.io/yaml/goyaml.v3/LICENSE # openshift/tools/vendor/sigs.k8s.io/yaml/goyaml.v3/NOTICE # openshift/tools/vendor/sigs.k8s.io/yaml/goyaml.v3/README.md # openshift/tools/vendor/sigs.k8s.io/yaml/goyaml.v3/apic.go # openshift/tools/vendor/sigs.k8s.io/yaml/goyaml.v3/decode.go # openshift/tools/vendor/sigs.k8s.io/yaml/goyaml.v3/emitterc.go # openshift/tools/vendor/sigs.k8s.io/yaml/goyaml.v3/encode.go # openshift/tools/vendor/sigs.k8s.io/yaml/goyaml.v3/parserc.go # openshift/tools/vendor/sigs.k8s.io/yaml/goyaml.v3/readerc.go # openshift/tools/vendor/sigs.k8s.io/yaml/goyaml.v3/resolve.go # openshift/tools/vendor/sigs.k8s.io/yaml/goyaml.v3/scannerc.go # openshift/tools/vendor/sigs.k8s.io/yaml/goyaml.v3/sorter.go # openshift/tools/vendor/sigs.k8s.io/yaml/goyaml.v3/writerc.go # openshift/tools/vendor/sigs.k8s.io/yaml/goyaml.v3/yaml.go # openshift/tools/vendor/sigs.k8s.io/yaml/goyaml.v3/yamlh.go # openshift/tools/vendor/sigs.k8s.io/yaml/goyaml.v3/yamlprivateh.go

…er image to be consistent with ART for 4.20 Reconciling with https://github.com/openshift/ocp-build-data/tree/dfb5c7d531490cfdc61a3b88bc533702b9624997/images/ose-azure-cluster-api-controllers.yml

…er image to be consistent with ART for 4.21 Reconciling with https://github.com/openshift/ocp-build-data/tree/4fbe3fab45239dc4be6f5d9d98a0bf36e0274ec9/images/ose-azure-cluster-api-controllers.yml

…er image to be consistent with ART for 4.22 Reconciling with https://github.com/openshift/ocp-build-data/tree/087d1930e36b609f77d73bd8a313d85c940cff4d/images/ose-azure-cluster-api-controllers.yml

… rebase

openshift-ci · 2025-12-25T15:20:02Z

@cloud-team-rebase-bot[bot]: 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
ci/prow/e2e-azurestack-ipi	`4f20f32`	link	false	`/test e2e-azurestack-ipi`
ci/prow/okd-scos-e2e-aws-ovn	`c3f7782`	link	false	`/test okd-scos-e2e-aws-ovn`
ci/prow/okd-scos-images	`43d7df2`	link	true	`/test okd-scos-images`

Full PR test history. Your PR dashboard.

Details

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.

openshift-ci bot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Aug 21, 2025

openshift-ci bot requested review from mdbooth and theobarberbany August 21, 2025 12:28

Drop error condition from AKS node public IP prefix e2e test

1c3377f

cloud-team-bot bot force-pushed the rebase-bot-master branch from 9cd7fa3 to 2708379 Compare August 25, 2025 12:25

Merge pull request kubernetes-sigs#5836 from k8s-infra-cherrypick-rob…

21ae8a8

…ot/cherry-pick-5833-to-release-1.21 [release-1.21] Drop error condition from AKS node public IP prefix e2e test

cloud-team-bot bot force-pushed the rebase-bot-master branch 2 times, most recently from a645c27 to ba59670 Compare September 1, 2025 12:26

openshift-ci bot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Sep 3, 2025

cloud-team-bot bot force-pushed the rebase-bot-master branch 2 times, most recently from 8b85a6b to 11a6aa5 Compare September 8, 2025 12:23

nojnhuh and others added 2 commits September 12, 2025 17:29

Skip AKS Fleet e2e test

a0c1a9e

Merge pull request kubernetes-sigs#5870 from k8s-infra-cherrypick-rob…

b20695b

…ot/cherry-pick-5866-to-release-1.21 [release-1.21] Skip AKS Fleet e2e test

cloud-team-bot bot force-pushed the rebase-bot-master branch from 11a6aa5 to 731c36c Compare September 15, 2025 12:23

Get GO_VERSION from toolchain statment

9fc4dee

cloud-team-bot bot force-pushed the rebase-bot-master branch from 731c36c to 502ec34 Compare September 18, 2025 12:22

Merge pull request kubernetes-sigs#5879 from mboersma/go-version-from…

3107393

…-toolchain-release-1.21 [release-1.21] Get GO_VERSION from toolchain statment

cloud-team-bot bot force-pushed the rebase-bot-master branch 2 times, most recently from a102d10 to d6735a6 Compare September 25, 2025 12:20

jackfrancis and others added 2 commits September 30, 2025 15:26

[release-1.21] update azidentity to v1.12.0

a786904

Merge pull request kubernetes-sigs#5888 from jackfrancis/release-1.21…

9f870f8

…-ms-auth-lib [release-1.21] update azidentity to v1.12.0

cloud-team-bot bot force-pushed the rebase-bot-master branch 3 times, most recently from 4f20f32 to c5373b8 Compare October 9, 2025 12:22

cloud-team-bot bot force-pushed the rebase-bot-master branch from c5373b8 to 75764de Compare October 13, 2025 12:17

mboersma and others added 2 commits October 14, 2025 11:04

Bump Go toolchain to v1.24.8

13712f6

Merge pull request kubernetes-sigs#5905 from mboersma/bump-go-release…

307bd4a

…-1.21 [release-1.21] Bump Go toolchain to v1.24.8

cloud-team-bot bot force-pushed the rebase-bot-master branch from c3f7782 to 8cef7b8 Compare November 17, 2025 12:26

cloud-team-bot bot force-pushed the rebase-bot-master branch 2 times, most recently from 17e0a73 to 252e789 Compare November 24, 2025 12:27

cloud-team-bot bot force-pushed the rebase-bot-master branch from 252e789 to aad1a3b Compare December 1, 2025 12:12

cloud-team-bot bot force-pushed the rebase-bot-master branch 2 times, most recently from fd7ab71 to 3f18e54 Compare December 11, 2025 12:08

cloud-team-bot bot force-pushed the rebase-bot-master branch 2 times, most recently from fd35e25 to aaa6f56 Compare December 22, 2025 12:16

cloud-team-rebase-bot and others added 19 commits December 25, 2025 12:10

merge upstream/v1.21.1 into master

78867ad

UPSTREAM: <carry>: Add manifest generator tool

ae1b78f

UPSTREAM: <carry>: Add e2e-test.sh script

686521d

UPSTREAM: <carry>: Delete ASO deployment

3c9ef09

Signed-off-by: Nolan Brubaker <[email protected]>

UPSTREAM: <carry>: Disable ASO API feature gate

1a5536f

# Conflicts: # openshift/infrastructure-components-openshift.yaml # openshift/manifests/0000_30_cluster-api_04_cm.infrastructure-azure.yaml

UPSTREAM: <carry>: Updating ose-azure-cluster-api-controllers-contain…

6c16446

…er image to be consistent with ART for 4.19 Reconciling with https://github.com/openshift/ocp-build-data/tree/a39508c86497b4e5e463d7b2c78e51e577be9e7d/images/ose-azure-cluster-api-controllers.yml

UPSTREAM: <carry>: Remove unnecessary kustomize

6d0b32e

# Conflicts: # openshift/infrastructure-components.yaml

UPSTREAM: <carry>: update go mod dependency for konflux

58ff769

UPSTREAM: <carry>: Updating ose-azure-cluster-api-controllers-contain…

8cb0434

…er image to be consistent with ART for 4.20 Reconciling with https://github.com/openshift/ocp-build-data/tree/dfb5c7d531490cfdc61a3b88bc533702b9624997/images/ose-azure-cluster-api-controllers.yml

UPSTREAM: <carry>: Sync OWNERS file

0dbd34f

UPSTREAM: <carry>: Sync OWNERS file

1d22a7e

UPSTREAM: <carry>: Updating ose-azure-cluster-api-controllers-contain…

3c50d34

…er image to be consistent with ART for 4.21 Reconciling with https://github.com/openshift/ocp-build-data/tree/4fbe3fab45239dc4be6f5d9d98a0bf36e0274ec9/images/ose-azure-cluster-api-controllers.yml

UPSTREAM: <carry>: Updating ose-azure-cluster-api-controllers-contain…

2438bca

…er image to be consistent with ART for 4.22 Reconciling with https://github.com/openshift/ocp-build-data/tree/087d1930e36b609f77d73bd8a313d85c940cff4d/images/ose-azure-cluster-api-controllers.yml

UPSTREAM: <drop>: Update manifests generator

f08ddef

UPSTREAM: <drop>: Generate OpenShift manifests

72fd5c4

UPSTREAM: <drop>: Updating and vendoring go modules after an upstream…

43d7df2

… rebase

cloud-team-bot bot force-pushed the rebase-bot-master branch from aaa6f56 to 43d7df2 Compare December 25, 2025 12:12

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

OCPCLOUD-3101: Merge https://github.com/kubernetes-sigs/cluster-api-provider-azure:v1.21.1 (8ee5386) into master #350

OCPCLOUD-3101: Merge https://github.com/kubernetes-sigs/cluster-api-provider-azure:v1.21.1 (8ee5386) into master #350

Uh oh!

cloud-team-rebase-bot bot commented Aug 21, 2025

Uh oh!

openshift-ci bot commented Aug 21, 2025

Uh oh!

devguyio commented Sep 3, 2025

Uh oh!

damdo commented Nov 19, 2025

Uh oh!

openshift-ci bot commented Dec 25, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

13 participants

OCPCLOUD-3101: Merge https://github.com/kubernetes-sigs/cluster-api-provider-azure:v1.21.1 (8ee5386) into master #350

Are you sure you want to change the base?

OCPCLOUD-3101: Merge https://github.com/kubernetes-sigs/cluster-api-provider-azure:v1.21.1 (8ee5386) into master #350

Uh oh!

Conversation

cloud-team-rebase-bot bot commented Aug 21, 2025

Uh oh!

openshift-ci bot commented Aug 21, 2025

Uh oh!

devguyio commented Sep 3, 2025

Uh oh!

damdo commented Nov 19, 2025

Uh oh!

openshift-ci bot commented Dec 25, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

13 participants