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.

Sign up for GitHub

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

Jump to bottom

Bump fluent-bit chart version #3364

Merged
merged 5 commits into from
May 11, 2021
Merged

Bump fluent-bit chart version #3364

merged 5 commits into from
May 11, 2021

Conversation

alexandre-allard
Copy link
Contributor

Component: charts, salt, build

Context:

Summary:
Bump fluent-bit chart version to 2.2.0

Acceptance criteria:

See: #3279

@alexandre-allard alexandre-allard requested a review from a team as a code owner May 7, 2021 12:19
@bert-e
Copy link
Contributor

bert-e commented May 7, 2021

Hello alexandre-allard-scality,

My role is to assist you with the merge of this
pull request. Please type @bert-e help to get information
on this process, or consult the user documentation.

Status report is not available.

@bert-e
Copy link
Contributor

bert-e commented May 7, 2021

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • one peer

Peer approvals must include at least 1 approval from the following list:

@alexandre-allard alexandre-allard linked an issue May 7, 2021 that may be closed by this pull request
Bump Dependencies for MetalK8s 2.10 #3279
Closed
@gdemonet gdemonet added the kind:dependencies Pull requests that update a dependency file label May 7, 2021
@bert-e
Copy link
Contributor

bert-e commented May 10, 2021

Conflict

There is a conflict between your branch improvement/3279-bump-fluent-bit and the
destination branch development/2.10.

Please resolve the conflict on the feature branch (improvement/3279-bump-fluent-bit).

 $ git fetch
 $ git checkout origin/improvement/3279-bump-fluent-bit
 $ git merge origin/development/2.10
 $ # <intense conflict resolution>
 $ git commit
 $ git push origin HEAD:improvement/3279-bump-fluent-bit

TeddyAndrieux
TeddyAndrieux previously approved these changes May 11, 2021
View reviewed changes
@alexandre-allard
charts: Bump fluent-bit to 2.2.0
9c50316 
Previous helm chart repository
https://grafana.github.io/loki/charts is now
deprecated, so we move to the new one.

Update fluent-bit chart using:
```
rm -rf charts/fluent-bit
helm repo add grafana https://grafana.github.io/helm-charts
helm repo update
helm fetch -d charts --untar grafana/fluent-bit
```

Refs: #3279
@alexandre-allard
build: Bump fluent-bit image verson to 2.1.0-amd64
3ec8f54 
Refs: #3279
@alexandre-allard
salt: Re-render fluent-bit Salt formula
e9f03b0 
We have bump fluent-bit chart, so we need
to re-render this formula as follows:

```
./charts/render.py fluent-bit --namespace metalk8s-logging \
  --remove-manifest ConfigMap fluent-bit \
  charts/fluent-bit.yaml charts/fluent-bit/ \
  > salt/metalk8s/addons/logging/fluent-bit/deployed/chart.sls
```

Refs: #3279
@alexandre-allard
salt: Update fluent-bit Loki Output
be07fd3 
The name has changed from loki to
grafana-loki.

Refs: #3279
@alexandre-allard
Add CHANGELOG entry for fluent-bit version bump
52f327a 
Refs: #3279
@alexandre-allard alexandre-allard force-pushed the improvement/3279-bump-fluent-bit branch from 0650236 to 52f327a Compare May 11, 2021 08:35
@bert-e
Copy link
Contributor

bert-e commented May 11, 2021

Waiting for approval

The following approvals are needed before I can proceed with the merge:

  • the author

  • one peer

Peer approvals must include at least 1 approval from the following list:

@alexandre-allard
Copy link
Contributor Author

/approve

@bert-e
Copy link
Contributor

bert-e commented May 11, 2021

In the queue

The changeset has received all authorizations and has been added to the
relevant queue(s). The queue(s) will be merged in the target development
branch(es) as soon as builds have passed.

The changeset will be merged in:

  • ✔️ development/2.10

The following branches will NOT be impacted:

  • development/2.0
  • development/2.1
  • development/2.2
  • development/2.3
  • development/2.4
  • development/2.5
  • development/2.6
  • development/2.7
  • development/2.8
  • development/2.9

There is no action required on your side. You will be notified here once
the changeset has been merged. In the unlikely event that the changeset
fails permanently on the queue, a member of the admin team will
contact you to help resolve the matter.

IMPORTANT

Please do not attempt to modify this pull request.

  • Any commit you add on the source branch will trigger a new cycle after the
    current queue is merged.
  • Any commit you add on one of the integration branches will be lost.

If you need this pull request to be removed from the queue, please contact a
member of the admin team now.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented May 11, 2021

I have successfully merged the changeset of this pull request
into targetted development branches:

  • ✔️ development/2.10

The following branches have NOT changed:

  • development/2.0
  • development/2.1
  • development/2.2
  • development/2.3
  • development/2.4
  • development/2.5
  • development/2.6
  • development/2.7
  • development/2.8
  • development/2.9

Please check the status of the associated issue None.

Goodbye alexandre-allard-scality.

@bert-e bert-e merged commit d58ca84 into development/2.10 May 11, 2021
@bert-e bert-e deleted the improvement/3279-bump-fluent-bit branch May 11, 2021 11:17
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@TeddyAndrieux TeddyAndrieux TeddyAndrieux approved these changes

Assignees
No one assigned
Labels
kind:dependencies Pull requests that update a dependency file
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Bump Dependencies for MetalK8s 2.10
4 participants
@alexandre-allard @bert-e @TeddyAndrieux @gdemonet