From 1414f91a12c58fa88675f87f1c3b8163721bbcf5 Mon Sep 17 00:00:00 2001 From: Peter Rifel Date: Wed, 7 Aug 2024 07:40:53 -0500 Subject: [PATCH] Ensure only one slash in hetzner server labels --- .../update_cluster/minimal_hetzner/kubernetes.tf | 8 ++++---- upup/pkg/fi/cloudup/hetzner/cloud.go | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/integration/update_cluster/minimal_hetzner/kubernetes.tf b/tests/integration/update_cluster/minimal_hetzner/kubernetes.tf index 987de4e89eef5..1f30b0db42d4a 100644 --- a/tests/integration/update_cluster/minimal_hetzner/kubernetes.tf +++ b/tests/integration/update_cluster/minimal_hetzner/kubernetes.tf @@ -238,9 +238,9 @@ resource "hcloud_server" "master-fsn1" { "kops.k8s.io/cluster" = "minimal.example.com" "kops.k8s.io/instance-group" = "master-fsn1" "kops.k8s.io/instance-role" = "ControlPlane" - "kops.k8s.io/node-label/kops.k8s.io/kops-controller-pki" = "" - "kops.k8s.io/node-label/node-role.kubernetes.io/control-plane" = "" - "kops.k8s.io/node-label/node.kubernetes.io/exclude-from-external-load-balancers" = "" + "node-label.kops.k8s.io.kops.k8s.io/kops-controller-pki" = "" + "node-label.kops.k8s.io.node-role.kubernetes.io/control-plane" = "" + "node-label.kops.k8s.io.node.kubernetes.io/exclude-from-external-load-balancers" = "" } location = "fsn1" name = "master-fsn1-${count.index}" @@ -263,7 +263,7 @@ resource "hcloud_server" "nodes-fsn1" { "kops.k8s.io/cluster" = "minimal.example.com" "kops.k8s.io/instance-group" = "nodes-fsn1" "kops.k8s.io/instance-role" = "Node" - "kops.k8s.io/node-label/node-role.kubernetes.io/node" = "" + "node-label.kops.k8s.io.node-role.kubernetes.io/node" = "" } location = "fsn1" name = "nodes-fsn1-${count.index}" diff --git a/upup/pkg/fi/cloudup/hetzner/cloud.go b/upup/pkg/fi/cloudup/hetzner/cloud.go index 863c51f1af857..e23701376b760 100644 --- a/upup/pkg/fi/cloudup/hetzner/cloud.go +++ b/upup/pkg/fi/cloudup/hetzner/cloud.go @@ -41,7 +41,7 @@ const ( TagKubernetesInstanceUserData = "kops.k8s.io/instance-userdata" TagKubernetesInstanceNeedsUpdate = "kops.k8s.io/needs-update" TagKubernetesVolumeRole = "kops.k8s.io/volume-role" - TagKubernetesNodeLabelPrefix = "kops.k8s.io/node-label/" + TagKubernetesNodeLabelPrefix = "node-label.kops.k8s.io." ) // HetznerCloud exposes all the interfaces required to operate on Hetzner Cloud resources