Merge pull request #122 from a13x5/HMC-110

Remove additionalSecurityGroupIDs parameter for aws-standalone
K0rdent · Aug 1, 2024 · e28b647 · e28b647
2 parents 88003b4 + 4e4040f
commit e28b647
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -169,7 +169,6 @@ spec:
         cidrBlocks:
         - 10.96.0.0/12
     controlPlane:
-      additionalSecurityGroupIDs: []
       amiID: ""
       iamInstanceProfile: control-plane.cluster-api-provider-aws.sigs.k8s.io
       instanceType: ""
@@ -180,7 +179,6 @@ spec:
     region: ""
     sshKeyName: ""
     worker:
-      additionalSecurityGroupIDs: []
       amiID: ""
       iamInstanceProfile: nodes.cluster-api-provider-aws.sigs.k8s.io
       instanceType: ""

diff --git a/templates/aws-standalone-cp/templates/awsmachinetemplate-controlplane.yaml b/templates/aws-standalone-cp/templates/awsmachinetemplate-controlplane.yaml
@@ -14,10 +14,6 @@ spec:
         # Makes CAPA use k0s bootstrap cloud-init directly and not via SSM
         # Simplifies the VPC setup as we do not need custom SSM endpoints etc.
         insecureSkipSecretsManager: true
-      {{- range $id := .Values.controlPlane.additionalSecurityGroupIDs }}
-      additionalSecurityGroups:
-        - id: {{ $id }}
-      {{- end }}
       {{- if not (quote .Values.sshKeyName | empty) }}
       sshKeyName: {{ .Values.sshKeyName | quote }}
       {{- end }}

diff --git a/templates/aws-standalone-cp/templates/awsmachinetemplate-worker.yaml b/templates/aws-standalone-cp/templates/awsmachinetemplate-worker.yaml
@@ -14,10 +14,6 @@ spec:
         # Makes CAPA use k0s bootstrap cloud-init directly and not via SSM
         # Simplifies the VPC setup as we do not need custom SSM endpoints etc.
         insecureSkipSecretsManager: true
-      {{- range $id := .Values.worker.additionalSecurityGroupIDs }}
-      additionalSecurityGroups:
-        - id: {{ $id }}
-      {{- end }}
       {{- if not (quote .Values.sshKeyName | empty) }}
       sshKeyName: {{ .Values.sshKeyName | quote }}
       {{- end }}

diff --git a/templates/aws-standalone-cp/values.yaml b/templates/aws-standalone-cp/values.yaml
@@ -20,13 +20,11 @@ controlPlane:
   amiID: ""
   iamInstanceProfile: control-plane.cluster-api-provider-aws.sigs.k8s.io
   instanceType: ""
-  additionalSecurityGroupIDs: []
 
 worker:
   amiID: ""
   iamInstanceProfile: nodes.cluster-api-provider-aws.sigs.k8s.io
   instanceType: ""
-  additionalSecurityGroupIDs: []
 
 # K0s parameters
 k0s: