Drop ExternalInfraCluster CRD in favour of AWSCluster #272
Conversation
|
/test e2e-aws |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: enxebre 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 |
openshift-ci
bot
added
the
approved
|
/hold |
openshift-ci
bot
added
the
do-not-merge/hold
|
/hold cancel |
openshift-ci
bot
removed
the
do-not-merge/hold
| return reconcile.Result{}, err | ||
| } | ||
|
|
||
| awsCluster := controlplaneoperator.ExternalInfraCluster(controlPlaneNamespace.Name, hcluster.Name) |
There was a problem hiding this comment.
should this only happen when Platform.Type == "AWS" ? Also s/ExternalInfraCluster/AWSCluster/
do we still create/reconcile an AWSCluster when Platform.Type == "None"?
There was a problem hiding this comment.
should this only happen when Platform.Type == "AWS
yes.
do we still create/reconcile an AWSCluster when Platform.Type == "None"?
No. Each provider must have their own infraCluster CR.
Let me update.
enxebre
force-pushed
the
aws-external-infra-clean
branch
from
9e928c1 to
c579830
Compare
|
/test e2e-aws |
1 similar comment
|
/test e2e-aws |
enxebre
force-pushed
the
aws-external-infra-clean
branch
from
c579830 to
8f6e5fa
Compare
|
Rebased after #269 |
|
/hold |
openshift-ci
bot
added
the
do-not-merge/hold
This PR drops the ExternalInfraCluster CRD in favour of AWSCluster. Originally we added support for externally managed infra in CAPA via the ExternalInfraCluster CRD kubernetes-sigs/cluster-api-provider-aws#2124 and we used that commit of CAPA in hypershift. Later on we decided to revert that approach upstream and reuse the existing ${infra}Cluster CRDs with an annotation to support externally managed infrastructure kubernetes-sigs/cluster-api#4135 This PR bring latest CAPI/CAPA. As a follow up we need to rebuild the images and consume them from quay.io/hypershift.
enxebre
force-pushed
the
aws-external-infra-clean
branch
from
8f6e5fa to
0ef36e1
Compare
|
Pushed changes so as discussed we'll run the aws controllers for platform None for now. |
|
/hold cancel |
openshift-ci
bot
removed
the
do-not-merge/hold
|
/lgtm |
This PR drops the ExternalInfraCluster CRD in favour of AWSCluster.
Originally we added support for externally managed infra in CAPA via the ExternalInfraCluster CRD kubernetes-sigs/cluster-api-provider-aws#2124 and we used that commit of CAPA in hypershift.
Later on we decided to revert that approach upstream and reuse the existing ${infra}Cluster CRDs with an annotation to support externally managed infrastructure kubernetes-sigs/cluster-api#4135
This PR bring latest CAPI/CAPA.
As a follow up we need to rebuild the images and consume them from quay.io/hypershift.