Merge pull request #7086 from zalando-incubator/volume-tagging

Don't make resource tagging depending on Jammy
zalando-incubator · Feb 28, 2024 · 3abafbe · 3abafbe
2 parents dc2b68a + 2cc3c6e
commit 3abafbe
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 4 deletions.
diff --git a/cluster/node-pools/worker-combined/stack.yaml b/cluster/node-pools/worker-combined/stack.yaml
@@ -124,7 +124,6 @@ Resources:
     Properties:
       LaunchTemplateName: '{{.Cluster.LocalID}}-{{ .NodePool.Name }}'
       LaunchTemplateData:
-{{- if eq .Cluster.ConfigItems.kuberuntu_distro_worker "jammy" }}
         TagSpecifications:
         - ResourceType: "volume"
           Tags:
@@ -140,7 +139,6 @@ Resources:
             Value: "shared-resource"
           - Key: Name
             Value: "{{ .NodePool.Name }} ({{ .Cluster.ID }})"
-{{- end }}
         BlockDeviceMappings:
         - DeviceName: /dev/sda1
           Ebs:

diff --git a/cluster/node-pools/worker-splitaz/stack.yaml b/cluster/node-pools/worker-splitaz/stack.yaml
@@ -137,7 +137,6 @@ Resources:
     Properties:
       LaunchTemplateName: '{{ .Cluster.LocalID }}-{{ .NodePool.Name }}'
       LaunchTemplateData:
-{{- if eq .Cluster.ConfigItems.kuberuntu_distro_worker "jammy" }}
         TagSpecifications:
         - ResourceType: "volume"
           Tags:
@@ -153,7 +152,6 @@ Resources:
             Value: "shared-resource"
           - Key: Name
             Value: "{{ $data.NodePool.Name }} ({{ $data.Cluster.ID }})"
-{{- end }}
         BlockDeviceMappings:
         - DeviceName: /dev/sda1
           Ebs: