fix memberlist resolution

config/manager/kustomization.yaml

@@ -13,4 +13,4 @@ kind: Kustomization
 images:
 - name: controller
   newName: quay.io/blockloop/loki-operator
-  newTag: "1615995243"
+  newTag: "1615997355"

internal/manifests/build.go

@@ -1,7 +1,6 @@
 package manifests
 
 import (
-	"github.com/ViaQ/logerr/log"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
@@ -10,28 +9,25 @@ import (
 func BuildAll(stackName, namespace string) ([]client.Object, error) {
 	res := make([]client.Object, 0)
 
-	log.Info("building configmap")
 	cm, err := LokiConfigMap(stackName, namespace)
 	if err != nil {
 		return nil, err
 	}
 	res = append(res, cm)
 
-	log.Info("building distributor deployment")
 	res = append(res, DistributorDeployment(stackName))
 
-	log.Info("building distributor services")
 	for _, svc := range DistributorServices(stackName) {
 		res = append(res, svc)
 	}
 
-	log.Info("building ingester deployment")
 	res = append(res, IngesterDeployment(stackName))
 
-	log.Info("building ingester services")
 	for _, svc := range IngesterServices(stackName) {
 		res = append(res, svc)
 	}
 
+	res = append(res, LokiGossipRingService(stackName))
+
 	return res, nil
 }

internal/manifests/config/loki-config.yaml

@@ -51,10 +51,10 @@ limits_config:
   reject_old_samples: true
   reject_old_samples_max_age: 24h
 memberlist:
-  abort_if_cluster_join_fails: false
-  bind_port: 7946
+  abort_if_cluster_join_fails: true
+  bind_port: {{ .GossipRing.Port }}
   join_members:
-    - dns+{{ .GossipRing.FQDN }}:{{ .GossipRing.Port }}
+    - {{ .GossipRing.FQDN }}:{{ .GossipRing.Port }}
   max_join_backoff: 1m
   max_join_retries: 10
   min_join_backoff: 1s
@@ -89,6 +89,7 @@ server:
   http_listen_port: 3100
   http_server_idle_timeout: 120s
   http_server_write_timeout: 1m
+  log_level: debug
 storage_config:
   boltdb:
     directory: {{ .StorageDirectory }}/index

manifests/builder.go

@@ -1,19 +0,0 @@
-package manifests
-
-import (
-	apps "k8s.io/api/apps/v1"
-)
-
-type Options struct {
-}
-
-// DefaultOptions needs no comment
-func DefaultOptions() Options {
-	return Options{}
-}
-
-// Build creates a list of manifests that should be deployed
-func Build(_ Options) ([]apps.Deployment, error) {
-	dep, err := DistributorDeployment()
-	return []apps.Deployment{dep}, err
-}

manifests/embed.go

@@ -1,36 +0,0 @@
-package manifests
-
-import (
-	"embed"
-	"io/fs"
-
-	"github.com/ViaQ/logerr/kverrors"
-	apps "k8s.io/api/apps/v1"
-	core "k8s.io/api/core/v1"
-	"sigs.k8s.io/kustomize/kyaml/yaml"
-)
-
-//go:embed 0.0.1/*
-var embededFS embed.FS
-
-func DistributorDeployment() (res apps.Deployment, err error) {
-	err = readFile(&res, "0.0.1/base/distributor-deploy.yaml")
-	return
-}
-
-func DistributorGrpcService() (res core.Service, err error) {
-	err = readFile(&res, "0.0.1/base/distributor-grpc-service.yaml")
-	return
-}
-
-func readFile(to interface{}, path string) error {
-	b, err := fs.ReadFile(embededFS, path)
-	if err != nil {
-		return kverrors.Wrap(err, "failed to read file", "path", path)
-	}
-
-	if err := yaml.Unmarshal(b, to); err != nil {
-		return kverrors.Wrap(err, "file was in the incorrect format", "path", path)
-	}
-	return nil
-}