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

Upgrade prometheus operator to 0.45.0 #20484

Merged
merged 1 commit into from
Mar 9, 2021
Merged

Upgrade prometheus operator to 0.45.0 #20484

merged 1 commit into from
Mar 9, 2021

Conversation

chaodaiG
Copy link
Contributor

This change is in preparation for upgrading prometheus, which could further help with mitigating #20439.

Have tried going through CHANGES from https://github.com/prometheus-operator/prometheus-operator/releases and incorporated possible relevant changes in this PR.

@chaodaiG
Upgrade prometheus operator to 0.45.0
515d740 
Have tried going through CHANGES from https://github.com/prometheus-operator/prometheus-operator/releases and incorporated possible relevant changes in this PR
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jan 15, 2021
@chaodaiG
Copy link
Contributor Author

/assign @hongkailiu @cjwagner

@k8s-ci-robot k8s-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jan 15, 2021
@k8s-ci-robot k8s-ci-robot added area/config Issues or PRs related to code in /config area/prow/bump Updates to the k8s prow cluster sig/testing Categorizes an issue or PR as relevant to SIG Testing. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Jan 15, 2021
cjwagner
cjwagner reviewed Jan 15, 2021
View reviewed changes
config/prow/cluster/monitoring/prometheus_operator_rbac.yaml
resources:
- customresourcedefinitions
verbs:
- '*'
Copy link
Member

Choose a reason for hiding this comment

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

Isn't this still needed in order to the operator to create/update the CRDs?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

This is from https://github.com/prometheus-operator/prometheus-operator/tree/master/example/rbac/prometheus-operator, I think it's replaced by a more strict rule under `- apiGroups:

  • monitoring.coreos.com`

Copy link
Member

Choose a reason for hiding this comment

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

I saw that, but IIUC that only grants access to resources in that api group. The resources are defined via CustomResourceDefinitions though which are themselves resources. I'd expect the operator to need permissions to act on CustomResourceDefinition resources in order to create or update the definitions.

I agree that it is strange that the rbac rules no longer include that so I am probably misunderstanding. We can certainly try this.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

sg

@spiffxp
Copy link
Member

spiffxp commented Jan 19, 2021

/test pull-test-infra-integration
#20498 (comment)

@chaodaiG
Copy link
Contributor Author

@hongkailiu , mind taking a look?

cjwagner
cjwagner approved these changes Jan 25, 2021
View reviewed changes
Copy link
Member

@cjwagner cjwagner left a comment

Choose a reason for hiding this comment

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

/hold

@k8s-ci-robot k8s-ci-robot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. lgtm "Looks good to me", indicates that a PR is ready to be merged. labels Jan 25, 2021
@chaodaiG
Copy link
Contributor Author

chaodaiG commented Mar 2, 2021

/test ?

@k8s-ci-robot
Copy link
Contributor

@chaodaiG: The following commands are available to trigger jobs:

  • /test pull-test-infra-bazel
  • /test pull-test-infra-gubernator
  • /test pull-test-infra-verify-file-perms
  • /test pull-test-infra-yamllint
  • /test pull-test-infra-prow-checkconfig
  • /test pull-test-infra-integration

Use /test all to run the following jobs:

  • pull-test-infra-bazel
  • pull-test-infra-verify-file-perms
  • pull-test-infra-yamllint
  • pull-test-infra-integration

In response to this:

/test ?

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.

@chaodaiG
Copy link
Contributor Author

chaodaiG commented Mar 2, 2021

/test

@k8s-ci-robot
Copy link
Contributor

@chaodaiG: The /test command needs one or more targets.
The following commands are available to trigger jobs:

  • /test pull-test-infra-bazel
  • /test pull-test-infra-gubernator
  • /test pull-test-infra-verify-file-perms
  • /test pull-test-infra-yamllint
  • /test pull-test-infra-prow-checkconfig
  • /test pull-test-infra-integration

Use /test all to run the following jobs:

  • pull-test-infra-bazel
  • pull-test-infra-verify-file-perms
  • pull-test-infra-yamllint
  • pull-test-infra-integration

In response to this:

/test

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.

@chaodaiG
Copy link
Contributor Author

chaodaiG commented Mar 2, 2021

/test something-not-exist

@k8s-ci-robot
Copy link
Contributor

@chaodaiG: The specified target(s) for /test were not found.
The following commands are available to trigger jobs:

  • /test pull-test-infra-bazel
  • /test pull-test-infra-gubernator
  • /test pull-test-infra-verify-file-perms
  • /test pull-test-infra-yamllint
  • /test pull-test-infra-prow-checkconfig
  • /test pull-test-infra-integration

Use /test all to run the following jobs:

  • pull-test-infra-bazel
  • pull-test-infra-verify-file-perms
  • pull-test-infra-yamllint
  • pull-test-infra-integration

In response to this:

/test something-not-exist

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.

@chaodaiG
Copy link
Contributor Author

chaodaiG commented Mar 2, 2021

/retest ?

@k8s-ci-robot
Copy link
Contributor

@chaodaiG: The /retest command does not accept any targets.
The following commands are available to trigger jobs:

  • /test pull-test-infra-bazel
  • /test pull-test-infra-gubernator
  • /test pull-test-infra-verify-file-perms
  • /test pull-test-infra-yamllint
  • /test pull-test-infra-prow-checkconfig
  • /test pull-test-infra-integration

Use /test all to run the following jobs:

  • pull-test-infra-bazel
  • pull-test-infra-verify-file-perms
  • pull-test-infra-yamllint
  • pull-test-infra-integration

In response to this:

/retest ?

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.

spiffxp
spiffxp approved these changes Mar 2, 2021
View reviewed changes
Copy link
Member

@spiffxp spiffxp left a comment

Choose a reason for hiding this comment

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

/approve
/lgtm
/retest

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: chaodaiG, cjwagner, spiffxp

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

@chaodaiG
Copy link
Contributor Author

chaodaiG commented Mar 5, 2021

Will try to merge this this upcoming week

@chaodaiG chaodaiG mentioned this pull request Mar 9, 2021
Closed
@chaodaiG
Copy link
Contributor Author

chaodaiG commented Mar 9, 2021

/unhold

@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 Mar 9, 2021
@k8s-ci-robot k8s-ci-robot merged commit c845534 into kubernetes:master Mar 9, 2021
@k8s-ci-robot k8s-ci-robot added this to the v1.21 milestone Mar 9, 2021
@chaodaiG chaodaiG mentioned this pull request Mar 9, 2021
Closed
@chaodaiG chaodaiG deleted the update-prometheus-operator branch March 12, 2021 15:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cjwagner cjwagner cjwagner approved these changes

@spiffxp spiffxp spiffxp approved these changes

@cblecker cblecker Awaiting requested review from cblecker

@stevekuznetsov stevekuznetsov Awaiting requested review from stevekuznetsov

Assignees

@spiffxp spiffxp

@hongkailiu hongkailiu

@cjwagner cjwagner

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/config Issues or PRs related to code in /config area/prow/bump Updates to the k8s prow cluster 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/testing Categorizes an issue or PR as relevant to SIG Testing. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
v1.21
Development

Successfully merging this pull request may close these issues.
5 participants
@chaodaiG @spiffxp @k8s-ci-robot @cjwagner @hongkailiu