kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15515 from justinsb/strict_node_label_checking 

node labeling: don't ignore unknown roles
This commit is contained in:
Kubernetes Prow Robot 2023-06-19 07:48:21 -07:00 committed by GitHub
parent e299cc2c4b cd1c7434e8
commit 0546addf29
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
23 changed files with 271 additions and 381 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/kops-controller/controllers/legacy_node_controller.go
View File

@ -111,7 +111,10 @@ func (r *LegacyNodeReconciler) Reconcile(ctx context.Context, req ctrl.Request)
return ctrl.Result{}, fmt.Errorf("unable to load instance group object for node %s: %v", node.Name, err)
}
labels := nodelabels.BuildNodeLabels(cluster, ig)
labels, err := nodelabels.BuildNodeLabels(cluster, ig)
if err != nil {
return ctrl.Result{}, fmt.Errorf("error building node labels for node %q: %w", node.Name, err)
}
lifecycle, err := r.getInstanceLifecycle(ctx, node)
if err != nil {

6
pkg/model/context.go
View File

@ -157,7 +157,11 @@ func (b *KopsModelContext) CloudTagsForInstanceGroup(ig *kops.InstanceGroup) (ma
}
// Apply labels for cluster autoscaler node labels
for k, v := range nodelabels.BuildNodeLabels(b.Cluster, ig) {
nodeLabels, err := nodelabels.BuildNodeLabels(b.Cluster, ig)
if err != nil {
return nil, fmt.Errorf("error building node labels: %w", err)
}
for k, v := range nodeLabels {
labels[nodeidentityaws.ClusterAutoscalerNodeTemplateLabel+k] = v
}

1
pkg/model/openstackmodel/tests/servergroup/one-master-one-node-one-bastion-2.yaml
View File

@ -24,7 +24,6 @@ Metadata:
cluster_generation: "0"
ig_generation: "0"
k8s: cluster
k8s.io_cluster-autoscaler_node-template_label_node-role.kubernetes.io_node: ""
k8s.io_role_bastion: "1"
kops.k8s.io_instancegroup: bastion
Name: bastion-1-cluster

1
pkg/model/openstackmodel/tests/servergroup/one-master-one-node-one-bastion.yaml
View File

@ -37,7 +37,6 @@ Metadata:
cluster_generation: "0"
ig_generation: "0"
k8s: cluster
k8s.io_cluster-autoscaler_node-template_label_node-role.kubernetes.io_node: ""
k8s.io_role_bastion: "1"
kops.k8s.io_instancegroup: bastion
Name: bastion-1-cluster

28
pkg/nodelabels/builder.go
View File

@ -17,6 +17,8 @@ limitations under the License.
package nodelabels
import (
"fmt"
"k8s.io/kops/pkg/apis/kops"
"k8s.io/kops/pkg/featureflag"
"k8s.io/kops/util/pkg/reflectutils"
@ -37,10 +39,22 @@ const (
// BuildNodeLabels returns the node labels for the specified instance group
// This moved from the kubelet to a central controller in kubernetes 1.16
func BuildNodeLabels(cluster *kops.Cluster, instanceGroup *kops.InstanceGroup) map[string]string {
isControlPlane := instanceGroup.Spec.Role == kops.InstanceGroupRoleControlPlane
isAPIServer := instanceGroup.Spec.Role == kops.InstanceGroupRoleAPIServer
func BuildNodeLabels(cluster *kops.Cluster, instanceGroup *kops.InstanceGroup) (map[string]string, error) {
isControlPlane := false
isAPIServer := false
isNode := false
switch instanceGroup.Spec.Role {
case kops.InstanceGroupRoleControlPlane:
isControlPlane = true
case kops.InstanceGroupRoleAPIServer:
isAPIServer = true
case kops.InstanceGroupRoleNode:
isNode = true
case kops.InstanceGroupRoleBastion:
// no labels to add
default:
return nil, fmt.Errorf("unhandled instanceGroup role %q", instanceGroup.Spec.Role)
}
// Merge KubeletConfig for NodeLabels
c := &kops.KubeletConfigSpec{}
@ -70,7 +84,9 @@ func BuildNodeLabels(cluster *kops.Cluster, instanceGroup *kops.InstanceGroup) m
if cluster.IsKubernetesLT("1.24") {
nodeLabels[RoleLabelName15] = RoleAPIServerLabelValue15
}
} else {
}
if isNode {
if nodeLabels == nil {
nodeLabels = make(map[string]string)
}
@ -104,7 +120,7 @@ func BuildNodeLabels(cluster *kops.Cluster, instanceGroup *kops.InstanceGroup) m
nodeLabels["karpenter.sh/provisioner-name"] = instanceGroup.ObjectMeta.Name
}
return nodeLabels
return nodeLabels, nil
}
// BuildMandatoryControlPlaneLabels returns the list of labels all CP nodes must have

5
pkg/nodelabels/builder_test.go
View File

@ -115,7 +115,10 @@ func TestBuildNodeLabels(t *testing.T) {
for _, test := range tests {
t.Run(test.name, func(t *testing.T) {
out := BuildNodeLabels(test.cluster, test.ig)
out, err := BuildNodeLabels(test.cluster, test.ig)
if err != nil {
t.Fatalf("unexpected error from BuildNodeLabels: %v", err)
}
if !reflect.DeepEqual(out, test.expected) {
t.Fatalf("Actual result:\n%v\nExpect:\n%v", out, test.expected)
}

2
tests/integration/update_cluster/bastionadditional_user-data/data/aws_s3_object_nodeupconfig-bastion_content
View File

@ -37,8 +37,6 @@ KubeletConfig:
InTreePluginAWSUnregister: "true"
kubeconfigPath: /var/lib/kubelet/kubeconfig
logLevel: 2
nodeLabels:
node-role.kubernetes.io/node: ""
podInfraContainerImage: registry.k8s.io/pause:3.9
podManifestPath: /etc/kubernetes/manifests
protectKernelDefaults: true

38
tests/integration/update_cluster/bastionadditional_user-data/kubernetes.tf
View File

@ -147,11 +147,6 @@ resource "aws_autoscaling_group" "bastion-bastionuserdata-example-com" {
propagate_at_launch = true
value = "bastion.bastionuserdata.example.com"
}
tag {
key = "k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node"
propagate_at_launch = true
value = ""
}
tag {
key = "k8s.io/role/bastion"
propagate_at_launch = true
@ -485,32 +480,29 @@ resource "aws_launch_template" "bastion-bastionuserdata-example-com" {
tag_specifications {
resource_type = "instance"
tags = {
"KubernetesCluster" = "bastionuserdata.example.com"
"Name" = "bastion.bastionuserdata.example.com"
"k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = ""
"k8s.io/role/bastion" = "1"
"kops.k8s.io/instancegroup" = "bastion"
"kubernetes.io/cluster/bastionuserdata.example.com" = "owned"
"KubernetesCluster" = "bastionuserdata.example.com"
"Name" = "bastion.bastionuserdata.example.com"
"k8s.io/role/bastion" = "1"
"kops.k8s.io/instancegroup" = "bastion"
"kubernetes.io/cluster/bastionuserdata.example.com" = "owned"
}
}
tag_specifications {
resource_type = "volume"
tags = {
"KubernetesCluster" = "bastionuserdata.example.com"
"Name" = "bastion.bastionuserdata.example.com"
"k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = ""
"k8s.io/role/bastion" = "1"
"kops.k8s.io/instancegroup" = "bastion"
"kubernetes.io/cluster/bastionuserdata.example.com" = "owned"
"KubernetesCluster" = "bastionuserdata.example.com"
"Name" = "bastion.bastionuserdata.example.com"
"k8s.io/role/bastion" = "1"
"kops.k8s.io/instancegroup" = "bastion"
"kubernetes.io/cluster/bastionuserdata.example.com" = "owned"
}
}
tags = {
"KubernetesCluster" = "bastionuserdata.example.com"
"Name" = "bastion.bastionuserdata.example.com"
"k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = ""
"k8s.io/role/bastion" = "1"
"kops.k8s.io/instancegroup" = "bastion"
"kubernetes.io/cluster/bastionuserdata.example.com" = "owned"
"KubernetesCluster" = "bastionuserdata.example.com"
"Name" = "bastion.bastionuserdata.example.com"
"k8s.io/role/bastion" = "1"
"kops.k8s.io/instancegroup" = "bastion"
"kubernetes.io/cluster/bastionuserdata.example.com" = "owned"
}
user_data = filebase64("${path.module}/data/aws_launch_template_bastion.bastionuserdata.example.com_user_data")
}

38
tests/integration/update_cluster/private-shared-ip/kubernetes.tf
View File

@ -147,11 +147,6 @@ resource "aws_autoscaling_group" "bastion-private-shared-ip-example-com" {
propagate_at_launch = true
value = "bastion.private-shared-ip.example.com"
}
tag {
key = "k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node"
propagate_at_launch = true
value = ""
}
tag {
key = "k8s.io/role/bastion"
propagate_at_launch = true
@ -467,32 +462,29 @@ resource "aws_launch_template" "bastion-private-shared-ip-example-com" {
tag_specifications {
resource_type = "instance"
tags = {
"KubernetesCluster" = "private-shared-ip.example.com"
"Name" = "bastion.private-shared-ip.example.com"
"k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = ""
"k8s.io/role/bastion" = "1"
"kops.k8s.io/instancegroup" = "bastion"
"kubernetes.io/cluster/private-shared-ip.example.com" = "owned"
"KubernetesCluster" = "private-shared-ip.example.com"
"Name" = "bastion.private-shared-ip.example.com"
"k8s.io/role/bastion" = "1"
"kops.k8s.io/instancegroup" = "bastion"
"kubernetes.io/cluster/private-shared-ip.example.com" = "owned"
}
}
tag_specifications {
resource_type = "volume"
tags = {
"KubernetesCluster" = "private-shared-ip.example.com"
"Name" = "bastion.private-shared-ip.example.com"
"k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = ""
"k8s.io/role/bastion" = "1"
"kops.k8s.io/instancegroup" = "bastion"
"kubernetes.io/cluster/private-shared-ip.example.com" = "owned"
"KubernetesCluster" = "private-shared-ip.example.com"
"Name" = "bastion.private-shared-ip.example.com"
"k8s.io/role/bastion" = "1"
"kops.k8s.io/instancegroup" = "bastion"
"kubernetes.io/cluster/private-shared-ip.example.com" = "owned"
}
}
tags = {
"KubernetesCluster" = "private-shared-ip.example.com"
"Name" = "bastion.private-shared-ip.example.com"
"k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = ""
"k8s.io/role/bastion" = "1"
"kops.k8s.io/instancegroup" = "bastion"
"kubernetes.io/cluster/private-shared-ip.example.com" = "owned"
"KubernetesCluster" = "private-shared-ip.example.com"
"Name" = "bastion.private-shared-ip.example.com"
"k8s.io/role/bastion" = "1"
"kops.k8s.io/instancegroup" = "bastion"
"kubernetes.io/cluster/private-shared-ip.example.com" = "owned"
}
}

38
tests/integration/update_cluster/private-shared-subnet/kubernetes.tf
View File

@ -142,11 +142,6 @@ resource "aws_autoscaling_group" "bastion-private-shared-subnet-example-com" {
propagate_at_launch = true
value = "bastion.private-shared-subnet.example.com"
}
tag {
key = "k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node"
propagate_at_launch = true
value = ""
}
tag {
key = "k8s.io/role/bastion"
propagate_at_launch = true
@ -462,32 +457,29 @@ resource "aws_launch_template" "bastion-private-shared-subnet-example-com" {
tag_specifications {
resource_type = "instance"
tags = {
"KubernetesCluster" = "private-shared-subnet.example.com"
"Name" = "bastion.private-shared-subnet.example.com"
"k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = ""
"k8s.io/role/bastion" = "1"
"kops.k8s.io/instancegroup" = "bastion"
"kubernetes.io/cluster/private-shared-subnet.example.com" = "owned"
"KubernetesCluster" = "private-shared-subnet.example.com"
"Name" = "bastion.private-shared-subnet.example.com"
"k8s.io/role/bastion" = "1"
"kops.k8s.io/instancegroup" = "bastion"
"kubernetes.io/cluster/private-shared-subnet.example.com" = "owned"
}
}
tag_specifications {
resource_type = "volume"
tags = {
"KubernetesCluster" = "private-shared-subnet.example.com"
"Name" = "bastion.private-shared-subnet.example.com"
"k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = ""
"k8s.io/role/bastion" = "1"
"kops.k8s.io/instancegroup" = "bastion"
"kubernetes.io/cluster/private-shared-subnet.example.com" = "owned"
"KubernetesCluster" = "private-shared-subnet.example.com"
"Name" = "bastion.private-shared-subnet.example.com"
"k8s.io/role/bastion" = "1"
"kops.k8s.io/instancegroup" = "bastion"
"kubernetes.io/cluster/private-shared-subnet.example.com" = "owned"
}
}
tags = {
"KubernetesCluster" = "private-shared-subnet.example.com"
"Name" = "bastion.private-shared-subnet.example.com"
"k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = ""
"k8s.io/role/bastion" = "1"
"kops.k8s.io/instancegroup" = "bastion"
"kubernetes.io/cluster/private-shared-subnet.example.com" = "owned"
"KubernetesCluster" = "private-shared-subnet.example.com"
"Name" = "bastion.private-shared-subnet.example.com"
"k8s.io/role/bastion" = "1"
"kops.k8s.io/instancegroup" = "bastion"
"kubernetes.io/cluster/private-shared-subnet.example.com" = "owned"
}
}

38
tests/integration/update_cluster/privatecalico/kubernetes.tf
View File

@ -147,11 +147,6 @@ resource "aws_autoscaling_group" "bastion-privatecalico-example-com" {
propagate_at_launch = true
value = "bastion.privatecalico.example.com"
}
tag {
key = "k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node"
propagate_at_launch = true
value = ""
}
tag {
key = "k8s.io/role/bastion"
propagate_at_launch = true
@ -485,32 +480,29 @@ resource "aws_launch_template" "bastion-privatecalico-example-com" {
tag_specifications {
resource_type = "instance"
tags = {
"KubernetesCluster" = "privatecalico.example.com"
"Name" = "bastion.privatecalico.example.com"
"k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = ""
"k8s.io/role/bastion" = "1"
"kops.k8s.io/instancegroup" = "bastion"
"kubernetes.io/cluster/privatecalico.example.com" = "owned"
"KubernetesCluster" = "privatecalico.example.com"
"Name" = "bastion.privatecalico.example.com"
"k8s.io/role/bastion" = "1"
"kops.k8s.io/instancegroup" = "bastion"
"kubernetes.io/cluster/privatecalico.example.com" = "owned"
}
}
tag_specifications {
resource_type = "volume"
tags = {
"KubernetesCluster" = "privatecalico.example.com"
"Name" = "bastion.privatecalico.example.com"
"k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = ""
"k8s.io/role/bastion" = "1"
"kops.k8s.io/instancegroup" = "bastion"
"kubernetes.io/cluster/privatecalico.example.com" = "owned"
"KubernetesCluster" = "privatecalico.example.com"
"Name" = "bastion.privatecalico.example.com"
"k8s.io/role/bastion" = "1"
"kops.k8s.io/instancegroup" = "bastion"
"kubernetes.io/cluster/privatecalico.example.com" = "owned"
}
}
tags = {
"KubernetesCluster" = "privatecalico.example.com"
"Name" = "bastion.privatecalico.example.com"
"k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = ""
"k8s.io/role/bastion" = "1"
"kops.k8s.io/instancegroup" = "bastion"
"kubernetes.io/cluster/privatecalico.example.com" = "owned"
"KubernetesCluster" = "privatecalico.example.com"
"Name" = "bastion.privatecalico.example.com"
"k8s.io/role/bastion" = "1"
"kops.k8s.io/instancegroup" = "bastion"
"kubernetes.io/cluster/privatecalico.example.com" = "owned"
}
}

38
tests/integration/update_cluster/privatecanal/kubernetes.tf
View File

@ -147,11 +147,6 @@ resource "aws_autoscaling_group" "bastion-privatecanal-example-com" {
propagate_at_launch = true
value = "bastion.privatecanal.example.com"
}
tag {
key = "k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node"
propagate_at_launch = true
value = ""
}
tag {
key = "k8s.io/role/bastion"
propagate_at_launch = true
@ -485,32 +480,29 @@ resource "aws_launch_template" "bastion-privatecanal-example-com" {
tag_specifications {
resource_type = "instance"
tags = {
"KubernetesCluster" = "privatecanal.example.com"
"Name" = "bastion.privatecanal.example.com"
"k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = ""
"k8s.io/role/bastion" = "1"
"kops.k8s.io/instancegroup" = "bastion"
"kubernetes.io/cluster/privatecanal.example.com" = "owned"
"KubernetesCluster" = "privatecanal.example.com"
"Name" = "bastion.privatecanal.example.com"
"k8s.io/role/bastion" = "1"
"kops.k8s.io/instancegroup" = "bastion"
"kubernetes.io/cluster/privatecanal.example.com" = "owned"
}
}
tag_specifications {
resource_type = "volume"
tags = {
"KubernetesCluster" = "privatecanal.example.com"
"Name" = "bastion.privatecanal.example.com"
"k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = ""
"k8s.io/role/bastion" = "1"
"kops.k8s.io/instancegroup" = "bastion"
"kubernetes.io/cluster/privatecanal.example.com" = "owned"
"KubernetesCluster" = "privatecanal.example.com"
"Name" = "bastion.privatecanal.example.com"
"k8s.io/role/bastion" = "1"
"kops.k8s.io/instancegroup" = "bastion"
"kubernetes.io/cluster/privatecanal.example.com" = "owned"
}
}
tags = {
"KubernetesCluster" = "privatecanal.example.com"
"Name" = "bastion.privatecanal.example.com"
"k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = ""
"k8s.io/role/bastion" = "1"
"kops.k8s.io/instancegroup" = "bastion"
"kubernetes.io/cluster/privatecanal.example.com" = "owned"
"KubernetesCluster" = "privatecanal.example.com"
"Name" = "bastion.privatecanal.example.com"
"k8s.io/role/bastion" = "1"
"kops.k8s.io/instancegroup" = "bastion"
"kubernetes.io/cluster/privatecanal.example.com" = "owned"
}
}

38
tests/integration/update_cluster/privatecilium-eni/kubernetes.tf
View File

@ -147,11 +147,6 @@ resource "aws_autoscaling_group" "bastion-privatecilium-example-com" {
propagate_at_launch = true
value = "bastion.privatecilium.example.com"
}
tag {
key = "k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node"
propagate_at_launch = true
value = ""
}
tag {
key = "k8s.io/role/bastion"
propagate_at_launch = true
@ -485,32 +480,29 @@ resource "aws_launch_template" "bastion-privatecilium-example-com" {
tag_specifications {
resource_type = "instance"
tags = {
"KubernetesCluster" = "privatecilium.example.com"
"Name" = "bastion.privatecilium.example.com"
"k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = ""
"k8s.io/role/bastion" = "1"
"kops.k8s.io/instancegroup" = "bastion"
"kubernetes.io/cluster/privatecilium.example.com" = "owned"
"KubernetesCluster" = "privatecilium.example.com"
"Name" = "bastion.privatecilium.example.com"
"k8s.io/role/bastion" = "1"
"kops.k8s.io/instancegroup" = "bastion"
"kubernetes.io/cluster/privatecilium.example.com" = "owned"
}
}
tag_specifications {
resource_type = "volume"
tags = {
"KubernetesCluster" = "privatecilium.example.com"
"Name" = "bastion.privatecilium.example.com"
"k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = ""
"k8s.io/role/bastion" = "1"
"kops.k8s.io/instancegroup" = "bastion"
"kubernetes.io/cluster/privatecilium.example.com" = "owned"
"KubernetesCluster" = "privatecilium.example.com"
"Name" = "bastion.privatecilium.example.com"
"k8s.io/role/bastion" = "1"
"kops.k8s.io/instancegroup" = "bastion"
"kubernetes.io/cluster/privatecilium.example.com" = "owned"
}
}
tags = {
"KubernetesCluster" = "privatecilium.example.com"
"Name" = "bastion.privatecilium.example.com"
"k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = ""
"k8s.io/role/bastion" = "1"
"kops.k8s.io/instancegroup" = "bastion"
"kubernetes.io/cluster/privatecilium.example.com" = "owned"
"KubernetesCluster" = "privatecilium.example.com"
"Name" = "bastion.privatecilium.example.com"
"k8s.io/role/bastion" = "1"
"kops.k8s.io/instancegroup" = "bastion"
"kubernetes.io/cluster/privatecilium.example.com" = "owned"
}
}

38
tests/integration/update_cluster/privatecilium/kubernetes.tf
View File

@ -147,11 +147,6 @@ resource "aws_autoscaling_group" "bastion-privatecilium-example-com" {
propagate_at_launch = true
value = "bastion.privatecilium.example.com"
}
tag {
key = "k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node"
propagate_at_launch = true
value = ""
}
tag {
key = "k8s.io/role/bastion"
propagate_at_launch = true
@ -485,32 +480,29 @@ resource "aws_launch_template" "bastion-privatecilium-example-com" {
tag_specifications {
resource_type = "instance"
tags = {
"KubernetesCluster" = "privatecilium.example.com"
"Name" = "bastion.privatecilium.example.com"
"k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = ""
"k8s.io/role/bastion" = "1"
"kops.k8s.io/instancegroup" = "bastion"
"kubernetes.io/cluster/privatecilium.example.com" = "owned"
"KubernetesCluster" = "privatecilium.example.com"
"Name" = "bastion.privatecilium.example.com"
"k8s.io/role/bastion" = "1"
"kops.k8s.io/instancegroup" = "bastion"
"kubernetes.io/cluster/privatecilium.example.com" = "owned"
}
}
tag_specifications {
resource_type = "volume"
tags = {
"KubernetesCluster" = "privatecilium.example.com"
"Name" = "bastion.privatecilium.example.com"
"k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = ""
"k8s.io/role/bastion" = "1"
"kops.k8s.io/instancegroup" = "bastion"
"kubernetes.io/cluster/privatecilium.example.com" = "owned"
"KubernetesCluster" = "privatecilium.example.com"
"Name" = "bastion.privatecilium.example.com"
"k8s.io/role/bastion" = "1"
"kops.k8s.io/instancegroup" = "bastion"
"kubernetes.io/cluster/privatecilium.example.com" = "owned"
}
}
tags = {
"KubernetesCluster" = "privatecilium.example.com"
"Name" = "bastion.privatecilium.example.com"
"k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = ""
"k8s.io/role/bastion" = "1"
"kops.k8s.io/instancegroup" = "bastion"
"kubernetes.io/cluster/privatecilium.example.com" = "owned"
"KubernetesCluster" = "privatecilium.example.com"
"Name" = "bastion.privatecilium.example.com"
"k8s.io/role/bastion" = "1"
"kops.k8s.io/instancegroup" = "bastion"
"kubernetes.io/cluster/privatecilium.example.com" = "owned"
}
}

38
tests/integration/update_cluster/privatecilium2/kubernetes.tf
View File

@ -147,11 +147,6 @@ resource "aws_autoscaling_group" "bastion-privatecilium-example-com" {
propagate_at_launch = true
value = "bastion.privatecilium.example.com"
}
tag {
key = "k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node"
propagate_at_launch = true
value = ""
}
tag {
key = "k8s.io/role/bastion"
propagate_at_launch = true
@ -485,32 +480,29 @@ resource "aws_launch_template" "bastion-privatecilium-example-com" {
tag_specifications {
resource_type = "instance"
tags = {
"KubernetesCluster" = "privatecilium.example.com"
"Name" = "bastion.privatecilium.example.com"
"k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = ""
"k8s.io/role/bastion" = "1"
"kops.k8s.io/instancegroup" = "bastion"
"kubernetes.io/cluster/privatecilium.example.com" = "owned"
"KubernetesCluster" = "privatecilium.example.com"
"Name" = "bastion.privatecilium.example.com"
"k8s.io/role/bastion" = "1"
"kops.k8s.io/instancegroup" = "bastion"
"kubernetes.io/cluster/privatecilium.example.com" = "owned"
}
}
tag_specifications {
resource_type = "volume"
tags = {
"KubernetesCluster" = "privatecilium.example.com"
"Name" = "bastion.privatecilium.example.com"
"k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = ""
"k8s.io/role/bastion" = "1"
"kops.k8s.io/instancegroup" = "bastion"
"kubernetes.io/cluster/privatecilium.example.com" = "owned"
"KubernetesCluster" = "privatecilium.example.com"
"Name" = "bastion.privatecilium.example.com"
"k8s.io/role/bastion" = "1"
"kops.k8s.io/instancegroup" = "bastion"
"kubernetes.io/cluster/privatecilium.example.com" = "owned"
}
}
tags = {
"KubernetesCluster" = "privatecilium.example.com"
"Name" = "bastion.privatecilium.example.com"
"k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = ""
"k8s.io/role/bastion" = "1"
"kops.k8s.io/instancegroup" = "bastion"
"kubernetes.io/cluster/privatecilium.example.com" = "owned"
"KubernetesCluster" = "privatecilium.example.com"
"Name" = "bastion.privatecilium.example.com"
"k8s.io/role/bastion" = "1"
"kops.k8s.io/instancegroup" = "bastion"
"kubernetes.io/cluster/privatecilium.example.com" = "owned"
}
}

38
tests/integration/update_cluster/privateciliumadvanced/kubernetes.tf
View File

@ -147,11 +147,6 @@ resource "aws_autoscaling_group" "bastion-privateciliumadvanced-example-com" {
propagate_at_launch = true
value = "bastion.privateciliumadvanced.example.com"
}
tag {
key = "k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node"
propagate_at_launch = true
value = ""
}
tag {
key = "k8s.io/role/bastion"
propagate_at_launch = true
@ -502,32 +497,29 @@ resource "aws_launch_template" "bastion-privateciliumadvanced-example-com" {
tag_specifications {
resource_type = "instance"
tags = {
"KubernetesCluster" = "privateciliumadvanced.example.com"
"Name" = "bastion.privateciliumadvanced.example.com"
"k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = ""
"k8s.io/role/bastion" = "1"
"kops.k8s.io/instancegroup" = "bastion"
"kubernetes.io/cluster/privateciliumadvanced.example.com" = "owned"
"KubernetesCluster" = "privateciliumadvanced.example.com"
"Name" = "bastion.privateciliumadvanced.example.com"
"k8s.io/role/bastion" = "1"
"kops.k8s.io/instancegroup" = "bastion"
"kubernetes.io/cluster/privateciliumadvanced.example.com" = "owned"
}
}
tag_specifications {
resource_type = "volume"
tags = {
"KubernetesCluster" = "privateciliumadvanced.example.com"
"Name" = "bastion.privateciliumadvanced.example.com"
"k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = ""
"k8s.io/role/bastion" = "1"
"kops.k8s.io/instancegroup" = "bastion"
"kubernetes.io/cluster/privateciliumadvanced.example.com" = "owned"
"KubernetesCluster" = "privateciliumadvanced.example.com"
"Name" = "bastion.privateciliumadvanced.example.com"
"k8s.io/role/bastion" = "1"
"kops.k8s.io/instancegroup" = "bastion"
"kubernetes.io/cluster/privateciliumadvanced.example.com" = "owned"
}
}
tags = {
"KubernetesCluster" = "privateciliumadvanced.example.com"
"Name" = "bastion.privateciliumadvanced.example.com"
"k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = ""
"k8s.io/role/bastion" = "1"
"kops.k8s.io/instancegroup" = "bastion"
"kubernetes.io/cluster/privateciliumadvanced.example.com" = "owned"
"KubernetesCluster" = "privateciliumadvanced.example.com"
"Name" = "bastion.privateciliumadvanced.example.com"
"k8s.io/role/bastion" = "1"
"kops.k8s.io/instancegroup" = "bastion"
"kubernetes.io/cluster/privateciliumadvanced.example.com" = "owned"
}
}

58
tests/integration/update_cluster/privatedns1/kubernetes.tf
View File

@ -157,16 +157,6 @@ resource "aws_autoscaling_group" "bastion-privatedns1-example-com" {
propagate_at_launch = true
value = "fib+baz"
}
tag {
key = "k8s.io/cluster-autoscaler/node-template/label/kubernetes.io/role"
propagate_at_launch = true
value = "node"
}
tag {
key = "k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node"
propagate_at_launch = true
value = ""
}
tag {
key = "k8s.io/role/bastion"
propagate_at_launch = true
@ -559,41 +549,35 @@ resource "aws_launch_template" "bastion-privatedns1-example-com" {
tag_specifications {
resource_type = "instance"
tags = {
"KubernetesCluster" = "privatedns1.example.com"
"Name" = "bastion.privatedns1.example.com"
"Owner" = "John Doe"
"foo/bar" = "fib+baz"
"k8s.io/cluster-autoscaler/node-template/label/kubernetes.io/role" = "node"
"k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = ""
"k8s.io/role/bastion" = "1"
"kops.k8s.io/instancegroup" = "bastion"
"kubernetes.io/cluster/privatedns1.example.com" = "owned"
"KubernetesCluster" = "privatedns1.example.com"
"Name" = "bastion.privatedns1.example.com"
"Owner" = "John Doe"
"foo/bar" = "fib+baz"
"k8s.io/role/bastion" = "1"
"kops.k8s.io/instancegroup" = "bastion"
"kubernetes.io/cluster/privatedns1.example.com" = "owned"
}
}
tag_specifications {
resource_type = "volume"
tags = {
"KubernetesCluster" = "privatedns1.example.com"
"Name" = "bastion.privatedns1.example.com"
"Owner" = "John Doe"
"foo/bar" = "fib+baz"
"k8s.io/cluster-autoscaler/node-template/label/kubernetes.io/role" = "node"
"k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = ""
"k8s.io/role/bastion" = "1"
"kops.k8s.io/instancegroup" = "bastion"
"kubernetes.io/cluster/privatedns1.example.com" = "owned"
"KubernetesCluster" = "privatedns1.example.com"
"Name" = "bastion.privatedns1.example.com"
"Owner" = "John Doe"
"foo/bar" = "fib+baz"
"k8s.io/role/bastion" = "1"
"kops.k8s.io/instancegroup" = "bastion"
"kubernetes.io/cluster/privatedns1.example.com" = "owned"
}
}
tags = {
"KubernetesCluster" = "privatedns1.example.com"
"Name" = "bastion.privatedns1.example.com"
"Owner" = "John Doe"
"foo/bar" = "fib+baz"
"k8s.io/cluster-autoscaler/node-template/label/kubernetes.io/role" = "node"
"k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = ""
"k8s.io/role/bastion" = "1"
"kops.k8s.io/instancegroup" = "bastion"
"kubernetes.io/cluster/privatedns1.example.com" = "owned"
"KubernetesCluster" = "privatedns1.example.com"
"Name" = "bastion.privatedns1.example.com"
"Owner" = "John Doe"
"foo/bar" = "fib+baz"
"k8s.io/role/bastion" = "1"
"kops.k8s.io/instancegroup" = "bastion"
"kubernetes.io/cluster/privatedns1.example.com" = "owned"
}
}

38
tests/integration/update_cluster/privatedns2/kubernetes.tf
View File

@ -147,11 +147,6 @@ resource "aws_autoscaling_group" "bastion-privatedns2-example-com" {
propagate_at_launch = true
value = "bastion.privatedns2.example.com"
}
tag {
key = "k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node"
propagate_at_launch = true
value = ""
}
tag {
key = "k8s.io/role/bastion"
propagate_at_launch = true
@ -476,32 +471,29 @@ resource "aws_launch_template" "bastion-privatedns2-example-com" {
tag_specifications {
resource_type = "instance"
tags = {
"KubernetesCluster" = "privatedns2.example.com"
"Name" = "bastion.privatedns2.example.com"
"k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = ""
"k8s.io/role/bastion" = "1"
"kops.k8s.io/instancegroup" = "bastion"
"kubernetes.io/cluster/privatedns2.example.com" = "owned"
"KubernetesCluster" = "privatedns2.example.com"
"Name" = "bastion.privatedns2.example.com"
"k8s.io/role/bastion" = "1"
"kops.k8s.io/instancegroup" = "bastion"
"kubernetes.io/cluster/privatedns2.example.com" = "owned"
}
}
tag_specifications {
resource_type = "volume"
tags = {
"KubernetesCluster" = "privatedns2.example.com"
"Name" = "bastion.privatedns2.example.com"
"k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = ""
"k8s.io/role/bastion" = "1"
"kops.k8s.io/instancegroup" = "bastion"
"kubernetes.io/cluster/privatedns2.example.com" = "owned"
"KubernetesCluster" = "privatedns2.example.com"
"Name" = "bastion.privatedns2.example.com"
"k8s.io/role/bastion" = "1"
"kops.k8s.io/instancegroup" = "bastion"
"kubernetes.io/cluster/privatedns2.example.com" = "owned"
}
}
tags = {
"KubernetesCluster" = "privatedns2.example.com"
"Name" = "bastion.privatedns2.example.com"
"k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = ""
"k8s.io/role/bastion" = "1"
"kops.k8s.io/instancegroup" = "bastion"
"kubernetes.io/cluster/privatedns2.example.com" = "owned"
"KubernetesCluster" = "privatedns2.example.com"
"Name" = "bastion.privatedns2.example.com"
"k8s.io/role/bastion" = "1"
"kops.k8s.io/instancegroup" = "bastion"
"kubernetes.io/cluster/privatedns2.example.com" = "owned"
}
}

38
tests/integration/update_cluster/privateflannel/kubernetes.tf
View File

@ -147,11 +147,6 @@ resource "aws_autoscaling_group" "bastion-privateflannel-example-com" {
propagate_at_launch = true
value = "bastion.privateflannel.example.com"
}
tag {
key = "k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node"
propagate_at_launch = true
value = ""
}
tag {
key = "k8s.io/role/bastion"
propagate_at_launch = true
@ -485,32 +480,29 @@ resource "aws_launch_template" "bastion-privateflannel-example-com" {
tag_specifications {
resource_type = "instance"
tags = {
"KubernetesCluster" = "privateflannel.example.com"
"Name" = "bastion.privateflannel.example.com"
"k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = ""
"k8s.io/role/bastion" = "1"
"kops.k8s.io/instancegroup" = "bastion"
"kubernetes.io/cluster/privateflannel.example.com" = "owned"
"KubernetesCluster" = "privateflannel.example.com"
"Name" = "bastion.privateflannel.example.com"
"k8s.io/role/bastion" = "1"
"kops.k8s.io/instancegroup" = "bastion"
"kubernetes.io/cluster/privateflannel.example.com" = "owned"
}
}
tag_specifications {
resource_type = "volume"
tags = {
"KubernetesCluster" = "privateflannel.example.com"
"Name" = "bastion.privateflannel.example.com"
"k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = ""
"k8s.io/role/bastion" = "1"
"kops.k8s.io/instancegroup" = "bastion"
"kubernetes.io/cluster/privateflannel.example.com" = "owned"
"KubernetesCluster" = "privateflannel.example.com"
"Name" = "bastion.privateflannel.example.com"
"k8s.io/role/bastion" = "1"
"kops.k8s.io/instancegroup" = "bastion"
"kubernetes.io/cluster/privateflannel.example.com" = "owned"
}
}
tags = {
"KubernetesCluster" = "privateflannel.example.com"
"Name" = "bastion.privateflannel.example.com"
"k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = ""
"k8s.io/role/bastion" = "1"
"kops.k8s.io/instancegroup" = "bastion"
"kubernetes.io/cluster/privateflannel.example.com" = "owned"
"KubernetesCluster" = "privateflannel.example.com"
"Name" = "bastion.privateflannel.example.com"
"k8s.io/role/bastion" = "1"
"kops.k8s.io/instancegroup" = "bastion"
"kubernetes.io/cluster/privateflannel.example.com" = "owned"
}
}

38
tests/integration/update_cluster/privatekopeio/kubernetes.tf
View File

@ -162,11 +162,6 @@ resource "aws_autoscaling_group" "bastion-privatekopeio-example-com" {
propagate_at_launch = true
value = "bastion.privatekopeio.example.com"
}
tag {
key = "k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node"
propagate_at_launch = true
value = ""
}
tag {
key = "k8s.io/role/bastion"
propagate_at_launch = true
@ -491,32 +486,29 @@ resource "aws_launch_template" "bastion-privatekopeio-example-com" {
tag_specifications {
resource_type = "instance"
tags = {
"KubernetesCluster" = "privatekopeio.example.com"
"Name" = "bastion.privatekopeio.example.com"
"k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = ""
"k8s.io/role/bastion" = "1"
"kops.k8s.io/instancegroup" = "bastion"
"kubernetes.io/cluster/privatekopeio.example.com" = "owned"
"KubernetesCluster" = "privatekopeio.example.com"
"Name" = "bastion.privatekopeio.example.com"
"k8s.io/role/bastion" = "1"
"kops.k8s.io/instancegroup" = "bastion"
"kubernetes.io/cluster/privatekopeio.example.com" = "owned"
}
}
tag_specifications {
resource_type = "volume"
tags = {
"KubernetesCluster" = "privatekopeio.example.com"
"Name" = "bastion.privatekopeio.example.com"
"k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = ""
"k8s.io/role/bastion" = "1"
"kops.k8s.io/instancegroup" = "bastion"
"kubernetes.io/cluster/privatekopeio.example.com" = "owned"
"KubernetesCluster" = "privatekopeio.example.com"
"Name" = "bastion.privatekopeio.example.com"
"k8s.io/role/bastion" = "1"
"kops.k8s.io/instancegroup" = "bastion"
"kubernetes.io/cluster/privatekopeio.example.com" = "owned"
}
}
tags = {
"KubernetesCluster" = "privatekopeio.example.com"
"Name" = "bastion.privatekopeio.example.com"
"k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = ""
"k8s.io/role/bastion" = "1"
"kops.k8s.io/instancegroup" = "bastion"
"kubernetes.io/cluster/privatekopeio.example.com" = "owned"
"KubernetesCluster" = "privatekopeio.example.com"
"Name" = "bastion.privatekopeio.example.com"
"k8s.io/role/bastion" = "1"
"kops.k8s.io/instancegroup" = "bastion"
"kubernetes.io/cluster/privatekopeio.example.com" = "owned"
}
}

46
tests/integration/update_cluster/privateweave/kubernetes.tf
View File

@ -147,16 +147,6 @@ resource "aws_autoscaling_group" "bastion-privateweave-example-com" {
propagate_at_launch = true
value = "bastion.privateweave.example.com"
}
tag {
key = "k8s.io/cluster-autoscaler/node-template/label/kubernetes.io/role"
propagate_at_launch = true
value = "node"
}
tag {
key = "k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node"
propagate_at_launch = true
value = ""
}
tag {
key = "k8s.io/role/bastion"
propagate_at_launch = true
@ -505,35 +495,29 @@ resource "aws_launch_template" "bastion-privateweave-example-com" {
tag_specifications {
resource_type = "instance"
tags = {
"KubernetesCluster" = "privateweave.example.com"
"Name" = "bastion.privateweave.example.com"
"k8s.io/cluster-autoscaler/node-template/label/kubernetes.io/role" = "node"
"k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = ""
"k8s.io/role/bastion" = "1"
"kops.k8s.io/instancegroup" = "bastion"
"kubernetes.io/cluster/privateweave.example.com" = "owned"
"KubernetesCluster" = "privateweave.example.com"
"Name" = "bastion.privateweave.example.com"
"k8s.io/role/bastion" = "1"
"kops.k8s.io/instancegroup" = "bastion"
"kubernetes.io/cluster/privateweave.example.com" = "owned"
}
}
tag_specifications {
resource_type = "volume"
tags = {
"KubernetesCluster" = "privateweave.example.com"
"Name" = "bastion.privateweave.example.com"
"k8s.io/cluster-autoscaler/node-template/label/kubernetes.io/role" = "node"
"k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = ""
"k8s.io/role/bastion" = "1"
"kops.k8s.io/instancegroup" = "bastion"
"kubernetes.io/cluster/privateweave.example.com" = "owned"
"KubernetesCluster" = "privateweave.example.com"
"Name" = "bastion.privateweave.example.com"
"k8s.io/role/bastion" = "1"
"kops.k8s.io/instancegroup" = "bastion"
"kubernetes.io/cluster/privateweave.example.com" = "owned"
}
}
tags = {
"KubernetesCluster" = "privateweave.example.com"
"Name" = "bastion.privateweave.example.com"
"k8s.io/cluster-autoscaler/node-template/label/kubernetes.io/role" = "node"
"k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = ""
"k8s.io/role/bastion" = "1"
"kops.k8s.io/instancegroup" = "bastion"
"kubernetes.io/cluster/privateweave.example.com" = "owned"
"KubernetesCluster" = "privateweave.example.com"
"Name" = "bastion.privateweave.example.com"
"k8s.io/role/bastion" = "1"
"kops.k8s.io/instancegroup" = "bastion"
"kubernetes.io/cluster/privateweave.example.com" = "owned"
}
}

38
tests/integration/update_cluster/unmanaged/kubernetes.tf
View File

@ -147,11 +147,6 @@ resource "aws_autoscaling_group" "bastion-unmanaged-example-com" {
propagate_at_launch = true
value = "bastion.unmanaged.example.com"
}
tag {
key = "k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node"
propagate_at_launch = true
value = ""
}
tag {
key = "k8s.io/role/bastion"
propagate_at_launch = true
@ -467,32 +462,29 @@ resource "aws_launch_template" "bastion-unmanaged-example-com" {
tag_specifications {
resource_type = "instance"
tags = {
"KubernetesCluster" = "unmanaged.example.com"
"Name" = "bastion.unmanaged.example.com"
"k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = ""
"k8s.io/role/bastion" = "1"
"kops.k8s.io/instancegroup" = "bastion"
"kubernetes.io/cluster/unmanaged.example.com" = "owned"
"KubernetesCluster" = "unmanaged.example.com"
"Name" = "bastion.unmanaged.example.com"
"k8s.io/role/bastion" = "1"
"kops.k8s.io/instancegroup" = "bastion"
"kubernetes.io/cluster/unmanaged.example.com" = "owned"
}
}
tag_specifications {
resource_type = "volume"
tags = {
"KubernetesCluster" = "unmanaged.example.com"
"Name" = "bastion.unmanaged.example.com"
"k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = ""
"k8s.io/role/bastion" = "1"
"kops.k8s.io/instancegroup" = "bastion"
"kubernetes.io/cluster/unmanaged.example.com" = "owned"
"KubernetesCluster" = "unmanaged.example.com"
"Name" = "bastion.unmanaged.example.com"
"k8s.io/role/bastion" = "1"
"kops.k8s.io/instancegroup" = "bastion"
"kubernetes.io/cluster/unmanaged.example.com" = "owned"
}
}
tags = {
"KubernetesCluster" = "unmanaged.example.com"
"Name" = "bastion.unmanaged.example.com"
"k8s.io/cluster-autoscaler/node-template/label/node-role.kubernetes.io/node" = ""
"k8s.io/role/bastion" = "1"
"kops.k8s.io/instancegroup" = "bastion"
"kubernetes.io/cluster/unmanaged.example.com" = "owned"
"KubernetesCluster" = "unmanaged.example.com"
"Name" = "bastion.unmanaged.example.com"
"k8s.io/role/bastion" = "1"
"kops.k8s.io/instancegroup" = "bastion"
"kubernetes.io/cluster/unmanaged.example.com" = "owned"
}
}

6
upup/pkg/fi/cloudup/populate_instancegroup_spec.go
View File

@ -258,7 +258,11 @@ func PopulateInstanceGroupSpec(cluster *kops.Cluster, input *kops.InstanceGroup,
// We include the NodeLabels in the userdata even for Kubernetes 1.16 and later so that
// rolling update will still replace nodes when they change.
igKubeletConfig.NodeLabels = nodelabels.BuildNodeLabels(cluster, ig)
nodeLabels, err := nodelabels.BuildNodeLabels(cluster, ig)
if err != nil {
return nil, fmt.Errorf("error building node labels: %w", err)
}
igKubeletConfig.NodeLabels = nodeLabels
useSecureKubelet := fi.ValueOf(igKubeletConfig.AnonymousAuth)