Page MenuHomePhabricator
Create Task
Maniphest T270191

Add kubernetes 1.17+ topology annotations
Closed, ResolvedPublic
Actions

Description

https://kubernetes.io/docs/reference/kubernetes-api/labels-annotations-taints/

Starting with kubernetes v1.17 the topology annotations have hanged. We should add the new ones already just in case.

  • beta.kubernetes.io/instance-type (deprecated)

    Note: Starting in v1.17, this label is deprecated in favor of node.kubernetes.io/instance-type.
  • failure-domain.beta.kubernetes.io/region (deprecated)

    Note: Starting in v1.17, this label is deprecated in favor of topology.kubernetes.io/region.
  • failure-domain.beta.kubernetes.io/zone (deprecated)

    Note: Starting in v1.17, this label is deprecated in favor of topology.kubernetes.io/zone.

Details

SubjectRepoBranchLines +/-
k8s: Keep deprecated failure-domain.beta.* labels around in 1.23operations/puppetproduction+5 -0
calico: Make ganeti worker nodes peer with core routersoperations/deployment-chartsmaster+8 -8
calico: Make ganeti worker nodes peer with core routers (aux)operations/deployment-chartsmaster+4 -4
kubernetes: Use netbox data to populate topology labelsoperations/puppetproduction+35 -187
Add Kubernetes 1.17+ typology annotationsoperations/puppetproduction+82 -0
Customize query in gerrit

Related Objects
Search...

Event Timeline

JMeybohm created this task.Dec 15 2020, 3:53 PM
Restricted Application added a subscriber: Aklapper. · View Herald TranscriptDec 15 2020, 3:53 PM
JMeybohm added a comment.Dec 15 2020, 4:21 PM

Currently we're setting those per node in hiera. Would be nice to have that automated (T229397).

akosiaris renamed this task from Add kubernetes 1.17+ typology annotations to Add kubernetes 1.17+ topology annotations.Dec 16 2020, 2:23 PM
akosiaris updated the task description. (Show Details)
gerritbot added a comment.Aug 9 2021, 12:41 PM

Change 710967 had a related patch set uploaded (by JMeybohm; author: JMeybohm):

[operations/puppet@production] Add Kubernetes 1.17+ typolofy annotations

https://gerrit.wikimedia.org/r/710967

gerritbot added a project: Patch-For-Review.Aug 9 2021, 12:41 PM
gerritbot added a comment.Aug 9 2021, 1:05 PM

Change 710967 merged by JMeybohm:

[operations/puppet@production] Add Kubernetes 1.17+ typology annotations

https://gerrit.wikimedia.org/r/710967

Maintenance_bot removed a project: Patch-For-Review.Aug 9 2021, 1:10 PM
JMeybohm added a comment.Aug 9 2021, 1:16 PM

the typology annotations where integrated with Kubernetes 1.17. Earlier kubelet versions reject the labels with:

--node-labels in the 'kubernetes.io' namespace must begin with an allowed prefix (kubelet.kubernetes.io, node.kubernetes.io) or be in the specifically allowed set (beta.kubernetes.io/arch, beta.kubernetes.io/instance-type, beta.kubernetes.io/os, failure-domain.beta.kubernetes.io/region, failure-domain.beta.kubernetes.io/zone, failure-domain.kubernetes.io/region, failure-domain.kubernetes.io/zone, kubernetes.io/arch, kubernetes.io/hostname, kubernetes.io/instance-type, kubernetes.io/os)

JMeybohm mentioned this in T307943: Update Kubernetes clusters to v1.23.May 9 2022, 5:10 PM
JMeybohm edited parent tasks, added: T307943: Update Kubernetes clusters to v1.23; removed: T244335: Upgrade kubernetes clusters to v1.16.
akosiaris mentioned this in T306649: Agree strategy for Kubernetes BGP peering to top-of-rack switches.May 13 2022, 11:36 AM
gerritbot added a comment.May 13 2022, 12:30 PM

Change 791597 had a related patch set uploaded (by Alexandros Kosiaris; author: Alexandros Kosiaris):

[operations/puppet@production] WIP: kubernetes: Use netbox data to populate topology labels

https://gerrit.wikimedia.org/r/791597

gerritbot added a project: Patch-For-Review.May 13 2022, 12:30 PM
Jelto subscribed.Jun 8 2022, 3:52 PM
jijiki moved this task from Incoming 🐫 to 🙈🙉🙊Backlog on the serviceops board.Sep 28 2022, 2:24 PM
JMeybohm moved this task from 🙈🙉🙊Backlog to ⎈Kubernetes on the serviceops board.Oct 10 2022, 8:15 AM
jijiki moved this task from ⎈Kubernetes to Backlog FY23-24 🚜 on the serviceops board.Nov 8 2022, 6:12 PM
JMeybohm triaged this task as Medium priority.Nov 18 2022, 9:23 AM
JMeybohm claimed this task.Dec 12 2022, 3:45 PM
JMeybohm moved this task from Backlog FY23-24 🚜 to Doing 😎 on the serviceops board.
gerritbot added a comment.Dec 13 2022, 12:06 PM

Change 791597 merged by JMeybohm:

[operations/puppet@production] kubernetes: Use netbox data to populate topology labels

https://gerrit.wikimedia.org/r/791597

gerritbot added a comment.Dec 13 2022, 1:27 PM

Change 867589 had a related patch set uploaded (by JMeybohm; author: JMeybohm):

[operations/puppet@production] k8s: Keep deprecated failure-domain.beta.* labels around in 1.23

https://gerrit.wikimedia.org/r/867589

JMeybohm mentioned this in T325066: Migrate charts away from deprecated topology annotations.Dec 13 2022, 2:12 PM
gerritbot added a comment.Dec 14 2022, 9:02 AM

Change 868029 had a related patch set uploaded (by JMeybohm; author: JMeybohm):

[operations/deployment-charts@master] calico: Make ganeti worker nodes peer with core routers (aux)

https://gerrit.wikimedia.org/r/868029

gerritbot added a comment.Dec 14 2022, 9:02 AM

Change 868030 had a related patch set uploaded (by JMeybohm; author: JMeybohm):

[operations/deployment-charts@master] calico: Make ganeti worker nodes peer with core routers

https://gerrit.wikimedia.org/r/868030

gerritbot added a comment.Dec 14 2022, 9:16 AM

Change 868029 merged by jenkins-bot:

[operations/deployment-charts@master] calico: Make ganeti worker nodes peer with core routers (aux)

https://gerrit.wikimedia.org/r/868029

gerritbot added a comment.Dec 14 2022, 9:16 AM

Change 868030 merged by jenkins-bot:

[operations/deployment-charts@master] calico: Make ganeti worker nodes peer with core routers

https://gerrit.wikimedia.org/r/868030

gerritbot added a comment.Dec 14 2022, 2:58 PM

Change 867589 merged by JMeybohm:

[operations/puppet@production] k8s: Keep deprecated failure-domain.beta.* labels around in 1.23

https://gerrit.wikimedia.org/r/867589

JMeybohm closed this task as Resolved.Dec 14 2022, 3:04 PM

This is done (and unfortunately led to T325056: Can't log in or out or save edits - Invalid CSRF token).

I've created T325066: Migrate charts away from deprecated topology annotations to follow up on removing the deprecated annotations after the 1.23 migration has been completed.

Content licensed under Creative Commons Attribution-ShareAlike (CC BY-SA) 4.0 unless otherwise noted; code licensed under GNU General Public License (GPL) 2.0 or later and other open source licenses. By using this site, you agree to the Terms of Use, Privacy Policy, and Code of Conduct. · Wikimedia Foundation · Privacy Policy · Code of Conduct · Terms of Use · Disclaimer · CC-BY-SA · GPL