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

flow control metrics: switch to snake_case for labels #24905

Merged
merged 1 commit into from
Nov 9, 2020

Conversation

adtac
Copy link
Member

@adtac adtac commented Nov 5, 2020

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Nov 5, 2020
@k8s-ci-robot k8s-ci-robot added language/en Issues or PRs related to English language sig/docs Categorizes an issue or PR as relevant to SIG Docs. labels Nov 5, 2020
@adtac
Copy link
Member Author

adtac commented Nov 5, 2020

ref PR in k/k: kubernetes/kubernetes#96236

@netlify
Copy link

netlify bot commented Nov 5, 2020

Deploy preview for kubernetes-io-master-staging ready!

Built with commit 5ab1d97

https://deploy-preview-24905--kubernetes-io-master-staging.netlify.app

Copy link
Contributor

@sftim sftim left a comment

Choose a reason for hiding this comment

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

I recommend adding a note callout ({{< note >}}{{< note >}}) on line 333 or thereabouts to tell readers that these metric labels have changed case in release v1.20

and that readers running older versions of Kubernetes should switch to the documentation for the version that they are running.

@sftim
Copy link
Contributor

sftim commented Nov 5, 2020

/hold
kubernetes/kubernetes#96236 is not yet merged

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 5, 2020
@sftim
Copy link
Contributor

sftim commented Nov 5, 2020

/sig api-machinery
/sig instrumentation

@k8s-ci-robot k8s-ci-robot added sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. sig/instrumentation Categorizes an issue or PR as relevant to SIG Instrumentation. labels Nov 5, 2020
Signed-off-by: Adhityaa Chandrasekar <adtac@google.com>
@adtac
Copy link
Member Author

adtac commented Nov 6, 2020

@sftim added a note about k8s < v1.20. Also, kubernetes/kubernetes#96236 has been merged, so:

/hold cancel

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Nov 6, 2020
Copy link
Member

@MikeSpreitzer MikeSpreitzer left a comment

Choose a reason for hiding this comment

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

/LGTM
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 6, 2020
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: de0c918b195eabe02dcf2e4addd92ab2c19603c8

@MikeSpreitzer
Copy link
Member

@sftim : I think this is ready for you to take another look and approve.

@adtac
Copy link
Member Author

adtac commented Nov 9, 2020

/assign @sftim

@lavalamp
Copy link
Member

lavalamp commented Nov 9, 2020

Tech LGTM here.

@sftim is there any reason to wait on this longer? I think it's good to go.

Copy link
Contributor

@sftim sftim left a comment

Choose a reason for hiding this comment

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

/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: MikeSpreitzer, sftim

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 a9a7249 into kubernetes:master Nov 9, 2020
@sftim
Copy link
Contributor

sftim commented Nov 9, 2020

D'oh. This should have been on the dev-1.20 branch, right?

@lavalamp
Copy link
Member

lavalamp commented Nov 9, 2020

Oh yes, probably. Sorry!

@sftim sftim mentioned this pull request Nov 9, 2020
@sftim
Copy link
Contributor

sftim commented Nov 9, 2020

I'll get it reverted - can we get another PR opened that targets the dev-1.20 branch instead?

@adtac
Copy link
Member Author

adtac commented Nov 9, 2020

I understand why I'd need to create a new PR targeting dev-1.20, but can I know why the merge into master needs to be reverted? As far as I understand, we'd still need the same changes in 1.21 and beyond. Not too familiar with the release cut process, sorry.

@sftim
Copy link
Contributor

sftim commented Nov 9, 2020

We shouldn't tell readers

If you're running Kubernetes versions v1.19 and earlier, you should refer to the documentation for your version.

if they are looking at the v1.19 docs - it's unhelpfully recursive.

@sftim
Copy link
Contributor

sftim commented Nov 10, 2020

BTW the master branch is docs for the current release

@MikeSpreitzer
Copy link
Member

@sftim : Please help me understand what you are saying about the master branch. Are you saying that right now the master branch is docs for release 1.19 and that when 1.20 is released the master pointer (in the sense that a branch is just a pointer to a commit) will be switched to point to the same commit as dev-1.20?

@sftim
Copy link
Contributor

sftim commented Nov 10, 2020

The Kubernetes website uses a continuous deployment process. This table should explain how we use branches.

Scenario Branch
Existing or new English language content for the current release of Kubernetes master (pending future rename)
(English) content for a feature change release The branch which corresponds to the major and minor version the feature change is in, using the pattern dev-<version>. For example, if a feature changes in the v1.20 release, then add documentation changes to the dev-1.20 branch.
Content in other languages (localizations) Use the localization's convention.

@sftim
Copy link
Contributor

sftim commented Nov 10, 2020

We will merge the dev-1.20 branch into master by approving PR #24138; this happens as part of the release process. At that point, Netlify will see a change to master and will deploy the updated website.

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. language/en Issues or PRs related to English language lgtm "Looks good to me", indicates that a PR is ready to be merged. sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. sig/docs Categorizes an issue or PR as relevant to SIG Docs. sig/instrumentation Categorizes an issue or PR as relevant to SIG Instrumentation. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Fix metric labels in k8s.io/docs/concepts/cluster-administration/flow-control/
5 participants