Skip to content
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

Fix AWS hosted cluster template networking issue (fixes #788) #810

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix AWS hosted cluster template networking issue (fixes #788) #810

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
12 changes: 8 additions & 4 deletions templates/cluster/aws-hosted-cp/templates/k0smotroncontrolplane.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ spec:
extensions:
helm:
repositories:
- name: aws-cloud-controller-manager
- name: mirantis
{{- if .Values.extensions.chartRepository }}
url: {{ .Values.extensions.chartRepository }}
{{- else }}
url: https://kubernetes.github.io/cloud-provider-aws
url: https://charts.mirantis.com
{{- end }}
- name: aws-ebs-csi-driver
{{- if .Values.extensions.chartRepository }}
Expand All @@ -41,8 +41,8 @@ spec:
charts:
- name: aws-cloud-controller-manager
namespace: kube-system
chartname: aws-cloud-controller-manager/aws-cloud-controller-manager
version: "0.0.8"
chartname: mirantis/aws-cloud-controller-manager
version: "0.0.9"
values: |
image:
{{- if .Values.extensions.imageRepository }}
Expand All @@ -55,6 +55,10 @@ spec:
- --cluster-cidr={{ first .Values.clusterNetwork.pods.cidrBlocks }}
- --allocate-node-cidrs=true
- --cluster-name={{ include "cluster.name" . }}
cloudConfig:
enabled: {{ ne .Values.managementClusterName "" }}
global:
KubernetesClusterID: {{ .Values.managementClusterName }}
# Removing the default `node-role.kubernetes.io/control-plane` node selector
# TODO: it does not work
nodeSelector:
Expand Down
4 changes: 4 additions & 0 deletions templates/cluster/aws-hosted-cp/values.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@
"clusterIdentity"
],
"properties": {
"managementClusterName" : {
"description": "The name of the management cluster that this template is being deployed on",
"type": "string"
},
"workersNumber": {
"description": "The number of the worker machines",
"type": "integer",
Expand Down
5 changes: 4 additions & 1 deletion templates/cluster/aws-hosted-cp/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,4 +52,7 @@ k0s:
# k0s extensions.
extensions:
chartRepository: ""
imageRepository: ""
imageRepository: ""

# Name of the management cluster that this template is being deployed on
managementClusterName: ""
Loading