Skip to content

MON-4533: Bump prometheus-operator version to v0.89.0#361

Closed
slashpai wants to merge 275 commits into
openshift:mainfrom
slashpai:openshift-main
Closed

MON-4533: Bump prometheus-operator version to v0.89.0#361
slashpai wants to merge 275 commits into
openshift:mainfrom
slashpai:openshift-main

Conversation

@slashpai
Copy link
Copy Markdown
Member

supersedes #354

After bumping go image versions to 1.25

Did manual steps:

git fetch https://github.com/prometheus-operator/prometheus-operator --tags
if ! git merge refs/tags/v0.89.0 --no-edit; then
  git checkout --theirs CHANGELOG.md Documentation VERSION bundle.yaml example go.mod go.sum scripts/go.mod scripts/go.sum pkg
  git checkout --ours 
  git add CHANGELOG.md Documentation VERSION bundle.yaml example go.mod go.sum scripts/go.mod scripts/go.sum pkg 
  git merge --continue
fi
go mod tidy
go mod vendor

if [ -f scripts/rh-manifest.sh ]; then
  bash scripts/rh-manifest.sh
  git add rh-manifest.txt
  git diff --cached --exit-code || git commit -s -m "[bot] update rh-manifest.txt"
fi

Jakob3xD and others added 30 commits December 2, 2025 11:21
…or thanos

Signed-off-by: Jakob Hahn <jakob.hahn@hetzner.com>
Bumps [github.com/prometheus/prometheus](https://github.com/prometheus/prometheus) from 0.307.3 to 0.308.0.
- [Release notes](https://github.com/prometheus/prometheus/releases)
- [Changelog](https://github.com/prometheus/prometheus/blob/main/CHANGELOG.md)
- [Commits](prometheus/prometheus@v0.307.3...v0.308.0)

---
updated-dependencies:
- dependency-name: github.com/prometheus/prometheus
  dependency-version: 0.308.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
…dependabot/go_modules/github.com/prometheus/prometheus-0.308.0

build(deps): bump github.com/prometheus/prometheus from 0.307.3 to 0.308.0
feat: expose pod management policy for workloads
…ources-selected-condition

feat: add new NoSelectedResources reason
Signed-off-by: Jakob Hahn <jakob.hahn@hetzner.com>
…uler-group-labels

pkg/operator/rules: enable support for groupLabels and query offset for Thanos
This commit disables `golangci-kube-api-linter` until we get an official
release of `golangci-lint` which includes the fix for
golangci/golangci-lint#6205.

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
…e-golangci-kal

chore: disable kube-api linter
Signed-off-by: Hélia Barroso <helia_barroso@hotmail.com>
Bumps [golangci/golangci-lint-action](https://github.com/golangci/golangci-lint-action) from 9.1.0 to 9.2.0.
- [Release notes](https://github.com/golangci/golangci-lint-action/releases)
- [Commits](golangci/golangci-lint-action@v9.1.0...v9.2.0)

---
updated-dependencies:
- dependency-name: golangci/golangci-lint-action
  dependency-version: 9.2.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
…dependabot/github_actions/golangci/golangci-lint-action-9.2.0

build(deps): bump golangci/golangci-lint-action from 9.1.0 to 9.2.0
…prom_version

chore: update prometheus version
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
…revert-8141-disable-golangci-kal

Revert "chore: disable kube-api linter"
This change adds missing `metadata` keys into Role manifests describing `v1 Endpoiints is deprecated...` warning
docs: add missing metadata tags into manifests
…ape_native_histograms

feat: add `scrape_native_histograms`
…or#7999)

* feat: add status subresource to alertmanager

Signed-off-by: Hélia Barroso <helia_barroso@hotmail.com>

* feat: add am config beta

Signed-off-by: Hélia Barroso <helia_barroso@hotmail.com>

---------

Signed-off-by: Hélia Barroso <helia_barroso@hotmail.com>
Bumps [golang.org/x/sync](https://github.com/golang/sync) from 0.18.0 to 0.19.0.
- [Commits](https://github.com/golang/sync/commits)

---
updated-dependencies:
- dependency-name: golang.org/x/sync
  dependency-version: 0.19.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
…dependabot/go_modules/golang.org/x/sync-0.19.0

build(deps): bump golang.org/x/sync from 0.18.0 to 0.19.0
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
Bumps [golang.org/x/net](https://github.com/golang/net) from 0.47.0 to 0.48.0.
- [Commits](golang/net@v0.47.0...v0.48.0)

---
updated-dependencies:
- dependency-name: golang.org/x/net
  dependency-version: 0.48.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
…dependabot/go_modules/golang.org/x/net-0.48.0

build(deps): bump golang.org/x/net from 0.47.0 to 0.48.0
…8149)

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
Signed-off-by: Hélia Barroso <helia_barroso@hotmail.com>
Signed-off-by: Jayapriya Pai <slashpai9@gmail.com>
@slashpai
Copy link
Copy Markdown
Member Author

/retest-required

@slashpai
Copy link
Copy Markdown
Member Author

/hold

@openshift-ci openshift-ci Bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 24, 2026
@slashpai
Copy link
Copy Markdown
Member Author

cc @simonpasquier

Copy link
Copy Markdown

@simonpasquier simonpasquier left a comment

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Feb 24, 2026
@openshift-ci
Copy link
Copy Markdown

openshift-ci Bot commented Feb 24, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: simonpasquier, slashpai

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

The pull request process is described here

Details Needs approval from an approver in each of these files:
  • OWNERS [simonpasquier,slashpai]

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

@slashpai
Copy link
Copy Markdown
Member Author

@simonpasquier
Copy link
Copy Markdown

I'd like to merge #364 first

@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 26, 2026
@openshift-ci openshift-ci Bot removed the lgtm Indicates that a PR is ready to be merged. label Feb 27, 2026
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 27, 2026
@openshift-ci
Copy link
Copy Markdown

openshift-ci Bot commented Feb 27, 2026

New changes are detected. LGTM label has been removed.

@slashpai
Copy link
Copy Markdown
Member Author

/hold cancel

@simonpasquier please review again as I had to rebase

@openshift-ci openshift-ci Bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 27, 2026
Signed-off-by: Jayapriya Pai <janantha@redhat.com>
Signed-off-by: Jayapriya Pai <janantha@redhat.com>
OCP builder images set GOFLAGS=-mod=vendor globally, which causes
golangci-lint's "custom" command to fail with "inconsistent vendoring"
when building its plugin binary in a temp directory. Add Makefile.ocp
to unexport GOFLAGS, included via -include so it's a no-op upstream.

Assisted-By: Cursor AI
Signed-off-by: Jayapriya Pai <janantha@redhat.com>
@simonpasquier
Copy link
Copy Markdown

/test images

@openshift-ci
Copy link
Copy Markdown

openshift-ci Bot commented Mar 5, 2026

@slashpai: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/e2e-aws-upgrade d8a5f6a link true /test e2e-aws-upgrade
ci/prow/e2e-agnostic-cmo d8a5f6a link true /test e2e-agnostic-cmo
ci/prow/ginkgo-tests-cmo d8a5f6a link false /test ginkgo-tests-cmo
ci/prow/test-unit d8a5f6a link true /test test-unit
ci/prow/okd-scos-images d8a5f6a link true /test okd-scos-images
ci/prow/e2e-aws d8a5f6a link true /test e2e-aws
ci/prow/images d8a5f6a link true /test images

Full PR test history. Your PR dashboard.

Details

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-sigs/prow repository. I understand the commands that are listed here.

@simonpasquier
Copy link
Copy Markdown

/close
superseded by #374

@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 12, 2026
@openshift-merge-robot
Copy link
Copy Markdown

PR needs rebase.

Details

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-sigs/prow repository.

@openshift-ci openshift-ci Bot closed this Mar 12, 2026
@openshift-ci
Copy link
Copy Markdown

openshift-ci Bot commented Mar 12, 2026

@simonpasquier: Closed this PR.

Details

In response to this:

/close
superseded by #374

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-sigs/prow repository.

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. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD.

Projects

None yet

Development

Successfully merging this pull request may close these issues.