update changelog

giantswarm · Oct 23, 2023 · dc2a588 · dc2a588
1 parent cca1a54
commit dc2a588
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 23 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Fixed
+
+- Move labels to AWSMachineTemplate manifest to avoid unnecessary rolling/no rolling.
+
 ### Added
 
 - Add teleport.service: Secure SSH access via Teleport.

diff --git a/helm/cluster-aws/templates/_bastion.tpl b/helm/cluster-aws/templates/_bastion.tpl
@@ -4,29 +4,28 @@ This function is used for both the `.Spec` value and as the data for the hash fu
 Any changes to this will trigger the resource to be recreated rather than attempting to update in-place.
 */}}
 {{- define "bastion-awsmachinetemplate-spec" -}}
-spec:
-  instanceType: {{ .Values.connectivity.bastion.instanceType }}
-  cloudInit: {}
-  imageLookupBaseOS: flatcar-stable
-  imageLookupFormat: {{ "capa-ami-{{.BaseOS}}-v{{.K8sVersion}}-gs" }}
-  imageLookupOrg: "{{ .Values.providerSpecific.flatcarAwsAccount }}"
-  iamInstanceProfile: {{ include "resource.default.name" $ }}-bastion
-  publicIP: {{ if eq .Values.connectivity.vpcMode "private" }}false{{else}}true{{end}}
-  sshKeyName: ""
-  subnet:
-    filters:
-      - name: tag:{{ if eq .Values.connectivity.vpcMode "private" }}github.com/giantswarm/aws-vpc-operator/role{{else}}sigs.k8s.io/cluster-api-provider-aws/role{{end}}
-        values:
-        - {{ if eq .Values.connectivity.vpcMode "private" }}private{{else}}public{{end}}
-      - name: tag:{{ if eq .Values.connectivity.vpcMode "private" }}github.com/giantswarm/aws-vpc-operator/{{else}}sigs.k8s.io/cluster-api-provider-aws/cluster/{{end}}{{ include "resource.default.name" $ }}
-        values:
-        - owned
-        - shared
-      {{- range $i, $tags :=  .Values.connectivity.bastion.subnetTags }}
-      - name: tag:{{ keys $tags | first }}
-        values:
-        - {{ index $tags (keys $tags | first) | quote }}
-      {{- end }}
+instanceType: {{ .Values.connectivity.bastion.instanceType }}
+cloudInit: {}
+imageLookupBaseOS: flatcar-stable
+imageLookupFormat: {{ "capa-ami-{{.BaseOS}}-v{{.K8sVersion}}-gs" }}
+imageLookupOrg: "{{ .Values.providerSpecific.flatcarAwsAccount }}"
+iamInstanceProfile: {{ include "resource.default.name" $ }}-bastion
+publicIP: {{ if eq .Values.connectivity.vpcMode "private" }}false{{else}}true{{end}}
+sshKeyName: ""
+subnet:
+  filters:
+    - name: tag:{{ if eq .Values.connectivity.vpcMode "private" }}github.com/giantswarm/aws-vpc-operator/role{{else}}sigs.k8s.io/cluster-api-provider-aws/role{{end}}
+      values:
+      - {{ if eq .Values.connectivity.vpcMode "private" }}private{{else}}public{{end}}
+    - name: tag:{{ if eq .Values.connectivity.vpcMode "private" }}github.com/giantswarm/aws-vpc-operator/{{else}}sigs.k8s.io/cluster-api-provider-aws/cluster/{{end}}{{ include "resource.default.name" $ }}
+      values:
+      - owned
+      - shared
+    {{- range $i, $tags :=  .Values.connectivity.bastion.subnetTags }}
+    - name: tag:{{ keys $tags | first }}
+      values:
+      - {{ index $tags (keys $tags | first) | quote }}
+    {{- end }}
 {{- end }}
 
 {{- define "bastion-kubeadmconfigtemplate-spec" -}}