Merge pull request k0rdent#48 from Mirantis/template-fixes

Remove unnecessary params from aws standalone template
bnallapeta · Jun 24, 2024 · 66f26aa · 66f26aa
2 parents 90f0497 + 0ccf864
commit 66f26aa
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 22 deletions.
diff --git a/templates/aws-standalone-cp/templates/awscluster.yaml b/templates/aws-standalone-cp/templates/awscluster.yaml
@@ -7,20 +7,6 @@ spec:
   # identityRef:
     # kind: AWSClusterStaticIdentity
     # name: aws-identity-name
-  network:
-    vpc:
-      id: {{ .Values.vpcID }}
-    {{- with .Values.subnets }}
-    subnets:
-      {{- toYaml . | nindent 6 }}
-    {{- end }}
   controlPlaneLoadBalancer:
     healthCheckProtocol: TCP
     loadBalancerType: nlb
-    additionalListeners:
-    - port: 8132
-      protocol: TCP
-    {{- range $id := .Values.controlPlaneLoadBalancer.additionalSecurityGroups }}
-    additionalSecurityGroups:
-    - {{ $id }}
-    {{- end }}
diff --git a/templates/aws-standalone-cp/templates/k0scontrolplane.yaml b/templates/aws-standalone-cp/templates/k0scontrolplane.yaml
@@ -10,6 +10,7 @@ spec:
       - --enable-worker
       - --enable-cloud-provider
       - --kubelet-extra-args="--cloud-provider=external --hostname-override=$(hostname --fqdn)"
+      - --disable-components=konnectivity-server
     k0s:
       apiVersion: k0s.k0sproject.io/v1beta1
       kind: ClusterConfig

diff --git a/templates/aws-standalone-cp/templates/k0sworkerconfigtemplate.yaml b/templates/aws-standalone-cp/templates/k0sworkerconfigtemplate.yaml
@@ -8,4 +8,4 @@ spec:
       version: {{ .Values.k0s.version }}
       args:
       - --enable-cloud-provider
-      - --kubelet-extra-args="--cloud-provider=external --hostname-override=$(hostname --fqdn)"
+      - --kubelet-extra-args="--cloud-provider=external --hostname-override=$(hostname --fqdn)"
diff --git a/templates/aws-standalone-cp/values.yaml b/templates/aws-standalone-cp/values.yaml
@@ -11,16 +11,9 @@ clusterNetwork:
     - "10.96.0.0/12"
 
 # AWS cluster parameters
-vpcID: ""
 region: ""
 sshKeyName: ""
 publicIP: false
-subnets:
-  - id: ""
-    availabilityZone: ""
-
-controlPlaneLoadBalancer:
-  additionalSecurityGroups: []
 
 # AWS machines parameters
 controlPlane: