Skip to content

fix: Correctly set external cloud provider for AWS #210

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Oct 5, 2023
Merged

fix: Correctly set external cloud provider for AWS #210

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions charts/capi-runtime-extensions/defaultclusterclasses/aws-cluster-class.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,19 +78,19 @@ spec:
clusterConfiguration:
apiServer:
extraArgs:
cloud-provider: aws
cloud-provider: external
controllerManager:
extraArgs:
cloud-provider: aws
cloud-provider: external
initConfiguration:
nodeRegistration:
kubeletExtraArgs:
cloud-provider: aws
cloud-provider: external
name: '{{ ds.meta_data.local_hostname }}'
joinConfiguration:
nodeRegistration:
kubeletExtraArgs:
cloud-provider: aws
cloud-provider: external
name: '{{ ds.meta_data.local_hostname }}'
---
apiVersion: infrastructure.cluster.x-k8s.io/v1beta2
Expand Down Expand Up @@ -129,5 +129,5 @@ spec:
joinConfiguration:
nodeRegistration:
kubeletExtraArgs:
cloud-provider: aws
cloud-provider: external
name: '{{ ds.meta_data.local_hostname }}'
3 changes: 3 additions & 0 deletions hack/examples/sync.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,6 @@ kustomize build ./hack/examples |
>(gojq --yaml-input --yaml-output '. | select(.metadata.labels["cluster.x-k8s.io/provider"] == "aws" and ( .kind != "Cluster" and .kind != "AWSClusterStaticIdentity"))' >"${EXAMPLE_CLUSTERCLASSES_DIR}/aws-cluster-class.yaml") \
>(gojq --yaml-input --yaml-output '. | select(.metadata.labels["cluster.x-k8s.io/provider"] == "aws" and ( .kind == "Cluster" or .kind == "AWSClusterStaticIdentity"))' >"${EXAMPLE_CLUSTERS_DIR}/aws-cluster.yaml") \
>/dev/null

# TODO Remove once CAPA templates default to using external cloud provider.
sed -i'' s/cloud-provider:\ aws/cloud-provider:\ external/g "${EXAMPLE_CLUSTERCLASSES_DIR}/aws-cluster-class.yaml"
16 changes: 8 additions & 8 deletions make/clusterctl.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
.PHONY: clusterctl.init
clusterctl.init:
env CLUSTER_TOPOLOGY=true \
EXP_RUNTIME_SDK=true \
EXP_CLUSTER_RESOURCE_SET=true \
EXP_MACHINE_POOL=true \
AWS_B64ENCODED_CREDENTIALS= \
clusterctl init \
--kubeconfig=$(KIND_KUBECONFIG) \
--infrastructure docker,aws \
--wait-providers
EXP_RUNTIME_SDK=true \
EXP_CLUSTER_RESOURCE_SET=true \
EXP_MACHINE_POOL=true \
AWS_B64ENCODED_CREDENTIALS= \
clusterctl init \
--kubeconfig=$(KIND_KUBECONFIG) \
--infrastructure docker,aws \
--wait-providers

.PHONY: clusterctl.delete
clusterctl.delete:
Expand Down