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

operator: Add support for memberlist bind network configuration #8672

Merged
merged 11 commits into from Mar 17, 2023

Conversation

periklis
Copy link
Collaborator

@periklis periklis commented Mar 1, 2023

What this PR does / why we need it:
This PR adds support to configure the memberlist bind_addr field using the pod network IP range instead of the default private network range used (See ). In managed Kubernetes/OpenShift cluster environments as well as in special on-prem setup the private IP range might not be available for using them. With this change set the LokiStack administrator can choose as a bind address the current pod network IP assigned by the cluster's pod network.

apiVersion: loki.grafana.com/v1
kind: LokiStack
metadata:
  name: lokistack-dev
  namespace: openshift-logging
spec:
  size: 1x.small
  hashRing:
    type: memberlist
    memberlist:
      instanceAddrType: podIP
  storage:
    schemas:
    - version: v12
      effectiveDate: 2022-06-01
    secret:
      name: test
      type: s3
  storageClassName: gp2-csi
  tenants:
    mode: openshift-logging

Which issue(s) this PR fixes:
Fixes #

Special notes for your reviewer:

Checklist

  • Reviewed the CONTRIBUTING.md guide (required)
  • Documentation added
  • Tests updated
  • CHANGELOG.md updated
  • Changes that require user attention or interaction to upgrade are documented in docs/sources/upgrading/_index.md

@periklis periklis requested a review from a team as a code owner March 1, 2023 13:58
@periklis periklis self-assigned this Mar 1, 2023
@periklis periklis force-pushed the memberlist-config branch 3 times, most recently from 5b8fda0 to 5a84b6a Compare March 1, 2023 14:09
Copy link
Contributor

@Red-GV Red-GV left a comment

Choose a reason for hiding this comment

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

lgtm

operator/apis/loki/v1/lokistack_types.go Show resolved Hide resolved
operator/apis/loki/v1/lokistack_types.go Outdated Show resolved Hide resolved
operator/apis/loki/v1/lokistack_types.go Show resolved Hide resolved
operator/apis/loki/v1/lokistack_webhook.go Outdated Show resolved Hide resolved
operator/internal/manifests/var.go Outdated Show resolved Hide resolved
operator/internal/manifests/config.go Show resolved Hide resolved
operator/internal/manifests/config.go Show resolved Hide resolved
operator/apis/loki/v1/lokistack_types.go Outdated Show resolved Hide resolved
operator/internal/manifests/memberlist_test.go Outdated Show resolved Hide resolved
operator/apis/loki/v1/lokistack_types.go Outdated Show resolved Hide resolved
@periklis periklis force-pushed the memberlist-config branch 2 times, most recently from 1538b15 to 8fb50df Compare March 14, 2023 13:39
Copy link
Collaborator Author

@periklis periklis left a comment

Choose a reason for hiding this comment

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

Self-review

Copy link
Collaborator

@xperimental xperimental left a comment

Choose a reason for hiding this comment

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

I think I tried all the permutations of specifying options now... just a small improvement to the validation I came across and then we're good 🙂

operator/apis/loki/v1/lokistack_types.go Outdated Show resolved Hide resolved
operator/apis/loki/v1/lokistack_types.go Show resolved Hide resolved
@periklis periklis merged commit 9b1a427 into grafana:main Mar 17, 2023
7 checks passed
periklis added a commit to periklis/loki that referenced this pull request Mar 17, 2023
…ana#8672)

Co-authored-by: Robert Jacob <xperimental@solidproject.de>
openshift-merge-robot added a commit to openshift/loki that referenced this pull request Mar 17, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants