Skip to content
This repository was archived by the owner on Jul 28, 2026. It is now read-only.

pkg/operator/config: don't set non-existent username_file field - #1612

Merged
rfratto merged 1 commit into
grafana-cold-storage:mainfrom
rfratto:fix-username-file
Apr 13, 2022
Merged

rfratto merged 1 commit into
grafana-cold-storage:mainfrom
rfratto:fix-username-file

Conversation

@rfratto

@rfratto rfratto commented Apr 13, 2022

Copy link
Copy Markdown
Contributor

PR Description

PR #1441 introduced a change to use password_file for basic auth, but
accidentally also generated a username_file field which doesn't exist.

This is a partial revert of #1441, keeping only the password_file change.

Which issue(s) this PR fixes

Fixes #1601

Notes to the Reviewer

PR Checklist

  • CHANGELOG updated
  • Documentation added
  • Tests updated

PR grafana-cold-storage#1441 introduced a change to use password_file for basic auth, but
accidentally also generated a username_file field which doesn't exist.
@rfratto
rfratto requested a review from captncraig April 13, 2022 19:53
@rfratto
rfratto enabled auto-merge (squash) April 13, 2022 19:55
@rfratto rfratto added this to the v0.24.1 milestone Apr 13, 2022

@rlankfo rlankfo left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM

@rfratto
rfratto merged commit 378ffed into grafana-cold-storage:main Apr 13, 2022
rfratto added a commit to rfratto/agent that referenced this pull request Apr 14, 2022
…ana-cold-storage#1612)

PR grafana-cold-storage#1441 introduced a change to use password_file for basic auth, but
accidentally also generated a username_file field which doesn't exist.

(cherry picked from commit 378ffed)
@rfratto rfratto mentioned this pull request Apr 14, 2022
rfratto added a commit that referenced this pull request Apr 14, 2022
* Set up the default logger parameters (#1611)

* Set up the default logger parameters

Signed-off-by: Paschalis Tsilias <paschalis.tsilias@grafana.com>

* Set up the default logger parameters vol.2

Signed-off-by: Paschalis Tsilias <paschalis.tsilias@grafana.com>
(cherry picked from commit 3b8d8b9)

* pkg/operator/config: don't set non-existent username_file field (#1612)

PR #1441 introduced a change to use password_file for basic auth, but
accidentally also generated a username_file field which doesn't exist.

(cherry picked from commit 378ffed)

* Bump GitHub exporter version (#1589)

* bump version of github-exporter

This bumps the version of github-exporter to the latest upstream commit,
fixing numerous bugs since the latest development release.

Closes #1588.

* add changelog entry

Also add a retroactive changelog entry for #1584

(cherry picked from commit 61e8f37)

* udpate import order in agentctl main.go (#1584)

(cherry picked from commit 78aa623)

* Embed time zone data for logs package (#1594)

(cherry picked from commit 2c53aff)

* changelog: add changelog entry for agentctl version info bugfix

* Set `Content-Type` as `application/json` to JSON endpoints (#1596)

* Set json content-type to JSON endpoints

* Update CHANGELOG

(cherry picked from commit cff7cb4)

* prepare for 0.24.1 release

Co-authored-by: Paschalis Tsilias <tpaschalis@users.noreply.github.com>
Co-authored-by: Robert Lankford <robert.lankford@grafana.com>
Co-authored-by: Marc Tudurí <marctc@protonmail.com>
@github-actions github-actions Bot added the frozen-due-to-age Locked due to a period of inactivity. Please open new issues or PRs if more discussion is needed. label Mar 29, 2024
@github-actions github-actions Bot locked as resolved and limited conversation to collaborators Mar 29, 2024
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

frozen-due-to-age Locked due to a period of inactivity. Please open new issues or PRs if more discussion is needed.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Agent deployed with Operator and default configuration does not work out of the box

2 participants