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 logging stack versions #2946

Merged
merged 5 commits into from
Nov 30, 2020
Merged

Bump logging stack versions #2946

merged 5 commits into from
Nov 30, 2020

Conversation

TeddyAndrieux
Copy link
Collaborator

Component:

'logging'

Summary:

  • Bump fluent-bit chart to 2.0.1
  • Bump loki chart to 2.1.0

@TeddyAndrieux TeddyAndrieux added kind:debt Technical debt complexity:easy Something that requires less than a day to fix topic:log Anything related to log centralization system labels Nov 26, 2020
@TeddyAndrieux TeddyAndrieux requested a review from a team November 26, 2020 14:05
@bert-e
Copy link
Contributor

bert-e commented Nov 26, 2020

Hello teddyandrieux,

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 Nov 26, 2020

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:

@TeddyAndrieux TeddyAndrieux force-pushed the improvement/bump-logging-stack-versions branch from 12ac709 to be2c2ab Compare November 26, 2020 14:06
@TeddyAndrieux
charts/fluent-bit: Do not force the image tag used during rendering
0cdbc90 
For fluent-bit charts do not override the image tag in the
`fluent-bit.yaml` option helm file, instead let the default one define
in the `values.yaml` of the helm chart
@TeddyAndrieux
chart,build: update fluent-bit to 2.0.1
e94336e 
Update the image downloaded in the buildchain for fluent-bit.

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

And then re-rendering using:
```
./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
```
@TeddyAndrieux
charts/loki: Do not force the image tag used during rendering
dade397 
For loki charts do not override the image tag in the `loki.yaml` option
helm file, instead let the default one define in the `values.yaml` of
the helm chart
@TeddyAndrieux
chart,build: update loki to 2.1.0
6378dd7 
Update the image downloaded in the buildchain for loki.

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

And then re-rendering using:
```
./charts/render.py loki charts/loki.yaml charts/loki/ \
  --remove-manifest Secret loki \
  --namespace metalk8s-logging \
  --service-config loki metalk8s-loki-config \
                   metalk8s/addons/logging/loki/config/loki.yaml \
                   metalk8s-logging \
  > salt/metalk8s/addons/logging/loki/deployed/chart.sls
```
@TeddyAndrieux
changelog: Add entry about logging stack bump
3069601 
Add an entry in changelog file about bump of fluent-bit and loki charts
@TeddyAndrieux TeddyAndrieux force-pushed the improvement/bump-logging-stack-versions branch from be2c2ab to 3069601 Compare November 27, 2020 16:10
@TeddyAndrieux
Copy link
Collaborator Author

/approve

@bert-e
Copy link
Contributor

bert-e commented Nov 30, 2020

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

The following branches will NOT be impacted:

  • development/1.0
  • development/1.1
  • development/1.2
  • development/1.3
  • development/2.0
  • development/2.1
  • development/2.2
  • development/2.3
  • development/2.4
  • development/2.5
  • development/2.6

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 Nov 30, 2020

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

  • ✔️ development/2.7

The following branches have NOT changed:

  • development/1.0
  • development/1.1
  • development/1.2
  • development/1.3
  • development/2.0
  • development/2.1
  • development/2.2
  • development/2.3
  • development/2.4
  • development/2.5
  • development/2.6

Please check the status of the associated issue None.

Goodbye teddyandrieux.

@bert-e bert-e merged commit 3069601 into development/2.7 Nov 30, 2020
@bert-e bert-e deleted the improvement/bump-logging-stack-versions branch November 30, 2020 15:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@alexandre-allard alexandre-allard alexandre-allard approved these changes

Assignees
No one assigned
Labels
complexity:easy Something that requires less than a day to fix kind:debt Technical debt topic:log Anything related to log centralization system
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@TeddyAndrieux @bert-e @alexandre-allard