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

Ensure only one slash in hetzner server labels

This commit is contained in:
Peter Rifel 2024-08-07 07:40:53 -05:00
parent e4fdb20797
commit d9ebf18dbe
No known key found for this signature in database
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/integration/update_cluster/minimal_hetzner/kubernetes.tf
View File

@ -238,9 +238,9 @@ resource "hcloud_server" "master-fsn1" {
"kops.k8s.io/cluster" = "minimal.example.com" "kops.k8s.io/cluster" = "minimal.example.com"
"kops.k8s.io/instance-group" = "master-fsn1" "kops.k8s.io/instance-group" = "master-fsn1"
"kops.k8s.io/instance-role" = "ControlPlane" "kops.k8s.io/instance-role" = "ControlPlane"
"kops.k8s.io/node-label/kops.k8s.io/kops-controller-pki" = "" "node-label.kops.k8s.io.kops.k8s.io/kops-controller-pki" = ""
"kops.k8s.io/node-label/node-role.kubernetes.io/control-plane" = "" "node-label.kops.k8s.io.node-role.kubernetes.io/control-plane" = ""
"kops.k8s.io/node-label/node.kubernetes.io/exclude-from-external-load-balancers" = "" "node-label.kops.k8s.io.node.kubernetes.io/exclude-from-external-load-balancers" = ""
} }
location = "fsn1" location = "fsn1"
name = "master-fsn1-${count.index}" name = "master-fsn1-${count.index}"
@ -263,7 +263,7 @@ resource "hcloud_server" "nodes-fsn1" {
"kops.k8s.io/cluster" = "minimal.example.com" "kops.k8s.io/cluster" = "minimal.example.com"
"kops.k8s.io/instance-group" = "nodes-fsn1" "kops.k8s.io/instance-group" = "nodes-fsn1"
"kops.k8s.io/instance-role" = "Node" "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" location = "fsn1"
name = "nodes-fsn1-${count.index}" name = "nodes-fsn1-${count.index}"

2
upup/pkg/fi/cloudup/hetzner/cloud.go
View File

@ -41,7 +41,7 @@ const (
TagKubernetesInstanceUserData = "kops.k8s.io/instance-userdata" TagKubernetesInstanceUserData = "kops.k8s.io/instance-userdata"
TagKubernetesInstanceNeedsUpdate = "kops.k8s.io/needs-update" TagKubernetesInstanceNeedsUpdate = "kops.k8s.io/needs-update"
TagKubernetesVolumeRole = "kops.k8s.io/volume-role" 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 // HetznerCloud exposes all the interfaces required to operate on Hetzner Cloud resources