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

sync main with upstream #18

Open
wants to merge 1,824 commits into
base: main
Choose a base branch
from
Open

Conversation

cruizen
Copy link

@cruizen cruizen commented Mar 12, 2024

Description

sync main with upstream

Type of change

What type of changes does your code introduce to the Prometheus operator? Put an x in the box that apply.

  • CHANGE (fix or feature that would cause existing functionality to not work as expected)
  • FEATURE (non-breaking change which adds functionality)
  • BUGFIX (non-breaking change which fixes an issue)
  • ENHANCEMENT (non-breaking change which improves existing functionality)
  • NONE (if none of the other choices apply. Example, tooling, build system, CI, docs, etc.)

Changelog entry

Please put a one-line changelog entry below. This will be copied to the changelog file during the release process.


@cruizen cruizen requested review from joey00072, jayanth-tjvrr and a team March 12, 2024 13:00
github-actions bot and others added 27 commits October 23, 2024 12:58
…es/github.com/prometheus/prometheus-0.55.0

build(deps): bump github.com/prometheus/prometheus from 0.54.1 to 0.55.0
Signed-off-by: Jayapriya Pai <[email protected]>
chore: add prometheus v2.55.0
chore: update k8s libraries to v0.31.2
…-args

chore: refactor shared functions in pkg/prometeus
Bumps [github.com/prometheus/common](https://github.com/prometheus/common) from 0.60.0 to 0.60.1.
- [Release notes](https://github.com/prometheus/common/releases)
- [Changelog](https://github.com/prometheus/common/blob/main/RELEASE.md)
- [Commits](prometheus/common@v0.60.0...v0.60.1)

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

Signed-off-by: dependabot[bot] <[email protected]>
Bumps [sigs.k8s.io/controller-runtime](https://github.com/kubernetes-sigs/controller-runtime) from 0.19.0 to 0.19.1.
- [Release notes](https://github.com/kubernetes-sigs/controller-runtime/releases)
- [Changelog](https://github.com/kubernetes-sigs/controller-runtime/blob/main/RELEASE.md)
- [Commits](kubernetes-sigs/controller-runtime@v0.19.0...v0.19.1)

---
updated-dependencies:
- dependency-name: sigs.k8s.io/controller-runtime
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
…es/github.com/prometheus/common-0.60.1

build(deps): bump github.com/prometheus/common from 0.60.0 to 0.60.1
…es/sigs.k8s.io/controller-runtime-0.19.1

build(deps): bump sigs.k8s.io/controller-runtime from 0.19.0 to 0.19.1
…heus.http-client-file and save config file in secret (#7029)

* enchance: change thanos sidecar promethes.http-client params to prometheus.http-client-file and save config file in secret

* Update pkg/prometheus/server/operator.go

---------

Co-authored-by: Simon Pasquier <[email protected]>
Signed-off-by: Simon Pasquier <[email protected]>
Alertmanager v0.15.0 has been released on `2018-06-22` and there's no
good reason to run the operator with Alertmanager prior to this. The
documentation already says that we support Alertmanager v0.15.0 and
above.

Signed-off-by: Simon Pasquier <[email protected]>
Bumps [github.com/prometheus/exporter-toolkit](https://github.com/prometheus/exporter-toolkit) from 0.13.0 to 0.13.1.
- [Release notes](https://github.com/prometheus/exporter-toolkit/releases)
- [Changelog](https://github.com/prometheus/exporter-toolkit/blob/master/CHANGELOG.md)
- [Commits](prometheus/exporter-toolkit@v0.13.0...v0.13.1)

---
updated-dependencies:
- dependency-name: github.com/prometheus/exporter-toolkit
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
…es/github.com/prometheus/exporter-toolkit-0.13.1

build(deps): bump github.com/prometheus/exporter-toolkit from 0.13.0 to 0.13.1
When the E2E_DIAGNOSTIC_DIRECTORY environment variable is set, the test
framework will save all collected information (logs, events, resources,
...) to this directory.

Related to #6973

Signed-off-by: Simon Pasquier <[email protected]>
Signed-off-by: Simon Pasquier <[email protected]>
chore: allow to save e2e diagnostics to disk
dependabot bot and others added 30 commits January 7, 2025 12:27
Bumps [github.com/KimMachineGun/automemlimit](https://github.com/KimMachineGun/automemlimit) from 0.6.1 to 0.7.0.
- [Release notes](https://github.com/KimMachineGun/automemlimit/releases)
- [Commits](KimMachineGun/automemlimit@v0.6.1...v0.7.0)

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

Signed-off-by: dependabot[bot] <[email protected]>
…es/golang.org/x/net-0.34.0

build(deps): bump golang.org/x/net from 0.33.0 to 0.34.0
Bumps google.golang.org/protobuf from 1.36.1 to 1.36.2.

---
updated-dependencies:
- dependency-name: google.golang.org/protobuf
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
…es/github.com/KimMachineGun/automemlimit-0.7.0

build(deps): bump github.com/KimMachineGun/automemlimit from 0.6.1 to 0.7.0
…es/google.golang.org/protobuf-1.36.2

build(deps): bump google.golang.org/protobuf from 1.36.1 to 1.36.2
Bumps [sigs.k8s.io/controller-runtime](https://github.com/kubernetes-sigs/controller-runtime) from 0.19.3 to 0.19.4.
- [Release notes](https://github.com/kubernetes-sigs/controller-runtime/releases)
- [Changelog](https://github.com/kubernetes-sigs/controller-runtime/blob/main/RELEASE.md)
- [Commits](kubernetes-sigs/controller-runtime@v0.19.3...v0.19.4)

---
updated-dependencies:
- dependency-name: sigs.k8s.io/controller-runtime
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
…es/sigs.k8s.io/controller-runtime-0.19.4

build(deps): bump sigs.k8s.io/controller-runtime from 0.19.3 to 0.19.4
* update golangci-lint to v1.63.4

Signed-off-by: dongjiang <[email protected]>
…ngResourceAttributes

feat: Support add `KeepIdentifyingResourceAttributes` in OTLPConfig
Bumps [github.com/prometheus/alertmanager](https://github.com/prometheus/alertmanager) from 0.27.0 to 0.28.0.
- [Release notes](https://github.com/prometheus/alertmanager/releases)
- [Changelog](https://github.com/prometheus/alertmanager/blob/main/CHANGELOG.md)
- [Commits](prometheus/alertmanager@v0.27.0...v0.28.0)

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

Signed-off-by: dependabot[bot] <[email protected]>
…time

chore: Bump to controller-runtime version v0.19.4
…es/github.com/prometheus/alertmanager-0.28.0

build(deps): bump github.com/prometheus/alertmanager from 0.27.0 to 0.28.0
chore: add slashpai as release shepherd for v0.80
Bumps google.golang.org/protobuf from 1.36.2 to 1.36.3.

---
updated-dependencies:
- dependency-name: google.golang.org/protobuf
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
…es/google.golang.org/protobuf-1.36.3

build(deps): bump google.golang.org/protobuf from 1.36.2 to 1.36.3
…anager

chore: Update alertmanager to v0.28.0
Bumps [golangci/golangci-lint-action](https://github.com/golangci/golangci-lint-action) from 6.1.1 to 6.2.0.
- [Release notes](https://github.com/golangci/golangci-lint-action/releases)
- [Commits](golangci/golangci-lint-action@v6.1.1...v6.2.0)

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

Signed-off-by: dependabot[bot] <[email protected]>
Bumps [sigs.k8s.io/controller-runtime](https://github.com/kubernetes-sigs/controller-runtime) from 0.19.4 to 0.20.0.
- [Release notes](https://github.com/kubernetes-sigs/controller-runtime/releases)
- [Changelog](https://github.com/kubernetes-sigs/controller-runtime/blob/main/RELEASE.md)
- [Commits](kubernetes-sigs/controller-runtime@v0.19.4...v0.20.0)

---
updated-dependencies:
- dependency-name: sigs.k8s.io/controller-runtime
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
…ctions/golangci/golangci-lint-action-6.2.0

build(deps): bump golangci/golangci-lint-action from 6.1.1 to 6.2.0
…es/sigs.k8s.io/controller-runtime-0.20.0

build(deps): bump sigs.k8s.io/controller-runtime from 0.19.4 to 0.20.0
…ion to v0.17.1 (#7287)

* dongjiang, update controller-runtime and controller-tools version

Signed-off-by: dongjiang <[email protected]>

* fix fake

Signed-off-by: dongjiang <[email protected]>

---------

Signed-off-by: dongjiang <[email protected]>
Signed-off-by: dongjiang <[email protected]>
…eout

Fix: golangci-lint config timeout option
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.