@@ -1310,6 +1370,62 @@ reconciled by the operator.
+## MemberListSpec { #tempo-grafana-com-v1alpha1-MemberListSpec }
+
+
+
+
+
template
diff --git a/internal/autodetect/network.go b/internal/autodetect/network.go
new file mode 100644
index 000000000..6cfc2fbeb
--- /dev/null
+++ b/internal/autodetect/network.go
@@ -0,0 +1,39 @@
+package autodetect
+
+import (
+ "net"
+ "net/netip"
+)
+
+// DetectIPv6Only detects if the pod has only IPv6 addresses assigned and no IPv4 addresses.
+func DetectIPv6Only(interfaces []string) bool {
+ foundIPv4 := false
+ foundIPv6 := false
+
+ for _, name := range interfaces {
+ inf, err := net.InterfaceByName(name)
+ if err != nil {
+ continue
+ }
+
+ addrs, err := inf.Addrs()
+ if err != nil {
+ continue
+ }
+
+ for _, a := range addrs {
+ prefix, err := netip.ParsePrefix(a.String())
+ if err != nil {
+ continue
+ }
+
+ if prefix.Addr().Is4() {
+ foundIPv4 = true
+ } else if prefix.Addr().Is6() {
+ foundIPv6 = true
+ }
+ }
+ }
+
+ return foundIPv6 && !foundIPv4
+}
diff --git a/internal/manifests/config/build.go b/internal/manifests/config/build.go
index 45f78009e..f0359ba19 100644
--- a/internal/manifests/config/build.go
+++ b/internal/manifests/config/build.go
@@ -7,6 +7,8 @@ import (
"html/template"
"io"
+ "k8s.io/utils/ptr"
+
"github.com/grafana/tempo-operator/apis/tempo/v1alpha1"
"github.com/grafana/tempo-operator/internal/manifests/manifestutils"
"github.com/grafana/tempo-operator/internal/manifests/naming"
@@ -69,8 +71,9 @@ func buildConfiguration(params manifestutils.Params) ([]byte, error) {
StorageType: string(tempo.Spec.Storage.Secret.Type),
StorageParams: params.StorageParams,
GlobalRetention: tempo.Spec.Retention.Global.Traces.Duration.String(),
- MemberList: []string{
- naming.Name("gossip-ring", tempo.Name),
+ MemberList: memberlistOptions{
+ JoinMembers: []string{naming.Name("gossip-ring", tempo.Name)},
+ EnableIPv6: ptr.Deref(tempo.Spec.HashRing.MemberList.EnableIPv6, false),
},
QueryFrontendDiscovery: fmt.Sprintf("%s:%d", naming.Name("query-frontend-discovery", tempo.Name), manifestutils.PortGRPCServer),
GlobalRateLimits: fromRateLimitSpecToRateLimitOptions(tempo.Spec.LimitSpec.Global),
diff --git a/internal/manifests/config/build_test.go b/internal/manifests/config/build_test.go
index 86bd37587..4056064e9 100644
--- a/internal/manifests/config/build_test.go
+++ b/internal/manifests/config/build_test.go
@@ -7,6 +7,7 @@ import (
openshiftconfigv1 "github.com/openshift/api/config/v1"
"github.com/stretchr/testify/require"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+ "k8s.io/utils/ptr"
configv1alpha1 "github.com/grafana/tempo-operator/apis/config/v1alpha1"
"github.com/grafana/tempo-operator/apis/tempo/v1alpha1"
@@ -2173,3 +2174,216 @@ query_frontend:
}
}
+
+func TestBuildConfigurationIPv6(t *testing.T) {
+ testCases := []struct {
+ name string
+ ipv6 *bool
+ expect string
+ }{
+ {
+ name: "ipv6 disabled",
+ ipv6: ptr.To(false),
+ expect: `
+---
+compactor:
+ compaction:
+ block_retention: 48h0m0s
+ ring:
+ kvstore:
+ store: memberlist
+distributor:
+ receivers:
+ jaeger:
+ protocols:
+ thrift_http:
+ endpoint: 0.0.0.0:14268
+ thrift_binary:
+ endpoint: 0.0.0.0:6832
+ thrift_compact:
+ endpoint: 0.0.0.0:6831
+ grpc:
+ endpoint: 0.0.0.0:14250
+ zipkin:
+ otlp:
+ protocols:
+ grpc:
+ endpoint: "0.0.0.0:4317"
+ http:
+ endpoint: "0.0.0.0:4318"
+ ring:
+ kvstore:
+ store: memberlist
+ingester:
+ lifecycler:
+ ring:
+ kvstore:
+ store: memberlist
+ replication_factor: 1
+ tokens_file_path: /var/tempo/tokens.json
+ max_block_duration: 10m
+memberlist:
+ abort_if_cluster_join_fails: false
+ join_members:
+ - tempo-test-gossip-ring
+multitenancy_enabled: false
+querier:
+ max_concurrent_queries: 20
+ search:
+ external_hedge_requests_at: 8s
+ external_hedge_requests_up_to: 2
+ frontend_worker:
+ frontend_address: "tempo-test-query-frontend-discovery:9095"
+server:
+ grpc_server_max_recv_msg_size: 4194304
+ grpc_server_max_send_msg_size: 4194304
+ http_listen_port: 3200
+ http_server_read_timeout: 3m
+ http_server_write_timeout: 3m
+ log_format: logfmt
+storage:
+ trace:
+ backend: s3
+ blocklist_poll: 5m
+ cache: none
+ local:
+ path: /var/tempo/traces
+ s3:
+ bucket: tempo
+ endpoint: "minio:9000"
+ insecure: true
+ wal:
+ path: /var/tempo/wal
+usage_report:
+ reporting_enabled: false
+query_frontend:
+ search:
+ concurrent_jobs: 2000
+ max_duration: 0s
+`,
+ },
+ {
+ name: "ipv6 enabled",
+ ipv6: ptr.To(true),
+ expect: `
+---
+compactor:
+ compaction:
+ block_retention: 48h0m0s
+ ring:
+ kvstore:
+ store: memberlist
+ enable_inet6: true
+distributor:
+ receivers:
+ jaeger:
+ protocols:
+ thrift_http:
+ endpoint: 0.0.0.0:14268
+ thrift_binary:
+ endpoint: 0.0.0.0:6832
+ thrift_compact:
+ endpoint: 0.0.0.0:6831
+ grpc:
+ endpoint: 0.0.0.0:14250
+ zipkin:
+ otlp:
+ protocols:
+ grpc:
+ endpoint: "0.0.0.0:4317"
+ http:
+ endpoint: "0.0.0.0:4318"
+ ring:
+ kvstore:
+ store: memberlist
+ingester:
+ lifecycler:
+ ring:
+ kvstore:
+ store: memberlist
+ replication_factor: 1
+ tokens_file_path: /var/tempo/tokens.json
+ enable_inet6: true
+ max_block_duration: 10m
+memberlist:
+ abort_if_cluster_join_fails: false
+ join_members:
+ - tempo-test-gossip-ring
+multitenancy_enabled: false
+querier:
+ max_concurrent_queries: 20
+ search:
+ external_hedge_requests_at: 8s
+ external_hedge_requests_up_to: 2
+ frontend_worker:
+ frontend_address: "tempo-test-query-frontend-discovery:9095"
+server:
+ grpc_server_max_recv_msg_size: 4194304
+ grpc_server_max_send_msg_size: 4194304
+ http_listen_port: 3200
+ http_server_read_timeout: 3m
+ http_server_write_timeout: 3m
+ log_format: logfmt
+storage:
+ trace:
+ backend: s3
+ blocklist_poll: 5m
+ cache: none
+ local:
+ path: /var/tempo/traces
+ s3:
+ bucket: tempo
+ endpoint: "minio:9000"
+ insecure: true
+ wal:
+ path: /var/tempo/wal
+usage_report:
+ reporting_enabled: false
+query_frontend:
+ search:
+ concurrent_jobs: 2000
+ max_duration: 0s
+`,
+ },
+ }
+
+ for _, tc := range testCases {
+ t.Run(tc.name, func(t *testing.T) {
+ cfg, err := buildConfiguration(manifestutils.Params{
+ Tempo: v1alpha1.TempoStack{
+ ObjectMeta: metav1.ObjectMeta{
+ Name: "test",
+ },
+ Spec: v1alpha1.TempoStackSpec{
+ Storage: v1alpha1.ObjectStorageSpec{
+ Secret: v1alpha1.ObjectStorageSecretSpec{
+ Type: v1alpha1.ObjectStorageSecretS3,
+ },
+ },
+ ReplicationFactor: 1,
+ Retention: v1alpha1.RetentionSpec{
+ Global: v1alpha1.RetentionConfig{
+ Traces: metav1.Duration{Duration: 48 * time.Hour},
+ },
+ },
+ HashRing: v1alpha1.HashRingSpec{
+ MemberList: v1alpha1.MemberListSpec{
+ EnableIPv6: tc.ipv6,
+ },
+ },
+ },
+ },
+ StorageParams: manifestutils.StorageParams{
+ S3: &manifestutils.S3{
+ Endpoint: "minio:9000",
+ Bucket: "tempo",
+ Insecure: true,
+ },
+ },
+ })
+ require.NoError(t, err)
+ require.YAMLEq(t, tc.expect, string(cfg))
+ })
+ }
+
+}
diff --git a/internal/manifests/config/options.go b/internal/manifests/config/options.go
index ae740bd53..18fe1ee92 100644
--- a/internal/manifests/config/options.go
+++ b/internal/manifests/config/options.go
@@ -11,7 +11,7 @@ type options struct {
GlobalRateLimits rateLimitsOptions
TenantRateLimitsPath string
TLS tlsOptions
- MemberList []string
+ MemberList memberlistOptions
Search searchOptions
ReplicationFactor int
Multitenancy bool
@@ -65,6 +65,11 @@ type tlsOptions struct {
Profile tlsProfileOptions
}
+type memberlistOptions struct {
+ JoinMembers []string
+ EnableIPv6 bool
+}
+
type receiverTLSOptions struct {
Enabled bool
ClientCAEnabled bool
diff --git a/internal/manifests/config/tempo-config.yaml b/internal/manifests/config/tempo-config.yaml
index 72317a40e..44cb14852 100644
--- a/internal/manifests/config/tempo-config.yaml
+++ b/internal/manifests/config/tempo-config.yaml
@@ -4,6 +4,9 @@ compactor:
ring:
kvstore:
store: memberlist
+ {{- if .MemberList.EnableIPv6 }}
+ enable_inet6: true
+ {{- end}}
distributor:
receivers:
{{- if not .Gateway }}
@@ -89,11 +92,14 @@ ingester:
store: memberlist
replication_factor: {{ .ReplicationFactor }}
tokens_file_path: /var/tempo/tokens.json
+ {{- if .MemberList.EnableIPv6 }}
+ enable_inet6: true
+ {{- end}}
max_block_duration: 10m
memberlist:
abort_if_cluster_join_fails: false
join_members:
- {{- range .MemberList }}
+ {{- range .MemberList.JoinMembers }}
- {{ . }}
{{- end }}
multitenancy_enabled: {{ .Multitenancy }}
|