mirror of
https://github.com/outbackdingo/kubernetes.git
synced 2026-02-12 14:00:25 +00:00
d661a83b06
Automatic merge from submit-queue (batch tested with PRs 54935, 67768, 67896, 67787). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. vsphere: support zone tags at any level in the hierarchy **What this PR does / why we need it**: Rather than just looking for zone tags at the VM's Host level, traverse up the hierarchy. This allows zone tags to be attached at host level, along with cluster, datacenter, root folder and any inventory folders in between. Issue #64021 Example log output from the tests, with tags attached at host level: ```console Found "k8s-region" tag (k8s-region-US) for e85df495-93b9-4b0e-96f1-dc9d56e97263 attached to HostSystem:host-19 Found "k8s-zone" tag (k8s-zone-US-CA1) for e85df495-93b9-4b0e-96f1-dc9d56e97263 attached to HostSystem:host-19 ``` And region tag at Datacenter level and zone tag at Cluster level: ```console Found "k8s-zone" tag (k8s-zone-US-CA1) for e85df495-93b9-4b0e-96f1-dc9d56e97263 attached to ComputeResource:computeresource-21 Found "k8s-region" tag (k8s-region-US) for e85df495-93b9-4b0e-96f1-dc9d56e97263 attached to Datacenter:datacenter-2 ``` **Release note**: ```release-note NONE ```