Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replace references to old topology labels with the new ones #1563

Merged
merged 1 commit into from
Nov 9, 2020

Conversation

tosi3k
Copy link
Member

@tosi3k tosi3k commented Nov 9, 2020

Output of grepping failure-domain.beta.kubernetes.io at the top-level perf-tests repo directory, master branch:

./clusterloader2/vendor/k8s.io/api/core/v1/well_known_labels.go:22:	LabelZoneFailureDomain       = "failure-domain.beta.kubernetes.io/zone"
./clusterloader2/vendor/k8s.io/api/core/v1/well_known_labels.go:23:	LabelZoneRegion              = "failure-domain.beta.kubernetes.io/region"
./clusterloader2/pkg/util/ssh.go:39:	zone, ok := node.Labels["failure-domain.beta.kubernetes.io/zone"]
./clusterloader2/pkg/util/ssh.go:41:		return fmt.Errorf("unknown zone for %q node: no failure-domain.beta.kubernetes.io/zone label", node.Name)
./clusterloader2/pkg/prometheus/experimental.go:89:		zone = pv.ObjectMeta.Labels["failure-domain.beta.kubernetes.io/zone"]
./compare/vendor/k8s.io/apimachinery/pkg/apis/meta/v1/well_known_labels.go:23:	LabelZoneFailureDomain = "failure-domain.beta.kubernetes.io/zone"
./compare/vendor/k8s.io/apimachinery/pkg/apis/meta/v1/well_known_labels.go:24:	LabelZoneRegion        = "failure-domain.beta.kubernetes.io/region"

Not seeing any references to LabelZoneFailureDomain nor LabelZoneRegion in the non-vendored code.

Fixes #1554.

/sig scalability
/assign @mm4tt @wojtek-t

@k8s-ci-robot k8s-ci-robot added sig/scalability Categorizes an issue or PR as relevant to SIG Scalability. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Nov 9, 2020
@wojtek-t
Copy link
Member

wojtek-t commented Nov 9, 2020

/lgtm
/approve

thanks!

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Nov 9, 2020
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: tosi3k, wojtek-t

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 9, 2020
@k8s-ci-robot k8s-ci-robot merged commit ded6897 into kubernetes:master Nov 9, 2020
@@ -86,7 +86,7 @@ func (pc *Controller) tryRetrievePrometheusDiskMetadata() (bool, error) {
}
klog.V(2).Infof("Found Prometheus' PV with name: %s", pv.Name)
pdName = pv.Spec.GCEPersistentDisk.PDName
zone = pv.ObjectMeta.Labels["failure-domain.beta.kubernetes.io/zone"]
zone = pv.ObjectMeta.Labels["topology.kubernetes.io/zone"]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For some reason prometheus' disk is still using failure-domain.beta.kubernetes.io.zone: kubernetes/kubernetes#96509 (comment)

@RobertKielty
Copy link
Member

@mborsz
Copy link
Member

mborsz commented Nov 12, 2020

Before the next attempt to submit this we should make sure that presubmit used by perf-test repo uses --check-leaked-resources (and potential other differences between ci-kubernetes-e2e-gci-gce-scalability and perf-tests and k/k presubmits).

This would block submission of this PR.

@tosi3k tosi3k deleted the remove-old-topology-labels branch February 9, 2021 21:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. sig/scalability Categorizes an issue or PR as relevant to SIG Scalability. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

old (beta) topology labels are going away
6 participants