Skip to content

Merge upstream changes#20

Open
micheltuu wants to merge 60 commits intodatabricks:db_mainfrom
micheltuu:micheltuu/upstream.merge.july.2025
Open

Merge upstream changes#20
micheltuu wants to merge 60 commits intodatabricks:db_mainfrom
micheltuu:micheltuu/upstream.merge.july.2025

Conversation

@micheltuu
Copy link

No description provided.

charleskorn and others added 30 commits November 29, 2024 03:15
…eleted (grafana#182)

* Update test app StatefulSet to match expected configuration of StatefulSets used with rollout-operator

* Log information about StatefulSets as they are created, updated and deleted

* Add changelog entry
* Set timeout for k8s HTTP client

We had a request to an ingesters take 20m and block the reconiliation loop. We want to avoid that, so adding a timeout. We use this client for both k8s and StatefulSet requests.

__I assume the operations that the StatefulSet requests will always be fast and will never have to actually do a lot of work (like uploading blocks). Can the reviewers confirm this assumption?__

* Add CHANGELOG.md entry PR number
I'm debugging a reconcilliatin which took 20m. I suspect one ingester was blocking the whole reconcile loop.
* Make Kubernetes client timeout configurable

Make the timeout added in grafana#186 configurable and default to 5 minutes.

Signed-off-by: Nick Pillitteri <nick.pillitteri@grafana.com>

* Changelog

Signed-off-by: Nick Pillitteri <nick.pillitteri@grafana.com>

---------

Signed-off-by: Nick Pillitteri <nick.pillitteri@grafana.com>
* Update dependencies

* Add changelog entry

* Bump golang.org/x/crypto for CVE
* Update Go to 1.24

* Format strings earlier due to added check

* Update comment to reflect change
* Update dependencies

* Add CHANGELOG entry

* Reorder dependencies listed
…rafana#205)

Co-authored-by: grafanarenovatebot[bot] <146220760+grafanarenovatebot[bot]@users.noreply.github.com>
Co-authored-by: grafanarenovatebot[bot] <146220760+grafanarenovatebot[bot]@users.noreply.github.com>
…fana#207)

Co-authored-by: grafanarenovatebot[bot] <146220760+grafanarenovatebot[bot]@users.noreply.github.com>
Co-authored-by: Andy Asp <90626759+andyasp@users.noreply.github.com>
* Update golangci-lint to v2

* Lint fixes

* Clean up migrated configuration

* Revive comment
Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
Add cross-cluster traffic protection functionality.

---------

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
Co-authored-by: Dimitar Dimitrov <dimitar.dimitrov@grafana.com>
…fana#210)

Co-authored-by: grafanarenovatebot[bot] <146220760+grafanarenovatebot[bot]@users.noreply.github.com>
…fana#211)

Co-authored-by: grafanarenovatebot[bot] <146220760+grafanarenovatebot[bot]@users.noreply.github.com>
* Add creating a GitHub release to RELEASE.md

* Move command to Makefile

* Use image prefix

* Move further down in Makefile

* Add release creation link for convenience
…fana#214)

Co-authored-by: grafanarenovatebot[bot] <146220760+grafanarenovatebot[bot]@users.noreply.github.com>
* Update renovate configuration for go dependencies

* Remove last comma
…al (grafana#217)

* Rename rollout_operator_request_invalid_cluster_validation_labels_total

Rename rollout_operator_request_invalid_cluster_validation_labels_total to
rollout_operator_client_invalid_cluster_validation_label_requests_total.

* Update changelog

---------

Signed-off-by: Arve Knudsen <arve.knudsen@gmail.com>
andyasp and others added 30 commits April 30, 2025 11:58
* Address zizmor scan results

* Dummy change to get actions to rerun

* Revert "Dummy change to get actions to rerun"

This reverts commit 738ffc5.
…grafana#219)

Co-authored-by: grafanarenovatebot[bot] <146220760+grafanarenovatebot[bot]@users.noreply.github.com>
…rafana#220)

Co-authored-by: grafanarenovatebot[bot] <146220760+grafanarenovatebot[bot]@users.noreply.github.com>
)

* Use serviceName to construct endpoint for prepare-downscale

* Rename for clarity
Co-authored-by: grafanarenovatebot[bot] <146220760+grafanarenovatebot[bot]@users.noreply.github.com>
* fix(deps): update go dependencies

* Fix build error due to dskit change

* Fix lint

* Update CHANGELOG

* Rename cluster validation metric variables

---------

Co-authored-by: grafanarenovatebot[bot] <146220760+grafanarenovatebot[bot]@users.noreply.github.com>
Co-authored-by: Andy Asp <andy.asp@grafana.com>
* fix(deps): update go dependencies

* Update CHANGELOG

---------

Co-authored-by: grafanarenovatebot[bot] <146220760+grafanarenovatebot[bot]@users.noreply.github.com>
Co-authored-by: Andy Asp <andy.asp@grafana.com>
…na#225)

* chore(deps): update golangci/golangci-lint-action action to v8

* Update to compatible golangci-lint version

---------

Co-authored-by: grafanarenovatebot[bot] <146220760+grafanarenovatebot[bot]@users.noreply.github.com>
Co-authored-by: Andy Asp <andy.asp@grafana.com>
* fix(deps): update go dependencies

* Update CHANGELOG

---------

Co-authored-by: grafanarenovatebot[bot] <146220760+grafanarenovatebot[bot]@users.noreply.github.com>
Co-authored-by: Andy Asp <andy.asp@grafana.com>
)

Co-authored-by: grafanarenovatebot[bot] <146220760+grafanarenovatebot[bot]@users.noreply.github.com>
…#229)

Co-authored-by: grafanarenovatebot[bot] <146220760+grafanarenovatebot[bot]@users.noreply.github.com>
…ana#230)

Co-authored-by: grafanarenovatebot[bot] <146220760+grafanarenovatebot[bot]@users.noreply.github.com>
* fix(deps): update go dependencies

* Update CHANGELOG

---------

Co-authored-by: grafanarenovatebot[bot] <146220760+grafanarenovatebot[bot]@users.noreply.github.com>
Co-authored-by: Andy Asp <andy.asp@grafana.com>
…#232)

Co-authored-by: grafanarenovatebot[bot] <146220760+grafanarenovatebot[bot]@users.noreply.github.com>
…ana#233)

* chore(deps): update renovatebot/github-action action to v42.0.5

* Update .github/workflows/renovate.yml

---------

Co-authored-by: grafanarenovatebot[bot] <146220760+grafanarenovatebot[bot]@users.noreply.github.com>
Co-authored-by: Andy Asp <90626759+andyasp@users.noreply.github.com>
…v config (grafana#234)

* Migrate tracing to OpenTelemetry and add support for standard OTel env config

This migrates this app to use OpenTelemetry tracing library instead of OpenTracing, which has been deprecated for a while.

The app will now support standard 'OTEL_' environment variables as per OTel SDK docs, and the exposition in OTLP protocol.

Signed-off-by: Oleg Zaytsev <mail@olegzaytsev.com>

* Remove unnecessary empty WithAttributes calls

Signed-off-by: Oleg Zaytsev <mail@olegzaytsev.com>

---------

Signed-off-by: Oleg Zaytsev <mail@olegzaytsev.com>
I want to cut a release with OTEL tracing support.

Signed-off-by: Oleg Zaytsev <mail@olegzaytsev.com>
)

Co-authored-by: grafanarenovatebot[bot] <146220760+grafanarenovatebot[bot]@users.noreply.github.com>
* fix(deps): update go dependencies

* Update CHANGELOG

---------

Co-authored-by: grafanarenovatebot[bot] <146220760+grafanarenovatebot[bot]@users.noreply.github.com>
Co-authored-by: Andy Asp <andy.asp@grafana.com>
…ana#239)

Co-authored-by: grafanarenovatebot[bot] <146220760+grafanarenovatebot[bot]@users.noreply.github.com>
* always configure http client with a timeout

Signed-off-by: Vladimir Varankin <vladimir.varankin@grafana.com>

* update CHANGELOG

Signed-off-by: Vladimir Varankin <vladimir.varankin@grafana.com>

* update flag's help

Signed-off-by: Vladimir Varankin <vladimir.varankin@grafana.com>

---------

Signed-off-by: Vladimir Varankin <vladimir.varankin@grafana.com>
* fix(deps): update go dependencies

* Update dskit

---------

Co-authored-by: grafanarenovatebot[bot] <146220760+grafanarenovatebot[bot]@users.noreply.github.com>
Co-authored-by: Andy Asp <andy.asp@grafana.com>
…ana#243)

Co-authored-by: grafanarenovatebot[bot] <146220760+grafanarenovatebot[bot]@users.noreply.github.com>
…#242)

Co-authored-by: grafanarenovatebot[bot] <146220760+grafanarenovatebot[bot]@users.noreply.github.com>
* fix(deps): update module golang.org/x/sync to v0.16.0

* Update CHANGELOG

---------

Co-authored-by: grafanarenovatebot[bot] <146220760+grafanarenovatebot[bot]@users.noreply.github.com>
Co-authored-by: Andy Asp <andy.asp@grafana.com>
* fix(deps): update go dependencies

* Align server validation configuration with dskit

* Fix flag registration

---------

Co-authored-by: grafanarenovatebot[bot] <146220760+grafanarenovatebot[bot]@users.noreply.github.com>
Co-authored-by: Andy Asp <andy.asp@grafana.com>
…ana#248)

Co-authored-by: grafanarenovatebot[bot] <146220760+grafanarenovatebot[bot]@users.noreply.github.com>
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.

9 participants