Refactor the common implementation code (not including tests) between Prometheus's modes #6686

haanhvu · 2024-06-17T08:52:33Z

Description

Refactor the common between Prometheus Agent's StatefulSet and DaemonSet to reduce code duplication and make reviewing #6652 easier. If seeing any pieces can be refactored further into the Server mode then do it too.

This PR just targets the implementation code duplication. The test duplication will be handled in another PR.

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.)

Verification

CI green

simonpasquier

Thanks for starting this!

pkg/prometheus/agent/common.go

haanhvu

@simonpasquier @ArthurSens @kakkoyun I refactored as far as I see possible. Please help review!

As stated in the description, this PR just covers the code duplication. I'll handle the test duplication following Arthur's review in #6652 (review) in the next PR.

haanhvu · 2024-06-18T07:20:02Z

pkg/prometheus/statefulset.go

+// The /-/ready handler returns OK only after the TSDB initialization has
+// completed. The WAL replay can take a significant time for large setups
+// hence we enable the startup probe with a generous failure threshold (15
+// minutes) to ensure that the readiness probe only comes into effect once
+// Prometheus is effectively ready.
+// We don't want to use the /-/healthy handler here because it returns OK as
+// soon as the web server is started (irrespective of the WAL replay).
+func MakeProbes(


As Simon said in #6652 (comment) we could have either same settings with statefulset or tighter timeouts for daemonset. Let's have a decision here, because it affects the refactoring?

This probably would affect how we'll refactor TestStartupProbeTimeoutSeconds too?

prometheus-operator/pkg/prometheus/agent/statefulset_test.go

Line 193 in cbf0f66

func TestStartupProbeTimeoutSeconds(t *testing.T) {

Until we're sure which direction to go (different probe settings or not), let's delay this part of the refactoring then.

I'm fine with delaying the refactoring here. I'm also fine if we pass timeouts as function arguments for now and change their value later

This piece is already a duplication in server and agent's statefulsets, so I think just keep this refactoring here for now? Later if we decide to change the timeouts for daemonset we can modify this refactoring to work with all three modes.

I refactored TestStartupProbeTimeoutSeconds in #6694 too. We still need this test for DaemonSet now, so I think we should refactor to reduce duplication anyway. We can modify the refactored function later if we decide to have different timeouts for DaemonSet.

simonpasquier

Thanks for doing this, I know how tedious it can be :)

pkg/prometheus/agent/statefulset.go

ArthurSens

Good progress! I've added a few comments but they are all non-blockers

pkg/prometheus/agent/common.go

pkg/prometheus/server/statefulset.go

pkg/prometheus/agent/common.go

pkg/prometheus/agent/statefulset.go

pkg/prometheus/statefulset.go

pkg/prometheus/agent/statefulset.go

pkg/prometheus/statefulset.go

pkg/operator/image.go

pkg/prometheus/agent/common.go

pkg/prometheus/agent/statefulset.go

pkg/operator/image.go

haanhvu · 2024-06-21T12:32:08Z

@simonpasquier auto-merge doesn't work here, no ideas why 🤔

ArthurSens · 2024-06-21T14:28:04Z

Is it because of the merge conflicts?

haanhvu · 2024-06-22T06:04:22Z

Is it because of the merge conflicts?

It didn't have any conflicts when Simon enabled auto-merge. The new conflicts are actually from your recently merged #6703 I'll resolve them.

… Prometheus's modes

* fix: ScrapeClass TLSConfig nil pointer exception (prometheus-operator#6507) Signed-off-by: Simon Pasquier <[email protected]> * Update .github/workflows/stale.yaml Co-authored-by: Jayapriya Pai <[email protected]> * build(deps): bump github.com/prometheus/common from 0.52.3 to 0.53.0 Bumps [github.com/prometheus/common](https://github.com/prometheus/common) from 0.52.3 to 0.53.0. - [Release notes](https://github.com/prometheus/common/releases) - [Commits](prometheus/common@v0.52.3...v0.53.0) --- updated-dependencies: - dependency-name: github.com/prometheus/common dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * build(deps): bump golang.org/x/net from 0.21.0 to 0.23.0 in /scripts Bumps [golang.org/x/net](https://github.com/golang/net) from 0.21.0 to 0.23.0. - [Commits](golang/net@v0.21.0...v0.23.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> * build(deps): bump golang.org/x/net from 0.22.0 to 0.23.0 in /pkg/client Bumps [golang.org/x/net](https://github.com/golang/net) from 0.22.0 to 0.23.0. - [Commits](golang/net@v0.22.0...v0.23.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> * chore:cut v0.73.2 Signed-off-by: Jayapriya Pai <[email protected]> Co-authored-by: Simon Pasquier <[email protected]> * chore: update RELEASE.md instructions (prometheus-operator#6539) * chore: update RELEASE.md instructions Signed-off-by: Jayapriya Pai <[email protected]> * Update RELEASE.md Co-authored-by: Arthur Silva Sens <[email protected]> --------- Signed-off-by: Jayapriya Pai <[email protected]> Co-authored-by: Arthur Silva Sens <[email protected]> * update golangci-lint version (prometheus-operator#6543) Signed-off-by: dongjiang1989 <[email protected]> * feat(xds): Add support nomad service discovery to the ScrapeConfig CRD (prometheus-operator#6485) * add support for nomad sd Signed-off-by: dongjiang1989 <[email protected]> * fix generate checks Signed-off-by: Jayapriya Pai <[email protected]> * build(deps): bump golangci/golangci-lint-action from 4.0.0 to 5.0.0 (prometheus-operator#6547) Bumps [golangci/golangci-lint-action](https://github.com/golangci/golangci-lint-action) from 4.0.0 to 5.0.0. - [Release notes](https://github.com/golangci/golangci-lint-action/releases) - [Commits](golangci/golangci-lint-action@v4.0.0...v5.0.0) --- updated-dependencies: - dependency-name: golangci/golangci-lint-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * build(deps): bump helm/kind-action from 1.9.0 to 1.10.0 Bumps [helm/kind-action](https://github.com/helm/kind-action) from 1.9.0 to 1.10.0. - [Release notes](https://github.com/helm/kind-action/releases) - [Commits](helm/kind-action@v1.9.0...v1.10.0) --- updated-dependencies: - dependency-name: helm/kind-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * chore: bump k8s libs to v0.30.0 Signed-off-by: Simon Pasquier <[email protected]> * chore: refactor the assets package This commit simplifies the API of the assets package. To limit the impact, it tackles only Basic Auth secrets for now. Previous API: ``` // storing the credentials from function A err = store.AddBasicAuth(ctx, namespace, httpConfig.BasicAuth, "some key") // retrieving the credentials from function B basicAuth := store.BasicAuthAssets["some key"] ``` New API: ``` // storing the credentials from function A err = store.AddBasicAuth(ctx, namespace, httpConfig.BasicAuth) // retrieving the credentials from function B s := store.ForNamespace(namespace) username, err := s.GetSecretKey(basicAuth.Username) password, err := s.GetSecretKey(basicAuth.Password) ``` The main simplification is that function B doesn't need to know how function A built the key value. It also makes testing more decoupled and reduces the risk of leaking data across namespaces. Signed-off-by: Simon Pasquier <[email protected]> * build(deps): bump sigs.k8s.io/controller-runtime from 0.17.3 to 0.18.0 Bumps [sigs.k8s.io/controller-runtime](https://github.com/kubernetes-sigs/controller-runtime) from 0.17.3 to 0.18.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.17.3...v0.18.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]> * Chore: Change *RelabelConfigs to values instead of Pointers (prometheus-operator#6479) Signed-off-by: Simon Pasquier <[email protected]> --------- Signed-off-by: Simon Pasquier <[email protected]> Co-authored-by: Simon Pasquier <[email protected]> * doc: fix sample port name used * build(deps): bump golangci/golangci-lint-action from 5.0.0 to 5.1.0 Bumps [golangci/golangci-lint-action](https://github.com/golangci/golangci-lint-action) from 5.0.0 to 5.1.0. - [Release notes](https://github.com/golangci/golangci-lint-action/releases) - [Commits](golangci/golangci-lint-action@v5.0.0...v5.1.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]> * build(deps): bump google.golang.org/protobuf from 1.33.0 to 1.34.0 Bumps google.golang.org/protobuf from 1.33.0 to 1.34.0. --- updated-dependencies: - dependency-name: google.golang.org/protobuf dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * chore: refactor OAuth2 in the assets package This is the follow-up of prometheus-operator#6537 for OAuth2 credentials. Signed-off-by: Simon Pasquier <[email protected]> * build(deps): bump sigs.k8s.io/controller-runtime from 0.18.0 to 0.18.1 Bumps [sigs.k8s.io/controller-runtime](https://github.com/kubernetes-sigs/controller-runtime) from 0.18.0 to 0.18.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.18.0...v0.18.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]> * build(deps): bump github.com/thanos-io/thanos from 0.34.1 to 0.35.0 Bumps [github.com/thanos-io/thanos](https://github.com/thanos-io/thanos) from 0.34.1 to 0.35.0. - [Release notes](https://github.com/thanos-io/thanos/releases) - [Changelog](https://github.com/thanos-io/thanos/blob/main/CHANGELOG.md) - [Commits](thanos-io/thanos@v0.34.1...v0.35.0) --- updated-dependencies: - dependency-name: github.com/thanos-io/thanos dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * feat: add Go runtime scheduler metrics Signed-off-by: Simon Pasquier <[email protected]> * chore: add link to public calendar (prometheus-operator#6564) Signed-off-by: Simon Pasquier <[email protected]> * Add testing steps for podman with kind (prometheus-operator#6509) * chore: Add testing instructions for using Podman with Kind * chore: fixing typos * Update formatting according to the failing checks. * Removed whitespace to match the standard. * Updating according to the suggestions from review. * update prometheus version Signed-off-by: dongjiang1989 <[email protected]> * build(deps): bump golangci/golangci-lint-action from 5.1.0 to 5.3.0 Bumps [golangci/golangci-lint-action](https://github.com/golangci/golangci-lint-action) from 5.1.0 to 5.3.0. - [Release notes](https://github.com/golangci/golangci-lint-action/releases) - [Commits](golangci/golangci-lint-action@v5.1.0...v5.3.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]> * chore: make TLSConfig fields optional This commit changes the `serverName` and `insecureSkipVerify` fields of TLS configuration to pointers instead of values. Signed-off-by: Simon Pasquier <[email protected]> * build(deps): bump sigs.k8s.io/controller-runtime from 0.18.1 to 0.18.2 Bumps [sigs.k8s.io/controller-runtime](https://github.com/kubernetes-sigs/controller-runtime) from 0.18.1 to 0.18.2. - [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.18.1...v0.18.2) --- 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]> * build(deps): bump golang.org/x/net from 0.24.0 to 0.25.0 Bumps [golang.org/x/net](https://github.com/golang/net) from 0.24.0 to 0.25.0. - [Commits](golang/net@v0.24.0...v0.25.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * fix: apply TLS scrape class to all objects Before this change, the TLS configuration from the scrape class wasn't applied to the generated configuration for PodMonitor, ScrapeConfig and Probe objects. Closes prometheus-operator#6556 Signed-off-by: Simon Pasquier <[email protected]> * build(deps): bump google.golang.org/protobuf from 1.34.0 to 1.34.1 Bumps google.golang.org/protobuf from 1.34.0 to 1.34.1. --- 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]> * update thanos version Signed-off-by: dongjiang1989 <[email protected]> * fix mistake by make generate Signed-off-by: dongjiang1989 <[email protected]> * build(deps): bump golangci/golangci-lint-action from 5.3.0 to 6.0.1 Bumps [golangci/golangci-lint-action](https://github.com/golangci/golangci-lint-action) from 5.3.0 to 6.0.1. - [Release notes](https://github.com/golangci/golangci-lint-action/releases) - [Commits](golangci/golangci-lint-action@v5.3.0...v6.0.1) --- updated-dependencies: - dependency-name: golangci/golangci-lint-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]> * build(deps): bump github.com/prometheus/prometheus from 0.51.2 to 0.52.0 Bumps [github.com/prometheus/prometheus](https://github.com/prometheus/prometheus) from 0.51.2 to 0.52.0. - [Release notes](https://github.com/prometheus/prometheus/releases) - [Changelog](https://github.com/prometheus/prometheus/blob/main/CHANGELOG.md) - [Commits](prometheus/prometheus@v0.51.2...v0.52.0) --- updated-dependencies: - dependency-name: github.com/prometheus/prometheus dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * build(deps): bump github.com/prometheus/client_golang Bumps [github.com/prometheus/client_golang](https://github.com/prometheus/client_golang) from 1.19.0 to 1.19.1. - [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.19.0...v1.19.1) --- updated-dependencies: - dependency-name: github.com/prometheus/client_golang dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> * fix: deref nil pointer on WebexConfig Signed-off-by: Yoan Blanc <[email protected]> * feat: add `go_sync_mutex_wait_total_seconds_total` metric Signed-off-by: Simon Pasquier <[email protected]> * chore: update golangci-lint configuration Signed-off-by: Simon Pasquier <[email protected]> * chore: update kind version to v0.23.0 Signed-off-by: Simon Pasquier <[email protected]> * chore: update Prometheus to v2.52.0 Signed-off-by: Simon Pasquier <[email protected]> * feat(ProxyConfig): Update CRD for ProxyConnectHeader type (prometheus-operator#6541) * update CRD for ProxyConnectHeader --------- Signed-off-by: dongjiang1989 <[email protected]> * Feat: Add `relabel_configs` field to AlertmanagerEndpoints (prometheus-operator#6467) * Add RelabelConfigs to AlertmanagerEndpoints * chore: Update vulnerable dependency golang.org/x/net Signed-off-by: Arthur Silva Sens <[email protected]> * chore: bump k8s libraries Signed-off-by: Simon Pasquier <[email protected]> * feat(env): auto set GOMAXPROCS by go.uber.org/automaxprocs (prometheus-operator#6576) --------- Signed-off-by: dongjiang1989 <[email protected]> * feat: support SDK auth in AzureSD Related-to prometheus-operator#6584 Signed-off-by: Jayapriya Pai <[email protected]> * feat: support SDK auth in AzureAD RemoteWrite Related-to prometheus-operator#6584 Signed-off-by: Jayapriya Pai <[email protected]> * Update promcfg.go Co-authored-by: Simon Pasquier <[email protected]> * Add structure for feature flags Signed-off-by: Arthur Silva Sens <[email protected]> * [WIP] Feat: Add `alert_relabel_configs` to the Prometheus and PrometheusAgent CRD's (prometheus-operator#6450) * AlertmanagerEndpoints: add alertRelabelingConfigs field to AlertmanagerEndpoints * alertmanagerEndpoints: wrap errors and fix naming for tests * fix: attempt to manually revert mistakenly commited code * chore: cut v0.74.0 Signed-off-by: Simon Pasquier <[email protected]> * Corrected Documentation for xxxMonitorNamespaceSelector (prometheus-operator#6605) Chore: Clarify that null is the default value for Service/PodMonitor selectors * Reload alert manager when notification templates change (prometheus-operator#6607) * Reload alert manager when notification templates change * feat: add automatic GOMAXPROCS to admission webhook Signed-off-by: Simon Pasquier <[email protected]> * crd: add support for source pagerduty_config option in AlertMananger CRD (prometheus-operator#6427) * crd: add support for source pagerduty_config option in AlertMananger CRD The AlertManager CRD was expected to have 1:1 fields mapped from https://prometheus.io/docs/alerting/latest/configuration/#pagerduty_config . Currently source was missing so it is added. --------- Co-authored-by: Jayapriya Pai <[email protected]> * AlertmanagerEndpoints: Move AlertmanagerEndpoints validation to pkg/prometheus/server * chore: remove WebTLSConfigError Signed-off-by: Simon Pasquier <[email protected]> * chore: rework webconfig package Signed-off-by: Simon Pasquier <[email protected]> * Add extra metric relabelings to scrape classes Signed-off-by: Mathieu Parent <[email protected]> * bugfix: Fix bug created from race conditions during merge Signed-off-by: Arthur Silva Sens <[email protected]> * [CHORE] considering global limits over enforced Signed-off-by: Nicolas Takashi <[email protected]> * build(deps): bump sigs.k8s.io/controller-runtime from 0.18.2 to 0.18.3 Bumps [sigs.k8s.io/controller-runtime](https://github.com/kubernetes-sigs/controller-runtime) from 0.18.2 to 0.18.3. - [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.18.2...v0.18.3) --- 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]> * e2e/framework: Allow setting feature-gates when creating Prometheus-Operator Signed-off-by: Arthur Silva Sens <[email protected]> * chore: add slashpai as release shepherd for v0.75 Signed-off-by: Jayapriya Pai <[email protected]> * Make a cluster of 2 worker nodes for e2e * [BUGFIX] Fix PrometheusAgent reconciliation for the statefulset changes (prometheus-operator#6615) * [BUGFIX] Fix PrometheusAgent reconciliation for the statefulset changes Signed-off-by: junotx <[email protected]> --------- Signed-off-by: junotx <[email protected]> * chore: add test for AlertmanagerConfig with subroutes Signed-off-by: Simon Pasquier <[email protected]> * Use functional options pattern for Prometheus Controller Signed-off-by: Arthur Silva Sens <[email protected]> * ScrapeConfig: Add `JobName` field to the CRD Co-authored-by: M Viswanath Sai <[email protected]> * chore: fix testScrapeConfigKubernetesNodeRole() Signed-off-by: Simon Pasquier <[email protected]> * chore: bump k8s dependencies for api regenerate assets Fixes prometheus-operator#6617 Signed-off-by: Jayapriya Pai <[email protected]> * [CHORE] allowing kubeconfig as parameter (prometheus-operator#6623) Signed-off-by: Nicolas Takashi <[email protected]> * Add feature gate for Prometheus Agent's DaemonSet deployment (prometheus-operator#6626) * Add feature gate for Prometheus Agent's DaemonSet deployment * Update pkg/prometheus/promcfg.go Co-authored-by: Simon Pasquier <[email protected]> * feat(env): Add automatic memory limit handling (prometheus-operator#6591) * add auto GOMEMLIMIT Signed-off-by: dongjiang1989 <[email protected]> --------- Signed-off-by: dongjiang1989 <[email protected]> Co-authored-by: Simon Pasquier <[email protected]> * build(deps): bump github.com/KimMachineGun/automemlimit Bumps [github.com/KimMachineGun/automemlimit](https://github.com/KimMachineGun/automemlimit) from 0.6.0 to 0.6.1. - [Release notes](https://github.com/KimMachineGun/automemlimit/releases) - [Commits](KimMachineGun/automemlimit@v0.6.0...v0.6.1) --- updated-dependencies: - dependency-name: github.com/KimMachineGun/automemlimit dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> * fix: use a separate port number for init container The Kubernetes API starting from v1.30 will return a warning when a pod template contains 2 containers exposing the same port number, even across init and regular containers. [1] kubernetes/kubernetes#113245 Signed-off-by: Simon Pasquier <[email protected]> * Update pkg/prometheus/promcfg.go Co-authored-by: Simon Pasquier <[email protected]> * build(deps): bump github.com/prometheus/prometheus from 0.52.0 to 0.52.1 Bumps [github.com/prometheus/prometheus](https://github.com/prometheus/prometheus) from 0.52.0 to 0.52.1. - [Release notes](https://github.com/prometheus/prometheus/releases) - [Changelog](https://github.com/prometheus/prometheus/blob/main/CHANGELOG.md) - [Commits](prometheus/prometheus@v0.52.0...v0.52.1) --- updated-dependencies: - dependency-name: github.com/prometheus/prometheus dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> * build(deps): bump github.com/thanos-io/thanos from 0.35.0 to 0.35.1 Bumps [github.com/thanos-io/thanos](https://github.com/thanos-io/thanos) from 0.35.0 to 0.35.1. - [Release notes](https://github.com/thanos-io/thanos/releases) - [Changelog](https://github.com/thanos-io/thanos/blob/v0.35.1/CHANGELOG.md) - [Commits](thanos-io/thanos@v0.35.0...v0.35.1) --- updated-dependencies: - dependency-name: github.com/thanos-io/thanos dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> * Update pkg/prometheus/promcfg.go Co-authored-by: Simon Pasquier <[email protected]> * Update pkg/prometheus/promcfg.go Co-authored-by: Simon Pasquier <[email protected]> * Update pkg/prometheus/promcfg.go Co-authored-by: Simon Pasquier <[email protected]> * Update pkg/prometheus/promcfg.go Co-authored-by: Simon Pasquier <[email protected]> * Update pkg/prometheus/promcfg.go Co-authored-by: Simon Pasquier <[email protected]> * Update pkg/prometheus/promcfg.go Co-authored-by: Simon Pasquier <[email protected]> * chore: refactor tokens management in the assets package This is a follow-up of prometheus-operator#6537 and prometheus-operator#6557. Signed-off-by: Simon Pasquier <[email protected]> * chore: add test-e2e-image target to Makefile This change also simplifies the end-to-end testing instructions. Signed-off-by: Simon Pasquier <[email protected]> * Add `mode` field in PrometheusAgent CRD (prometheus-operator#6640) * Add mode field in PrometheusAgent CRD * build(deps): bump github.com/prometheus/common from 0.53.0 to 0.54.0 Bumps [github.com/prometheus/common](https://github.com/prometheus/common) from 0.53.0 to 0.54.0. - [Release notes](https://github.com/prometheus/common/releases) - [Changelog](https://github.com/prometheus/common/blob/main/RELEASE.md) - [Commits](prometheus/common@v0.53.0...v0.54.0) --- updated-dependencies: - dependency-name: github.com/prometheus/common dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * chore: refactor sigv4 management in the assets package This is a follow-up of prometheus-operator#6537 and prometheus-operator#6557 and prometheus-operator#6641. Signed-off-by: Simon Pasquier <[email protected]> * Update pkg/prometheus/promcfg.go Co-authored-by: Simon Pasquier <[email protected]> * chore: refactor AzureAD management in the assets package This is a follow-up of prometheus-operator#6537 and prometheus-operator#6557, prometheus-operator#6641 and prometheus-operator#6644. Signed-off-by: Simon Pasquier <[email protected]> * build(deps): bump github.com/prometheus-community/prom-label-proxy Bumps [github.com/prometheus-community/prom-label-proxy](https://github.com/prometheus-community/prom-label-proxy) from 0.8.1 to 0.9.0. - [Release notes](https://github.com/prometheus-community/prom-label-proxy/releases) - [Changelog](https://github.com/prometheus-community/prom-label-proxy/blob/main/CHANGELOG.md) - [Commits](prometheus-community/prom-label-proxy@v0.8.1...v0.9.0) --- updated-dependencies: - dependency-name: github.com/prometheus-community/prom-label-proxy dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * build(deps): bump golang.org/x/net from 0.25.0 to 0.26.0 Bumps [golang.org/x/net](https://github.com/golang/net) from 0.25.0 to 0.26.0. - [Commits](golang/net@v0.25.0...v0.26.0) --- updated-dependencies: - dependency-name: golang.org/x/net dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * ScrapeConfig CRD: Add DockerswarmSDConfigs to the ScrapeConfig CRD * ScrapeConfig: Add LinodeSDConfigs To The ScrapeConfig CRD * ScrapeConfig CRD: Add PuppetDB Service Discovery Configurations * build(deps): bump sigs.k8s.io/controller-runtime from 0.18.3 to 0.18.4 Bumps [sigs.k8s.io/controller-runtime](https://github.com/kubernetes-sigs/controller-runtime) from 0.18.3 to 0.18.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.18.3...v0.18.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]> * Add NODE_NAME env in config reloader (prometheus-operator#6636) * Add NODE_NAME env in config reloader * feat: add `prometheus_operator_feature_gate_info` metric This change also moves the feature gates to the operator config struct. It means that after a feature gate is enabled/disabled, the operator will reconcile the managed Prometheus resources which should be the right thing to do. Signed-off-by: Simon Pasquier <[email protected]> * chore: bump code-generator to v0.30.1 The gen tools arguments have changed a bit, the Makefile commands have been adjusted accordingly. Signed-off-by: Simon Pasquier <[email protected]> * Changed the description for ```overrideHonorLabels``` field (prometheus-operator#6653) * Changed the decription for overrideHonorLabels * Update pkg/prometheus/promcfg.go Co-authored-by: Simon Pasquier <[email protected]> * build(deps): bump google.golang.org/protobuf from 1.34.1 to 1.34.2 Bumps google.golang.org/protobuf from 1.34.1 to 1.34.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]> * build(deps): bump github.com/Azure/azure-sdk-for-go/sdk/azidentity Bumps [github.com/Azure/azure-sdk-for-go/sdk/azidentity](https://github.com/Azure/azure-sdk-for-go) from 1.5.2 to 1.6.0. - [Release notes](https://github.com/Azure/azure-sdk-for-go/releases) - [Changelog](https://github.com/Azure/azure-sdk-for-go/blob/main/documentation/release.md) - [Commits](Azure/azure-sdk-for-go@sdk/internal/v1.5.2...sdk/azcore/v1.6.0) --- updated-dependencies: - dependency-name: github.com/Azure/azure-sdk-for-go/sdk/azidentity dependency-type: indirect ... Signed-off-by: dependabot[bot] <[email protected]> * build(deps): bump imjasonh/setup-crane from 0.3 to 0.4 Bumps [imjasonh/setup-crane](https://github.com/imjasonh/setup-crane) from 0.3 to 0.4. - [Release notes](https://github.com/imjasonh/setup-crane/releases) - [Commits](imjasonh/setup-crane@v0.3...v0.4) --- updated-dependencies: - dependency-name: imjasonh/setup-crane dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * [Enhancement] Replacing t.Fatal with testify/require package (prometheus-operator#6659) chore: pkg/operator: Replace t.Fatal with require.testify * chore: Add feature-gated tests to CI Signed-off-by: Arthur Silva Sens <[email protected]> * ScrapeConfig CRD: Add LightSail Service Discovery Config Options * chore: bump to k8s.io libs v0.30.2 Signed-off-by: Simon Pasquier <[email protected]> * build(deps): bump github.com/prometheus-community/prom-label-proxy Bumps [github.com/prometheus-community/prom-label-proxy](https://github.com/prometheus-community/prom-label-proxy) from 0.9.0 to 0.10.0. - [Release notes](https://github.com/prometheus-community/prom-label-proxy/releases) - [Changelog](https://github.com/prometheus-community/prom-label-proxy/blob/main/CHANGELOG.md) - [Commits](prometheus-community/prom-label-proxy@v0.9.0...v0.10.0) --- updated-dependencies: - dependency-name: github.com/prometheus-community/prom-label-proxy dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * Alertmanager pkg,t.Fatal->require pkg * chore: fix build after prom-label-proxy bump Signed-off-by: Simon Pasquier <[email protected]> * Replacing t.fatal with require Package (prometheus-operator#6680) chore: Replace t.Fatal with require package * feat(remote): add support prometheus remote write/read ProxyConfig (prometheus-operator#6512) * update prometheus remote write/read proxy config Signed-off-by: dongjiang1989 <[email protected]> --------- Signed-off-by: dongjiang1989 <[email protected]> * WIP: Refactor common test code between Prometheus Agent's StatefulSet and DaemonSet modes (prometheus-operator#6688) * Refactor test code between Prometheus Agent's StatefulSet and DaemonSet modes * update default thanos version Signed-off-by: dongjiang1989 <[email protected]> * build(deps): bump github.com/prometheus/prometheus from 0.52.1 to 0.53.0 Bumps [github.com/prometheus/prometheus](https://github.com/prometheus/prometheus) from 0.52.1 to 0.53.0. - [Release notes](https://github.com/prometheus/prometheus/releases) - [Changelog](https://github.com/prometheus/prometheus/blob/main/CHANGELOG.md) - [Commits](prometheus/prometheus@v0.52.1...v0.53.0) --- updated-dependencies: - dependency-name: github.com/prometheus/prometheus dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <[email protected]> * update prometheus version Signed-off-by: dongjiang1989 <[email protected]> * config-reloader: create correct probes when `listenLocal` is set to `true` When the prometheus operator is started with `--enable-config-reloader-probes` it will now create `exec` probes that run curl/wget in the config-reloader container against localhost to check the /healthz endpoint if `listenLocal` is set to `true`. Otherwise, it creates `httpGet` probes as before. Fixes prometheus-operator#6682 * Nit: Check if EnableFeatures already contains agent mode's features (prometheus-operator#6701) * Check if EnableFeatures already contains ageent mode's features * [CHORE] Nicolas as release volunteer Signed-off-by: Nicolas Takashi <[email protected]> * Add `ttl` obj to alertmanagercfgs resource (prometheus-operator#6515) * add ttl obj into alertmanagerConfig rsc --------- Co-authored-by: Nicolas Takashi <[email protected]> Co-authored-by: Simon Pasquier <[email protected]> * chore: factorize prober code This is a quick follow-up of prometheus-operator#6698. Signed-off-by: Simon Pasquier <[email protected]> * chore: Replace StringPtrValOrDefault with ptr.Deref Signed-off-by: Arthur Silva Sens <[email protected]> * Proposal for DaemonSet deployment of Prometheus Agent (prometheus-operator#6600) chore: Add Proposal for Daemonset deployment of Prometheus Agent * chore: refactor TLS management in the assets package This is a follow-up of prometheus-operator#6537, prometheus-operator#6557, prometheus-operator#6641, prometheus-operator#6644 and prometheus-operator#6645. Signed-off-by: Simon Pasquier <[email protected]> * Refactor the common implementation code (not including tests) between Prometheus's modes (prometheus-operator#6686) * Refactor the common implementation code (not including tests) between Prometheus's modes * Continue prometheus-operator#6688: Refactor common test code between Prometheus modes (prometheus-operator#6694) * chore: optimize get secret key from store (prometheus-operator#6700) * optimize code Signed-off-by: dongjiang1989 <[email protected]> --------- Signed-off-by: dongjiang1989 <[email protected]> * build(deps): bump github.com/go-test/deep from 1.1.0 to 1.1.1 Bumps [github.com/go-test/deep](https://github.com/go-test/deep) from 1.1.0 to 1.1.1. - [Release notes](https://github.com/go-test/deep/releases) - [Changelog](https://github.com/go-test/deep/blob/master/CHANGES.md) - [Commits](go-test/deep@v1.1.0...v1.1.1) --- updated-dependencies: - dependency-name: github.com/go-test/deep dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> * chore: bump go dependencies before release Signed-off-by: Jayapriya Pai <[email protected]> * feat(xds): Add OVHcloud service discovery to the ScrapeConfig CRD (prometheus-operator#6689) * add service discovery for ovhcloud Signed-off-by: dongjiang1989 <[email protected]> --------- Signed-off-by: dongjiang1989 <[email protected]> * chore: cut 0.75.0 Signed-off-by: Jayapriya Pai <[email protected]> * cherry-pick 6722 Signed-off-by: dongjiang1989 <[email protected]> * chore: cut 0.75.1 Signed-off-by: Jayapriya Pai <[email protected]> * fix: avoid invalid alerting config with TLS Signed-off-by: Simon Pasquier <[email protected]> * chore: cut 0.75.2 Signed-off-by: Jayapriya Pai <[email protected]> * conflict fix Signed-off-by: Coleen Iona Quadros <[email protected]> * conflict Signed-off-by: Coleen Iona Quadros <[email protected]> * conflict files Signed-off-by: Coleen Iona Quadros <[email protected]> * conflict files Signed-off-by: Coleen Iona Quadros <[email protected]> * conflict files Signed-off-by: Coleen Iona Quadros <[email protected]> --------- Signed-off-by: Simon Pasquier <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Signed-off-by: Jayapriya Pai <[email protected]> Signed-off-by: dongjiang1989 <[email protected]> Signed-off-by: Yoan Blanc <[email protected]> Signed-off-by: Arthur Silva Sens <[email protected]> Signed-off-by: Arthur Silva Sens <[email protected]> Signed-off-by: Mathieu Parent <[email protected]> Signed-off-by: Nicolas Takashi <[email protected]> Signed-off-by: junotx <[email protected]> Signed-off-by: Coleen Iona Quadros <[email protected]> Co-authored-by: Kemal Akkoyun <[email protected]> Co-authored-by: Simon Pasquier <[email protected]> Co-authored-by: Jayapriya Pai <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Arthur Silva Sens <[email protected]> Co-authored-by: dongjiang <[email protected]> Co-authored-by: M Viswanath Sai <[email protected]> Co-authored-by: Horaci Macias <[email protected]> Co-authored-by: Kapil Ramwani <[email protected]> Co-authored-by: Nicolas Takashi <[email protected]> Co-authored-by: Yoan Blanc <[email protected]> Co-authored-by: Arthur Silva Sens <[email protected]> Co-authored-by: Ashwin Sriram <[email protected]> Co-authored-by: Muhammad Hamza Zaib <[email protected]> Co-authored-by: mviswanathsai <[email protected]> Co-authored-by: Mathieu Parent <[email protected]> Co-authored-by: haanhvu <[email protected]> Co-authored-by: junot <[email protected]> Co-authored-by: janluak <_> Co-authored-by: Ha Anh Vu <[email protected]> Co-authored-by: Ashwin <[email protected]> Co-authored-by: Simon Dickhoven <[email protected]> Co-authored-by: Afzal Ansari <[email protected]> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: Coleen Iona Quadros <[email protected]>

haanhvu requested a review from a team as a code owner June 17, 2024 08:52

pull-request-size bot added the size/M label Jun 17, 2024

simonpasquier reviewed Jun 17, 2024

View reviewed changes

pkg/prometheus/agent/common.go Outdated Show resolved Hide resolved

pkg/prometheus/agent/common.go Outdated Show resolved Hide resolved

pull-request-size bot added size/L and removed size/M labels Jun 17, 2024

haanhvu added this to the [GSoC 2024] Daemonset mode for PrometheusAgent milestone Jun 17, 2024

haanhvu changed the title ~~WIP: Refactor the common between Prometheus Agent's StatefulSet and DaemonSet~~ WIP: Refactor the common code (not including tests) between Prometheus Agent's StatefulSet and DaemonSet Jun 17, 2024

haanhvu changed the title ~~WIP: Refactor the common code (not including tests) between Prometheus Agent's StatefulSet and DaemonSet~~ WIP: Refactor the common implementation code (not including tests) between Prometheus Agent's StatefulSet and DaemonSet Jun 17, 2024

haanhvu force-pushed the refactor-modes branch from 6b62d20 to 05bf7b2 Compare June 18, 2024 05:37

haanhvu commented Jun 18, 2024

View reviewed changes

haanhvu changed the title ~~WIP: Refactor the common implementation code (not including tests) between Prometheus Agent's StatefulSet and DaemonSet~~ Refactor the common implementation code (not including tests) between Prometheus Agent's StatefulSet and DaemonSet Jun 18, 2024

haanhvu mentioned this pull request Jun 18, 2024

Refactor common test code between Prometheus Agent's StatefulSet and DaemonSet modes #6688

Merged

5 tasks

simonpasquier reviewed Jun 18, 2024

View reviewed changes

pkg/prometheus/agent/statefulset.go Outdated Show resolved Hide resolved

pkg/prometheus/agent/statefulset.go Outdated Show resolved Hide resolved

pkg/prometheus/agent/statefulset.go Show resolved Hide resolved

ArthurSens reviewed Jun 18, 2024

View reviewed changes

pkg/prometheus/agent/common.go Outdated Show resolved Hide resolved

pkg/prometheus/agent/common.go Show resolved Hide resolved

pkg/prometheus/server/statefulset.go Outdated Show resolved Hide resolved

haanhvu force-pushed the refactor-modes branch from 060e962 to 3bd7ced Compare June 19, 2024 04:36

haanhvu mentioned this pull request Jun 19, 2024

Continue #6688: Refactor common test code between Prometheus modes #6694

Merged

5 tasks

simonpasquier reviewed Jun 19, 2024

View reviewed changes

haanhvu force-pushed the refactor-modes branch from 3bd7ced to aea67c2 Compare June 20, 2024 07:06

haanhvu mentioned this pull request Jun 20, 2024

Nit: Check if EnableFeatures already contains agent mode's features #6701

Merged

5 tasks

simonpasquier reviewed Jun 20, 2024

View reviewed changes

pkg/operator/image.go Show resolved Hide resolved

pkg/prometheus/agent/common.go Outdated Show resolved Hide resolved

pkg/prometheus/agent/statefulset.go Outdated Show resolved Hide resolved

haanhvu force-pushed the refactor-modes branch 2 times, most recently from 940eeb2 to b277763 Compare June 21, 2024 07:42

simonpasquier previously approved these changes Jun 21, 2024

View reviewed changes

pkg/operator/image.go Outdated Show resolved Hide resolved

simonpasquier dismissed their stale review via 8e007df June 21, 2024 09:39

simonpasquier previously approved these changes Jun 21, 2024

View reviewed changes

simonpasquier enabled auto-merge (squash) June 21, 2024 09:40

ArthurSens previously approved these changes Jun 21, 2024

View reviewed changes

ArthurSens disabled auto-merge June 21, 2024 14:29

haanhvu changed the title ~~Refactor the common implementation code (not including tests) between Prometheus Agent's StatefulSet and DaemonSet~~ Refactor the common implementation code (not including tests) between Prometheus's modes Jun 22, 2024

haanhvu dismissed stale reviews from ArthurSens and simonpasquier via c16838d June 22, 2024 06:40

haanhvu force-pushed the refactor-modes branch from 8e007df to c16838d Compare June 22, 2024 06:40

haanhvu added 2 commits June 22, 2024 13:45

Refactor the common implementation code (not including tests) between…

8aa11cf

… Prometheus's modes

Simon's commit

984f3ba

haanhvu force-pushed the refactor-modes branch from 3161d5f to 984f3ba Compare June 22, 2024 06:46

simonpasquier approved these changes Jun 24, 2024

View reviewed changes

simonpasquier merged commit 24ea585 into prometheus-operator:main Jun 24, 2024

Refactor the common implementation code (not including tests) between Prometheus's modes #6686

Refactor the common implementation code (not including tests) between Prometheus's modes #6686

Uh oh!

Conversation

haanhvu commented Jun 17, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Type of change

Verification

Uh oh!

simonpasquier left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

haanhvu left a comment • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

haanhvu Jun 18, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

haanhvu Jun 18, 2024

Choose a reason for hiding this comment

Uh oh!

simonpasquier Jun 18, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ArthurSens Jun 18, 2024

Choose a reason for hiding this comment

Uh oh!

haanhvu Jun 19, 2024

Choose a reason for hiding this comment

Uh oh!

haanhvu Jun 19, 2024

Choose a reason for hiding this comment

Uh oh!

simonpasquier left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

ArthurSens left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

haanhvu commented Jun 21, 2024

Uh oh!

ArthurSens commented Jun 21, 2024

Uh oh!

haanhvu commented Jun 22, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

haanhvu commented Jun 17, 2024 •

edited

Loading

haanhvu left a comment •

edited

Loading

haanhvu Jun 18, 2024 •

edited

Loading

simonpasquier Jun 18, 2024 •

edited

Loading

haanhvu commented Jun 22, 2024 •

edited

Loading