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

[bot] Bump openshift/prometheus-operator to v0.64.0 #223

Closed

Conversation

openshift-monitoring-bot[bot]
Copy link

Description

This is an automated version bump from CI.
If you wish to perform this manually, execute the following commands from openshift/prometheus-operator repo,

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

dependabot bot and others added 30 commits February 9, 2023 12:43
…erator#5329)

Bumps [golang.org/x/net](https://github.com/golang/net) from 0.5.0 to 0.6.0.
- [Release notes](https://github.com/golang/net/releases)
- [Commits](golang/net@v0.5.0...v0.6.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Closes prometheus-operator#5187

Problem: Before this commit the code path used by the field queryConfig
was not being tested in e2e tests

Solution: This commit adds a test that validates that if queryConfig is
set, then the operator will configure the ThanosRuler deployment
correctly

Signed-off-by: JoaoBraveCoding <jmarcal@redhat.com>
…os-ruler-query-config-test

Adds e2e test to validate ThanosRuler queryConfig field
* test: fix variable captured in loop closure

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
…ic Relabel (prometheus-operator#5320)

* [FEAT] adding examples about relabel and metric relabel

* Update Documentation/user-guides/running-exporters.md

Co-authored-by: Guillaume Hérail <xiu@users.noreply.github.com>

* Update Documentation/user-guides/running-exporters.md

Co-authored-by: Guillaume Hérail <xiu@users.noreply.github.com>

* Update Documentation/user-guides/running-exporters.md

Co-authored-by: Guillaume Hérail <xiu@users.noreply.github.com>

* Update Documentation/user-guides/running-exporters.md

Co-authored-by: Guillaume Hérail <xiu@users.noreply.github.com>

* Update Documentation/user-guides/running-exporters.md

Co-authored-by: Guillaume Hérail <xiu@users.noreply.github.com>

* [FEAT] adding examples

* Update Documentation/user-guides/running-exporters.md

Co-authored-by: Guillaume Hérail <xiu@users.noreply.github.com>

* Update Documentation/user-guides/running-exporters.md

Co-authored-by: Joao Marcal <joao.marcal12@gmail.com>

* Update Documentation/user-guides/running-exporters.md

Co-authored-by: Joao Marcal <joao.marcal12@gmail.com>

* Update Documentation/user-guides/running-exporters.md

Co-authored-by: Joao Marcal <joao.marcal12@gmail.com>

* Update Documentation/user-guides/running-exporters.md

Co-authored-by: Joao Marcal <joao.marcal12@gmail.com>

* Update Documentation/user-guides/running-exporters.md

Co-authored-by: Simon Pasquier <spasquie@redhat.com>

* Update Documentation/user-guides/running-exporters.md

Co-authored-by: Simon Pasquier <spasquie@redhat.com>

* Update Documentation/user-guides/running-exporters.md

Co-authored-by: Simon Pasquier <spasquie@redhat.com>

* [FEAT] adding examples

* Update Documentation/user-guides/running-exporters.md

Co-authored-by: Joao Marcal <joao.marcal12@gmail.com>

* Update Documentation/user-guides/running-exporters.md

Co-authored-by: Joao Marcal <joao.marcal12@gmail.com>

* Update Documentation/user-guides/running-exporters.md

Co-authored-by: Joao Marcal <joao.marcal12@gmail.com>

* Update Documentation/user-guides/running-exporters.md

Co-authored-by: Simon Pasquier <spasquie@redhat.com>

* Update Documentation/user-guides/running-exporters.md

Co-authored-by: Simon Pasquier <spasquie@redhat.com>

---------

Co-authored-by: Guillaume Hérail <xiu@users.noreply.github.com>
Co-authored-by: Joao Marcal <joao.marcal12@gmail.com>
Co-authored-by: Simon Pasquier <spasquie@redhat.com>
…tor#5310)

* Create Interface between Prometheus and PrometheusAgent

* Refactor: Use PrometheusInterface to generate configuration

* Hide PrometheusInterface from API documentation

Signed-off-by: Arthur Silva Sens <arthursens2005@gmail.com>
Default to 30s

via gosec linter - G112: Potential slowloris attack

https://medium.com/a-journey-with-go/go-understand-and-mitigate-slowloris-attack-711c1b1403f6
Signed-off-by: Manuel Rüger <manuel@rueg.eu>
…erator#5342)

Bumps [golang.org/x/net](https://github.com/golang/net) from 0.6.0 to 0.7.0.
- [Release notes](https://github.com/golang/net/releases)
- [Commits](golang/net@v0.6.0...v0.7.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Set Read/ReadHeaderTimeouts on http.Server
Signed-off-by: JoaoBraveCoding <jmarcal@redhat.com>
…s-operator#5351)

Bumps [golang.org/x/net](https://github.com/golang/net) from 0.5.0 to 0.7.0.
- [Release notes](https://github.com/golang/net/releases)
- [Commits](golang/net@v0.5.0...v0.7.0)

---
updated-dependencies:
- dependency-name: golang.org/x/net
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…prometheus-operator#5352)

Bumps [golang.org/x/net](https://github.com/golang/net) from 0.5.0 to 0.7.0.
- [Release notes](https://github.com/golang/net/releases)
- [Commits](golang/net@v0.5.0...v0.7.0)

---
updated-dependencies:
- dependency-name: golang.org/x/net
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…rometheus-operator#5353)

Bumps [golang.org/x/net](https://github.com/golang/net) from 0.5.0 to 0.7.0.
- [Release notes](https://github.com/golang/net/releases)
- [Commits](golang/net@v0.5.0...v0.7.0)

---
updated-dependencies:
- dependency-name: golang.org/x/net
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
…rometheus-operator#5355)

Bumps [github.com/prometheus/common](https://github.com/prometheus/common) from 0.39.0 to 0.40.0.
- [Release notes](https://github.com/prometheus/common/releases)
- [Commits](prometheus/common@v0.39.0...v0.40.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Images with the `main` tag aren't signed because if I understand
correctly, it's not possible to sign again an existing image. Otherwise
we would have to suffix the tag with the short commit ID (e.g.
`:main-01234567`). At the same time, using the main (or latest) tag isn't
the best choice in terms of reproducibility/stability so not having
signed images is probably not a big deal.

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
…#5349)

* config-reloader: add the reload-timeout argument

this new argument enables you to increase (or decrease) the duration for config-reloader to wait after Prometheus' reload

Fixes prometheus-operator#5346
this ensures there is no race between alertmanager and config-reloader
generating config during initial launch

Fixes prometheus-operator#5357
…-init-config

config-reloader: add init-config-reloader to alertmanager
Add a BlockSize param to the ThanosSpec to allow configuration of the
Prometheus min/max block duration when using the Thanos Sidecar.

Fixes: prometheus-operator#4414

Signed-off-by: SuperQ <superq@gmail.com>
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
…t_time

apis: Add Thanos BlockSize control
Signed-off-by: Simon Pasquier <spasquie@redhat.com>
At the time of making this commit, the package `github.com/ghodss/yaml`
is no longer actively maintained.

`sigs.k8s.io/yaml` is a permanent fork of `ghodss/yaml` and is actively
maintained by Kubernetes SIG.

Signed-off-by: Eng Zer Jun <engzerjun@gmail.com>
refactor: replace `github.com/ghodss/yaml` with `sigs.k8s.io/yaml`
Fixes prometheus-operator#5363

Signed-off-by: Jayapriya Pai <slashpai9@gmail.com>
…-operator#5334)

* Refactor: Use PrometheusInterface to generate statefulset

Signed-off-by: ArthurSens <arthursens2005@gmail.com>

* Fix potential nil pointer exception for thanos blockDuration

Signed-off-by: ArthurSens <arthursens2005@gmail.com>

* (tests): Fix TestThanosObjectStorage and TestThanosObjectStorageFile

Signed-off-by: ArthurSens <arthursens2005@gmail.com>

* Update pkg/prometheus/statefulset.go

---------

Signed-off-by: ArthurSens <arthursens2005@gmail.com>
Co-authored-by: Simon Pasquier <spasquie@redhat.com>
…t-port-name

api: define default value for `spec.portName`
…ometheus-operator#5373)

Bumps [github.com/stretchr/testify](https://github.com/stretchr/testify) from 1.8.1 to 1.8.2.
- [Release notes](https://github.com/stretchr/testify/releases)
- [Commits](stretchr/testify@v1.8.1...v1.8.2)

---
updated-dependencies:
- dependency-name: github.com/stretchr/testify
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
method `CheckPrerequisites()` to avoid creating
controller object incase of validation failure.

This is used for prometheus-agent controller as part of
this commit.
These methods can be re-used for future CRD validation
and controllers

Signed-off-by: Jayapriya Pai <slashpai9@gmail.com>
Fixes prometheus-operator#4998

Signed-off-by: Jayapriya Pai <slashpai9@gmail.com>
Fixes prometheus-operator#5526

Signed-off-by: Jayapriya Pai <slashpai9@gmail.com>
Related-to prometheus-operator#5526

Signed-off-by: Jayapriya Pai <slashpai9@gmail.com>
@slashpai
Copy link
Member

@simonpasquier Should we patch the change done in upstream downstream here or will we need to do new release upstream?

@simonpasquier
Copy link

We have v0.64.1 upstream now but I guess that we'll have to wait for v0.65.0 which should include prometheus-operator#5476.

/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 Apr 27, 2023
simonpasquier and others added 18 commits April 27, 2023 14:31
…heme

pkg/apis: Add endpoint scheme validation
…ation

fix: Add validation method for controller and crd's
pkg/apis: Support Prometheus RuleGroup Limit
…robe_scheme

pkg/apis: Add http scheme validation in podmonitor and probe
…alidation

fix: Wrap downstream error when checking that a CRD is installed
…ion-status

Fix number of failed sync status
The Kubernetes version used in the e2e tests is v1.26.3 because v1.27.1
doesn't work yet with kind.

Signed-off-by: Simon Pasquier <spasquie@redhat.com>
…rator#5537)

Bumps [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang) from 1.14.0 to 1.15.0.
- [Release notes](https://github.com/prometheus/client_golang/releases)
- [Changelog](https://github.com/prometheus/client_golang/blob/main/CHANGELOG.md)
- [Commits](prometheus/client_golang@v1.14.0...v1.15.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: ArthurSens <arthursens2005@gmail.com>
* api/v1alpha1: Add ScrapeConfig CRD

Co-authored-by: Simon Pasquier <spasquie@redhat.com>
Co-authored-by: Joao Marcal <joao.marcal12@gmail.com>

* api/v1: Add ScrapeConfig selectors to Prometheus

Co-authored-by: Joao Marcal <joao.marcal12@gmail.com>

* prometheus/server/operator: Add ScrapeConfig selection logic

Co-authored-by: Arthur Silva Sens <arthursens2005@gmail.com>

* prometheus/server/operator: Add static_config generation from ScrapeConfig

Co-authored-by: Joao Marcal <joao.marcal12@gmail.com>

* prometheus/server/operator: Add file_sd_config and http_sd_config generation from ScrapeConfig

Co-authored-by: Joao Marcal <joao.marcal12@gmail.com>

* prometheus/server/operator: Check ScrapeConfig permissions before trying to select them

* prometheus/server/operator: Check that the ScrapeConfig CRD is installed

* fix: Apply suggestions from Joao

Co-authored-by: Joao Marcal <joao.marcal12@gmail.com>

* fix: Apply suggestion from mrueg

Co-authored-by: Manuel Rüger <manuel@rueg.eu>

* fix: Properly generate scrape configurations for PrometheusAgent

Also check that the ScrapeConfig CRD is installed and that the operator has the
right permissions.

* fix: Address Joao's points

Co-authored-by: Joao Marcal <joao.marcal12@gmail.com>

* fix: ScrapeConfig only needs get,list,watch

References:
- prometheus-operator#5335 (comment)

Co-authored-by: Arthur Silva Sens <arthursens2005@gmail.com>

* fix: Implement ScrapeConfig ResourceEventHandlerFuncs

References:
- prometheus-operator#5335 (comment)

Co-authored-by: Arthur Silva Sens <arthursens2005@gmail.com>

* fix: Missing permissions for prometheus-operator's serviceaccount

* fix: Address Arthur's feedback

Co-authored-by: Arthur Silva Sens <arthursens2005@gmail.com>

* fix: Address Simon's feedback

Co-authored-by: Simon Pasquier <spasquie@redhat.com>

* feat: Add ScrapeConfig.HonorTimestamps

* feat: Add ScrapeConfig.HonorLabels

* fix: Address feedback from Joao

Co-authored-by: Joao Marcal <joao.marcal12@gmail.com>

* fix: Address Simon's feedback

Co-authored-by: Simon Pasquier <spasquie@redhat.com>

* chore: Finalize the move to CRDChecker

* fix: Include ScrapeConfig in e2e tests

* docs: spec.ProbeSelector -> spec.probeSelector

* fix: Don't addEventHandler if we don't have a scrape confirm informer

* fix: Address feedback from Simon and Philip

Co-authored-by: Simon Pasquier <spasquie@redhat.com>
Co-authored-by: Philip Gough <philip.p.gough@gmail.com>

* fix: Wrap error with a better error message

* fix: Linting

---------

Co-authored-by: Simon Pasquier <spasquie@redhat.com>
Co-authored-by: Joao Marcal <joao.marcal12@gmail.com>
Co-authored-by: Arthur Silva Sens <arthursens2005@gmail.com>
Co-authored-by: Manuel Rüger <manuel@rueg.eu>
Co-authored-by: Philip Gough <philip.p.gough@gmail.com>
chore: make update-go-deps in prep for release v0.65.0
* release-chore: Bump version to 0.65.0

* release-chore: make clean generate

* release-chore: Update versions in go.mod

* release-chore: Add CHANGELOG for v0.65.0

* release-chore: make docs

* test:e2e: Modify semver check for ThanosRuler

* test:e2e: Add namespace to WaitForThanosRulerReady sig
v0.65.0

# -----BEGIN PGP SIGNATURE-----
#
# iQIzBAABCAAdFiEEhSXnVwfRWa2LCyGwpzydUrj9g2EFAmRT2vcACgkQpzydUrj9
# g2GtEw//RzmP9uq7z9mU/2kMDLQKMnl2H6R+p4el4m31i70cR9tEsdPt4wPedm9D
# RKtthq3XXmYxgmaCN/MQC4UofkmcR9fgz9QbVfa3kWQqWK4FNI+LzUmpt3C1oWn8
# luPK56wQmISUQw5CeUnUBps1s7+h4AHZVU5Z3cQu2DGLFpmC7wAnIwoyP21sntwI
# sNX2sN0lA8+26J+QX1JHaiIfslvj/OyGGO0XGxP293awLVNxCEgKFjfuaoDrOxbG
# NIkYGeCJUrQTCWEO23Su9TlOwzQzPponnhP7V3lOlxu9kaDkJThTJE8XEb0Q3LC1
# Qat77c2cCeHRozQt80pL4iN4ZIsrkJUUW0sSQiNWsd5JMxVh+2fA560Z3NCnkR7+
# xP4km3GKsn0LRlL+W/mgyWUN+CIBMilFDP3HP3nEJaa6jB1rRJa3OfadVMnhMnME
# x5DfDN93k7Mjmbj7eNins0j3M8caMYtN6u2Sp388qSiONzI+klBtBzOPVXR+0T5/
# FJm/GfhPEpjzIS431JiOg2rleeUn4G8yFdQEnQRBXmaIAf7OBlY8ilLWGXpg+UtQ
# amXCOGMru19y7WA1N2zLFjsoUaAl8RM5fMspKVef8n4i0jMPxnSZUr40oh2o1qbe
# VaYaOxOR8qujTbB0Z0T99BZaDIaNHMhgwnBJFVWll4khSjS3UnQ=
# =QhNF
# -----END PGP SIGNATURE-----
# gpg: directory '/home/runner/.gnupg' created
# gpg: keybox '/home/runner/.gnupg/pubring.kbx' created
# gpg: Signature made Thu May  4 16:19:03 2023 UTC
# gpg:                using RSA key 8525E75707D159AD8B0B21B0A73C9D52B8FD8361
# gpg: Can't check signature: No public key
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
@openshift-ci
Copy link

openshift-ci bot commented May 5, 2023

@openshift-monitoring-bot[bot]: 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 408de2e link true /test e2e-aws
ci/prow/e2e-aws-upgrade 408de2e link true /test e2e-aws-upgrade
ci/prow/e2e-agnostic-cmo 408de2e link true /test e2e-agnostic-cmo

Full PR test history. Your PR dashboard.

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

@slashpai
Copy link
Member

slashpai commented May 5, 2023

/close

0.65 is released we can have a new PR for that instead of 0.64

@openshift-ci openshift-ci bot closed this May 5, 2023
@openshift-ci
Copy link

openshift-ci bot commented May 5, 2023

@slashpai: Closed this PR.

In response to this:

/close

0.65 is released we can have a new PR for that instead of 0.64

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. ok-to-test Indicates a non-member PR verified by an org member that is safe to test.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet