From fc9482a0c4bc24280fdf0ceccc7c8c00ef51c7ad Mon Sep 17 00:00:00 2001
From: Mikkel Oscar Lyderik Larsen <mikkel.larsen@zalando.de>
Date: Wed, 28 Feb 2024 07:31:29 +0100
Subject: [PATCH] Don't make resource tagging depending on Jammy

Signed-off-by: Mikkel Oscar Lyderik Larsen <mikkel.larsen@zalando.de>
---
 cluster/node-pools/worker-combined/stack.yaml | 2 --
 cluster/node-pools/worker-splitaz/stack.yaml  | 2 --
 2 files changed, 4 deletions(-)

diff --git a/cluster/node-pools/worker-combined/stack.yaml b/cluster/node-pools/worker-combined/stack.yaml
index 09bb9931b8..c04f888320 100644
--- 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
index 42320cb44b..691c4640e6 100644
--- 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: