Merge pull request #6819 from zalando-incubator/all/add-values-prefix

all: add .Values prefix

Author: AlexanderYastrebov

cluster/etcd/stack.yaml

@@ -59,7 +59,7 @@ Resources:
                   ETCD_TRUSTED_CA_FILE=/etc/etcd/ssl/ca.cert
                   ETCD_LOG_LEVEL=info
                   HOSTED_ZONE="{{.Values.hosted_zone}}"
-                  S3_CERTS_BUCKET="{{ .S3GeneratedFilesPath }}"
+                  S3_CERTS_BUCKET="{{ .Values.S3GeneratedFilesPath }}"
                   AWS_DEFAULT_REGION="{{ .Cluster.Region }}"
             runcmd:
               - [ cfn-signal, --success, 'true', --stack, ${AWS::StackName}, --resource, AppServer, --region, ${AWS::Region} ]

cluster/node-pools/master-default/stack.yaml

@@ -80,7 +80,7 @@ Resources:
         - !Ref 'AWS::Region'
         - MachineImage
         InstanceType: "{{ index .NodePool.InstanceTypes 0 }}"
-        UserData: "{{ .UserData }}"
+        UserData: "{{ .Values.UserData }}"
     Type: 'AWS::EC2::LaunchTemplate'
   AutoScalingInstanceProfile:
     Properties:

cluster/node-pools/master-default/userdata.yaml

@@ -11,7 +11,7 @@ write_files:
   - owner: root:root
     path: /etc/kuberuntu/s3-certs.env
     content: |
-      S3_CERTS_BUCKET={{ .S3GeneratedFilesPath }}
+      S3_CERTS_BUCKET={{ .Values.S3GeneratedFilesPath }}
       AWS_DEFAULT_REGION={{ .Cluster.Region }}
 
   - owner: root:root

cluster/node-pools/worker-combined/stack.yaml

@@ -157,7 +157,7 @@ Resources:
         InstanceMarketOptions:
           MarketType: spot
 {{ end }}
-        UserData: "{{ .UserData }}"
+        UserData: "{{ .Values.UserData }}"
     Type: 'AWS::EC2::LaunchTemplate'
   AutoScalingInstanceProfile:
     Properties:

cluster/node-pools/worker-karpenter/provisioners.yaml

@@ -136,7 +136,7 @@ spec:
     - associatePublicIPAddress: true
       deviceIndex: 0
   userData: |
-{{.UserData | indent 4}}
+{{ .Values.UserData | indent 4 }}
   tags:
     Name: "{{ .NodePool.Name }} ({{ .Cluster.ID }})"
     node.kubernetes.io/role: worker

cluster/node-pools/worker-splitaz/stack.yaml

@@ -135,7 +135,7 @@ Resources:
 {{ end }}
   LaunchTemplate:
     Properties:
-      LaunchTemplateName: '{{ $data.Cluster.LocalID }}-{{ $data.NodePool.Name }}'
+      LaunchTemplateName: '{{ .Cluster.LocalID }}-{{ .NodePool.Name }}'
       LaunchTemplateData:
 {{- if eq .Cluster.ConfigItems.kuberuntu_distro_worker "jammy" }}
         TagSpecifications:
@@ -149,8 +149,8 @@ Resources:
         BlockDeviceMappings:
         - DeviceName: /dev/sda1
           Ebs:
-            DeleteOnTermination: {{$data.NodePool.ConfigItems.ebs_root_volume_delete_on_termination}}
-            VolumeSize: {{$data.NodePool.ConfigItems.ebs_root_volume_size}}
+            DeleteOnTermination: {{ .NodePool.ConfigItems.ebs_root_volume_delete_on_termination }}
+            VolumeSize: {{ .NodePool.ConfigItems.ebs_root_volume_size }}
             VolumeType: gp3
         NetworkInterfaces:
         - DeviceIndex: 0
@@ -166,11 +166,11 @@ Resources:
         - !Ref 'AWS::Region'
         - MachineImage
         InstanceType: "{{ index .NodePool.InstanceTypes 0 }}"
-{{- if and $data.NodePool.IsSpot (eq (len $data.NodePool.InstanceTypes) 1) }}
+{{- if and .NodePool.IsSpot (eq (len .NodePool.InstanceTypes) 1) }}
         InstanceMarketOptions:
           MarketType: spot
 {{ end }}
-        UserData: "{{ .UserData }}"
+        UserData: "{{ .Values.UserData }}"
     Type: 'AWS::EC2::LaunchTemplate'
 {{ end }}
 

cluster/node-pools/worker-splitaz/userdata.yaml

@@ -23,7 +23,7 @@ write_files:
   - owner: root:root
     path: /etc/kuberuntu/s3-certs.env
     content: |
-      S3_CERTS_BUCKET={{ .S3GeneratedFilesPath }}
+      S3_CERTS_BUCKET={{ .Values.S3GeneratedFilesPath }}
       AWS_DEFAULT_REGION={{ .Cluster.Region }}
 
   - owner: root:root