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.

Sign up for GitHub

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

Jump to bottom

Make it possible to enable Prometheus metrics for Cilium #8433

Merged
merged 1 commit into from
Feb 6, 2020
Merged

Make it possible to enable Prometheus metrics for Cilium #8433

merged 1 commit into from
Feb 6, 2020

Conversation

olemarkus
Copy link
Member

Another bug in the new templates is the loss of prometheus metrics.

Since there are more cilium components involved here, the old config param didn't make that much sense anymore, so I rewrote that part.

Since the property is removed, this sort of breaks BC, but nothing would have happened for those that did so no loss of functionality.

/kind bug

@k8s-ci-robot k8s-ci-robot added kind/bug Categorizes issue or PR as related to a bug. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Jan 29, 2020
@k8s-ci-robot
Copy link
Contributor

Hi @olemarkus. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@k8s-ci-robot k8s-ci-robot added needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jan 29, 2020
@rifelpet
Copy link
Member

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jan 29, 2020
@olemarkus
Copy link
Member Author

@rifelpet anything holding this one back?

@olemarkus
Copy link
Member Author

/retest

@olemarkus
Copy link
Member Author

/test pull-kops-e2e-kubernetes-aws

johngmyers
johngmyers reviewed Feb 4, 2020
View reviewed changes
k8s/crds/kops.k8s.io_clusters.yaml Outdated
@@ -2666,8 +2666,6 @@ spec:
type: boolean
prefilterDevice:
type: string
prometheusServeAddr:
type: string
Copy link
Member

Choose a reason for hiding this comment

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

Do we allow removals like this?

Copy link
Member Author

Choose a reason for hiding this comment

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

That is indeed the question. At some point we do because it is just confusing for end users if we leave it in. And no one can be using that since it doesn't do anything.

If we have a more clear deprecation guide, I can do the removal in a second PR.

Copy link
Member

Choose a reason for hiding this comment

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

My understanding is that we need to leave them in unused. When we create a new API version, then we can remove it from the new version. My understanding might be inaccurate and I don't know how we're tracking items to change in the next API revision.

Copy link
Member Author

Choose a reason for hiding this comment

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

I removed this bit now. Can be fixed at a later time, I guess

@johngmyers
Copy link
Member

/retest

@rifelpet
Copy link
Member

rifelpet commented Feb 6, 2020

Ideally we could have this under test here but that could be tackled in a followup PR. You'd need to add the cilium addon manifest name to this list as well.

Thanks!

/lgtm
/approve

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: olemarkus, rifelpet

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 Feb 6, 2020
@rifelpet
Copy link
Member

rifelpet commented Feb 6, 2020 •
edited
Loading

And yes we should open a GH issue that tracks any breaking changes we want to make across the entire kops API like removing the unused prometheusServeAddr field

@olemarkus
Copy link
Member Author

/retest

@k8s-ci-robot k8s-ci-robot merged commit 4f2cdda into kubernetes:master Feb 6, 2020
@k8s-ci-robot k8s-ci-robot added this to the v1.18 milestone Feb 6, 2020
This was referenced Feb 7, 2020
Merged
Merged
Merged
k8s-ci-robot added a commit that referenced this pull request Feb 7, 2020
@k8s-ci-robot
Merge pull request #8509 from olemarkus/automated-cherry-pick-of-#843…
846dd9e 
…3-origin-release-1.15

Automated cherry pick of #8433: Make it possible to enable Prometheus metrics for Cilium
k8s-ci-robot added a commit that referenced this pull request Feb 7, 2020
@k8s-ci-robot
Merge pull request #8510 from olemarkus/automated-cherry-pick-of-#843…
ce47310 
…3-origin-release-1.16

Automated cherry pick of #8433: Make it possible to enable Prometheus metrics for Cilium
k8s-ci-robot added a commit that referenced this pull request Feb 7, 2020
@k8s-ci-robot
Merge pull request #8511 from olemarkus/automated-cherry-pick-of-#843…
2dc6b68 
…3-origin-release-1.17

Automated cherry pick of #8433: Make it possible to enable Prometheus metrics for Cilium
@olemarkus olemarkus deleted the cilium-prometheus branch March 25, 2020 20:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@johngmyers johngmyers johngmyers left review comments

@joshbranham joshbranham Awaiting requested review from joshbranham

@robinpercy robinpercy Awaiting requested review from robinpercy

Assignees

@rifelpet rifelpet

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. kind/bug Categorizes issue or PR as related to a bug. lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
v1.18
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@olemarkus @k8s-ci-robot @rifelpet @johngmyers