Automated cherry pick of #8462: Tag EBS volumes when using launch templates with AWS API #8466: Update tags support for LaunchTemplates

[hakman]

Cherry pick of #8462 #8466 on release-1.17.

#8462: Tag EBS volumes when using launch templates with AWS API
#8466: Update tags support for LaunchTemplates

For details on the cherry pick process, see the cherry pick requests page.

[rifelpet]

Just to be clear and since we dont have tests that cover these, can you list out the tags that this will add and for which resources exactly?

[hakman]

@rifelpet This would add all InstanceGroup tags except for "owned", but only for the direct target (not touching TF and CF)

[hakman]

This is the function that creates the tags:

kops/pkg/model/context.go

Lines 184 to 232 in 7492c10

	// CloudTagsForInstanceGroup computes the tags to apply to instances in the specified InstanceGroup
	func (m *KopsModelContext) CloudTagsForInstanceGroup(ig *kops.InstanceGroup) (map[string]string, error) {
	labels := make(map[string]string)
	// Apply any user-specified global labels first so they can be overridden by IG-specific labels
	for k, v := range m.Cluster.Spec.CloudLabels {
	labels[k] = v
	}
	// Apply any user-specified labels
	for k, v := range ig.Spec.CloudLabels {
	labels[k] = v
	}
	// Apply labels for cluster autoscaler node labels
	for k, v := range ig.Spec.NodeLabels {
	labels[clusterAutoscalerNodeTemplateLabel+k] = v
	}
	// Apply labels for cluster autoscaler node taints
	for _, v := range ig.Spec.Taints {
	splits := strings.SplitN(v, "=", 2)
	if len(splits) > 1 {
	labels[clusterAutoscalerNodeTemplateTaint+splits[0]] = splits[1]
	}
	}
	// Add cluster and ig names
	labels[awsup.TagClusterName] = m.ClusterName()
	labels["Name"] = m.AutoscalingGroupName(ig)
	// The system tags take priority because the cluster likely breaks without them...
	if ig.Spec.Role == kops.InstanceGroupRoleMaster {
	labels[awstasks.CloudTagInstanceGroupRolePrefix+strings.ToLower(string(kops.InstanceGroupRoleMaster))] = "1"
	}
	if ig.Spec.Role == kops.InstanceGroupRoleNode {
	labels[awstasks.CloudTagInstanceGroupRolePrefix+strings.ToLower(string(kops.InstanceGroupRoleNode))] = "1"
	}
	if ig.Spec.Role == kops.InstanceGroupRoleBastion {
	labels[awstasks.CloudTagInstanceGroupRolePrefix+strings.ToLower(string(kops.InstanceGroupRoleBastion))] = "1"
	}
	labels[nodeidentityaws.CloudTagInstanceGroupName] = ig.Name
	return labels, nil
	}

[rifelpet]

ok great, yea that makes sense to me and this seems pretty safe.

/lgtm
/approve

[k8s-ci-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: hakman, rifelpet

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

• OWNERS [rifelpet]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[hakman]

Thanks @rifelpet