Merge https://github.com/kubernetes-sigs/cluster-api-provider-aws:v2.8.3 (3cced50) into main#553

Open

cloud-team-rebase-bot[bot] wants to merge 22 commits intoopenshift:mainfrom

openshift-cloud-team:rebase-bot-main

Commits on Apr 9, 2025

chore: bump calico for e2e tests

richardcase
authored and
k8s-infra-cherrypick-robot
committed

Commits on Apr 13, 2025

Merge pull request #5463 from k8s-infra-cherrypick-robot/cherry-pick-5459-to-release-2.8
k8s-ci-robot
authored

Commits on May 21, 2025

fix(addons): avoid infinite reconciliation loop

mloiseleur
authored and
k8s-infra-cherrypick-robot
committed

Commits on May 28, 2025

Merge pull request #5501 from k8s-infra-cherrypick-robot/cherry-pick-5458-to-release-2.8
k8s-ci-robot
authored

Commits on Jun 26, 2025

merge upstream/v2.8.3 into main
cloud-team-rebase-bot
committed
UPSTREAM: <carry>: Add openshift specific changes

alexander-demicev
authored and
cloud-team-rebase-bot
committed
UPSTREAM: <carry>: manifests: add vap for infraclusters: vendor

damdo
authored and
cloud-team-rebase-bot
committed
UPSTREAM: <carry>: manifests: add vap for infraclusters

damdo
authored and
cloud-team-rebase-bot
committed
UPSTREAM: <carry>: OWNERS: update subcomponent

damdo
authored and
cloud-team-rebase-bot
committed
UPSTREAM: <carry>: Updating ose-aws-cluster-api-controllers-container image to be consistent with ART for 4.18

AOS Automation Release Team
authored and
cloud-team-rebase-bot
committed
UPSTREAM: <carry>: Only tag NetworkInterfaces in RunInstances if IAM Allows It

joshbranham
authored and
cloud-team-rebase-bot
committed
UPSTREAM: <carry>: Updating ose-aws-cluster-api-controllers-container image to be consistent with ART for 4.19

AOS Automation Release Team
authored and
cloud-team-rebase-bot
committed
UPSTREAM: <carry>: Remove unnecessary kustomize

RadekManak
authored and
cloud-team-rebase-bot
committed
UPSTREAM: <carry>: Update manifests generator tooling

RadekManak
authored and
cloud-team-rebase-bot
committed
UPSTREAM: <carry>: update go mod dependency for konflux

ashwindasr
authored and
cloud-team-rebase-bot
committed
UPSTREAM: <carry>: Update manifests-gen dependency

JoelSpeed
authored and
cloud-team-rebase-bot
committed
UPSTREAM: <carry>: Update generated manifests

JoelSpeed
authored and
cloud-team-rebase-bot
committed
UPSTREAM: <carry>: Reference main branch for CI

nrb
authored and
cloud-team-rebase-bot
committed
UPSTREAM: <drop>: Update manifests generator
cloud-team-rebase-bot
committed
UPSTREAM: <drop>: Generate OpenShift manifests
cloud-team-rebase-bot
committed
UPSTREAM: <drop>: Updating and vendoring go modules after an upstream rebase
cloud-team-rebase-bot
committed
UPSTREAM: <carry>: Updating ose-aws-cluster-api-controllers-container image to be consistent with ART for 4.20

AOS Automation Release Team
authored and
cloud-team-rebase-bot
committed