Skip to content

Conversation

@boldfield
Copy link
Contributor

@boldfield boldfield commented Nov 22, 2024

What this PR does / why we need it:

Which issue(s) this PR fixes:
Fixes #13168

Fixes #15062

Special notes for your reviewer:

Checklist

  • Reviewed the CONTRIBUTING.md guide (required)
  • Documentation added
  • Tests updated
  • Title matches the required conventional commits format, see here
    • Note that Promtail is considered to be feature complete, and future development for logs collection will be in Grafana Alloy. As such, feat PRs are unlikely to be accepted unless a case can be made for the feature actually being a bug fix to existing behavior.
  • Changes that require user attention or interaction to upgrade are documented in docs/sources/setup/upgrade/_index.md
  • If the change is deprecating or removing a configuration option, update the deprecated-config.yaml and deleted-config.yaml files respectively in the tools/deprecated-config-checker directory. Example PR
@boldfield boldfield requested a review from a team as a code owner November 22, 2024 00:12
@CLAassistant
Copy link

CLAassistant commented Nov 22, 2024

CLA assistant check
All committers have signed the CLA.

@github-actions

This comment has been minimized.

@github-actions

This comment has been minimized.

@boldfield boldfield force-pushed the boldfield/allow-prefixing-rollout-group branch from 5cad1b7 to 72ee6c5 Compare November 22, 2024 00:31
@pull-request-size pull-request-size bot added size/L and removed size/M labels Nov 22, 2024
@github-actions github-actions bot added the type/docs Issues related to technical documentation; the Docs Squad uses this label across many repositories label Nov 22, 2024
@boldfield boldfield marked this pull request as draft November 22, 2024 00:31
@github-actions

This comment has been minimized.

@boldfield boldfield force-pushed the boldfield/allow-prefixing-rollout-group branch from 72ee6c5 to 4e35ac9 Compare November 22, 2024 00:35
@pull-request-size pull-request-size bot added size/M and removed size/L labels Nov 22, 2024
@github-actions

This comment has been minimized.

@boldfield boldfield force-pushed the boldfield/allow-prefixing-rollout-group branch from 4e35ac9 to 1781d38 Compare November 22, 2024 04:31
@github-actions

This comment has been minimized.

@boldfield boldfield marked this pull request as ready for review November 22, 2024 17:16
@boldfield boldfield force-pushed the boldfield/allow-prefixing-rollout-group branch from 1781d38 to fbf5d94 Compare November 22, 2024 17:18
@github-actions

This comment has been minimized.

@boldfield boldfield force-pushed the boldfield/allow-prefixing-rollout-group branch from fbf5d94 to c4db852 Compare November 23, 2024 00:06
@github-actions

This comment has been minimized.

@boldfield boldfield force-pushed the boldfield/allow-prefixing-rollout-group branch from c4db852 to 8d70cbb Compare November 24, 2024 08:40
@github-actions

This comment has been minimized.

Copy link
Collaborator

@trevorwhitney trevorwhitney left a comment

Choose a reason for hiding this comment

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

thanks for the contribution

@boldfield boldfield force-pushed the boldfield/allow-prefixing-rollout-group branch from 8d70cbb to 1781d38 Compare December 9, 2024 17:20
@github-actions

This comment has been minimized.

@boldfield boldfield force-pushed the boldfield/allow-prefixing-rollout-group branch from 1781d38 to cd3ffbd Compare December 9, 2024 17:23
@github-actions

This comment has been minimized.

@github-actions

This comment has been minimized.

@boldfield boldfield force-pushed the boldfield/allow-prefixing-rollout-group branch from 1b75f64 to 22f3370 Compare December 9, 2024 22:48
@github-actions

This comment has been minimized.

@github-actions
Copy link
Contributor

Kubernetes Manifest Diff Summary

Scenario: default-single-binary-values (Added: 0, Modified: 3, Removed: 0)

Summary:

  • Added: 0

  • Modified: 3

  • Removed: 0

Added Files

No added files

Modified Files

loki/templates/ingester/statefulset-ingester-zone-c.yaml
*** /home/runner/work/loki/loki/output/base/default-single-binary-values/loki/templates/ingester/statefulset-ingester-zone-c.yaml	2024-12-10 16:52:55.717377902 +0000
--- /home/runner/work/loki/loki/output/pr/default-single-binary-values/loki/templates/ingester/statefulset-ingester-zone-c.yaml	2024-12-10 16:52:58.145415077 +0000
***************
*** 12,19 ****
 app.kubernetes.io/version: "3.3.1"
 app.kubernetes.io/component: ingester
 app.kubernetes.io/part-of: memberlist
- rollout-group: ingester
 name: ingester-zone-c
 annotations:
 rollout-max-unavailable: "1"
 spec:
--- 12,19 ----
 app.kubernetes.io/version: "3.3.1"
 app.kubernetes.io/component: ingester
 app.kubernetes.io/part-of: memberlist
 name: ingester-zone-c
+ rollout-group: ingester
 annotations:
 rollout-max-unavailable: "1"
 spec:
loki/templates/ingester/statefulset-ingester-zone-b.yaml
*** /home/runner/work/loki/loki/output/base/default-single-binary-values/loki/templates/ingester/statefulset-ingester-zone-b.yaml	2024-12-10 16:52:55.717377902 +0000
--- /home/runner/work/loki/loki/output/pr/default-single-binary-values/loki/templates/ingester/statefulset-ingester-zone-b.yaml	2024-12-10 16:52:58.145415077 +0000
***************
*** 12,19 ****
 app.kubernetes.io/version: "3.3.1"
 app.kubernetes.io/component: ingester
 app.kubernetes.io/part-of: memberlist
- rollout-group: ingester
 name: ingester-zone-b
 annotations:
 rollout-max-unavailable: "1"
 spec:
--- 12,19 ----
 app.kubernetes.io/version: "3.3.1"
 app.kubernetes.io/component: ingester
 app.kubernetes.io/part-of: memberlist
 name: ingester-zone-b
+ rollout-group: ingester
 annotations:
 rollout-max-unavailable: "1"
 spec:
loki/templates/ingester/statefulset-ingester-zone-a.yaml
*** /home/runner/work/loki/loki/output/base/default-single-binary-values/loki/templates/ingester/statefulset-ingester-zone-a.yaml	2024-12-10 16:52:55.717377902 +0000
--- /home/runner/work/loki/loki/output/pr/default-single-binary-values/loki/templates/ingester/statefulset-ingester-zone-a.yaml	2024-12-10 16:52:58.145415077 +0000
***************
*** 12,19 ****
 app.kubernetes.io/version: "3.3.1"
 app.kubernetes.io/component: ingester
 app.kubernetes.io/part-of: memberlist
- rollout-group: ingester
 name: ingester-zone-a
 annotations:
 rollout-max-unavailable: "1"
 spec:
--- 12,19 ----
 app.kubernetes.io/version: "3.3.1"
 app.kubernetes.io/component: ingester
 app.kubernetes.io/part-of: memberlist
 name: ingester-zone-a
+ rollout-group: ingester
 annotations:
 rollout-max-unavailable: "1"
 spec:

Removed Files

No removed files

Scenario: default-values (Added: 0, Modified: 0, Removed: 0)

Summary:

  • Added: 0

  • Modified: 0

  • Removed: 0

Added Files

No added files

Modified Files

No modified files

Removed Files

No removed files

Scenario: ingress-values (Added: 0, Modified: 0, Removed: 0)

Summary:

  • Added: 0

  • Modified: 0

  • Removed: 0

Added Files

No added files

Modified Files

No modified files

Removed Files

No removed files

Scenario: legacy-monitoring-values (Added: 0, Modified: 0, Removed: 0)

Summary:

  • Added: 0

  • Modified: 0

  • Removed: 0

Added Files

No added files

Modified Files

No modified files

Removed Files

No removed files

Scenario: simple-scalable-aws-kube-irsa-values (Added: 0, Modified: 0, Removed: 0)

Summary:

  • Added: 0

  • Modified: 0

  • Removed: 0

Added Files

No added files

Modified Files

No modified files

Removed Files

No removed files

operator: In
values:
- ingester
- {{ include "loki.prefixIngesterName" . }}ingester

Choose a reason for hiding this comment

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

This line in statefulset-ingester-zone-c.yaml does not match the other files and should probably be

                      - {{ include "loki.prefixRolloutGroup" . }}ingester
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

area/helm size/M type/docs Issues related to technical documentation; the Docs Squad uses this label across many repositories

4 participants