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.

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

Bump Loki helm chart to 3.4.2 and Loki image to 2.7.0 #3921

Merged
merged 5 commits into from
Nov 28, 2022

Conversation

TeddyAndrieux
Copy link
Collaborator

No description provided.

Loki image also get bumped to 2.7.0

The Loki helm chart get totally rewritten in version 3, so this commit
also update the values file and dashboard
Since the label selector for the Loki StatefulSet changed in the version
we embed compare to 124.0/123.0 we need to delete this StatefulSet
before upgrading/downgrading it

This commit should be reverted in `development/126.0`
@TeddyAndrieux TeddyAndrieux requested a review from a team as a code owner November 24, 2022 13:12
@bert-e
Copy link
Contributor

bert-e commented Nov 24, 2022

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 24, 2022

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:

Since the Loki helm chart changed, we have some object that get added
and removed, so let's clean those right after upgrade and downgrade.

This commit should be reverted in `development/126.0`
Copy link
Contributor

@JBWatenbergScality JBWatenbergScality left a comment

Choose a reason for hiding this comment

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

LGTM

@TeddyAndrieux
Copy link
Collaborator Author

/approve

@bert-e
Copy link
Contributor

bert-e commented Nov 28, 2022

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/124.1

The following branches will NOT be impacted:

  • development/123.0
  • development/124.0
  • development/2.0
  • development/2.1
  • development/2.10
  • development/2.11
  • 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

Copy link
Contributor

@gdemonet gdemonet left a comment

Choose a reason for hiding this comment

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

LGTM :shipit:

@@ -420,6 +420,7 @@ def __call__(self, parser, args, values, option_string=None):
"networking.k8s.io/v1/Ingress",
# Used by ServiceMonitor and other monitoring objects
"monitoring.coreos.com/v1",
"monitoring.coreos.com/v1/ServiceMonitor",
Copy link
Contributor

Choose a reason for hiding this comment

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

Sad that the Capabilities.APIVersions can't deduce from the above that ServiceMonitor is indeed available 😕 I guess it's mostly working for running K8s clusters

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Yes exactly, this is just because we use helm template with no cluster

Comment on lines +242 to +248
relabelings:
- replacement: metalk8s-logging/$1
sourceLabels:
- job
targetLabel: job
- replacement: loki
targetLabel: cluster
Copy link
Contributor

Choose a reason for hiding this comment

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

Oh, that's nice 👍 we'll stop seeing Loki in the etcd dashboard :)

{#- Due to a change of Loki StatefulSet labelSelector in 124.1.0, which is immutable field
Manually delete the Loki StatefulSet object if dest_version < 124.1.0
NOTE: This logic can be removed in `development/126.0` #}
{%- if salt.pkg.version_cmp(dest_version, '124.1.0') == -1 %}
Copy link
Contributor

Choose a reason for hiding this comment

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

I guess we could also check if the current version of the statefulset is higher or equal to 124.1 (in case we are re-running the orchestrate), but it's fine, downgrade doesn't need to be super optimized IMO

Copy link
Collaborator Author

@TeddyAndrieux TeddyAndrieux Nov 28, 2022

Choose a reason for hiding this comment

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

Yes we could, but anyway, the state is idempotent so it will just do nothing since the object does not exist

@gdemonet
Copy link
Contributor

(lol, too late)

@bert-e
Copy link
Contributor

bert-e commented Nov 28, 2022

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

  • ✔️ development/124.1

The following branches have NOT changed:

  • development/123.0
  • development/124.0
  • development/2.0
  • development/2.1
  • development/2.10
  • development/2.11
  • 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 teddyandrieux.

@bert-e bert-e merged commit 9aeb7a5 into development/124.1 Nov 28, 2022
@bert-e bert-e deleted the improvement/bump-loki branch November 28, 2022 19:14
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.

4 participants