diff --git a/templates/aws-standalone-cp/templates/awscluster.yaml b/templates/aws-standalone-cp/templates/awscluster.yaml index 1b8a6167b..47642fbf3 100644 --- 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 }} \ No newline at end of file diff --git a/templates/aws-standalone-cp/templates/k0scontrolplane.yaml b/templates/aws-standalone-cp/templates/k0scontrolplane.yaml index f7ac2e522..98a713ac9 100644 --- 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 index 90b654cb2..8eda68514 100644 --- 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)" \ No newline at end of file + - --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 index a08121392..24a5fd7bb 100644 --- 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: