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

Replace metalk8s-loki storageclass with metalk8s one #2760

Merged
merged 6 commits into from
Aug 26, 2020
Merged

Replace metalk8s-loki storageclass with metalk8s one #2760

merged 6 commits into from
Aug 26, 2020

Conversation

alexandre-allard
Copy link
Contributor

@alexandre-allard alexandre-allard commented Aug 26, 2020 •
edited
Loading

Component: salt, docs, charts

Context: See #2742

Summary:

Acceptance criteria:

Closes: #2742

@alexandre-allard
salt: use metalk8s storageclass
5cc88a6 
We now use a single metalk8s storageclass
instead of one per addon (e.g. metalk8s-loki).

Refs: #2742
@alexandre-allard
charts: add support for selector in Loki pvc
61e4b42 
This is needed as Loki chart only allow to
target a PV with its storageclass name and
we now use a single storageclass for all addons.

This change needs to be ported upstream so
we can still upgrade Loki chart.

Refs: #2742
@alexandre-allard
salt,charts: use PV label selector for Loki pods
b3d545f 
Refs: #2742
@alexandre-allard
example: update Loki PV example to use the new storageclass
1b751d3 
This also adds a label on the PV so that we can
now select the PV based on this label instead
of the storageclass name.

Refs: #2742
@alexandre-allard
docs: update post-install doc with new metalk8s storageclass for Loki PV
1f3783d 
Refs: #2742
@alexandre-allard
tests: raise retries for logging tests
c51c331 
As for now, sometimes the test checking the
logging pipeline fails because we're not waiting
enough.
We now wait 2 minutes, it should avoid flakies.
@alexandre-allard alexandre-allard requested a review from a team as a code owner August 26, 2020 08:34
@bert-e
Copy link
Contributor

bert-e commented Aug 26, 2020

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 Aug 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:

@alexandre-allard alexandre-allard mentioned this pull request Aug 26, 2020
Closed
Ebaneck
Ebaneck reviewed Aug 26, 2020
View reviewed changes
charts/loki/templates/statefulset.yaml
@@ -124,5 +124,9 @@ spec:
requests:
storage: {{ .Values.persistence.size | quote }}
storageClassName: {{ .Values.persistence.storageClassName }}
{{- if .Values.persistence.selector }}
Copy link
Contributor

Choose a reason for hiding this comment

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

Hopefully, we don't forget this local patch during Loki chart upgrades...

Copy link
Contributor Author

Choose a reason for hiding this comment

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

That's why I opened an upstream PR, I hope it'll be merged.

Copy link
Contributor

Choose a reason for hiding this comment

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

Ha, I see the commit message now 👍

Ebaneck
Ebaneck approved these changes Aug 26, 2020
View reviewed changes
Copy link
Contributor

@Ebaneck Ebaneck left a comment

Choose a reason for hiding this comment

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

LGTM

@alexandre-allard
Copy link
Contributor Author

/approve

@bert-e
Copy link
Contributor

bert-e commented Aug 26, 2020

Build failed

The build for commit did not succeed in branch improvement/2742-metalk8s-storageclass-loki.

The following options are set: approve

@bert-e
Copy link
Contributor

bert-e commented Aug 26, 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.6

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

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

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

  • ✔️ development/2.6

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

Please check the status of the associated issue None.

Goodbye alexandre-allard-scality.

@bert-e bert-e merged commit c51c331 into development/2.6 Aug 26, 2020
@bert-e bert-e deleted the improvement/2742-metalk8s-storageclass-loki branch August 26, 2020 11:01
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Ebaneck Ebaneck Ebaneck approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Replace various metalk8s-* storageclass by a single metalk8s one
3 participants
@alexandre-allard @bert-e @Ebaneck