get rid of mtp in favor of an ingress

giantswarm · Nov 27, 2024 · 21e2a47 · 21e2a47
1 parent b1fb295
commit 21e2a47
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/main.go b/main.go
@@ -49,6 +49,7 @@ import (
 	loggingcredentials "github.com/giantswarm/logging-operator/pkg/resource/logging-credentials"
 	loggingsecret "github.com/giantswarm/logging-operator/pkg/resource/logging-secret"
 	loggingwiring "github.com/giantswarm/logging-operator/pkg/resource/logging-wiring"
+	lokiingressauthsecret "github.com/giantswarm/logging-operator/pkg/resource/loki-ingress-auth-secret"
 	proxyauth "github.com/giantswarm/logging-operator/pkg/resource/proxy-auth"
 	//+kubebuilder:scaffold:imports
 )
@@ -158,6 +159,10 @@ func main() {
 		Client: mgr.GetClient(),
 	}
 
+	lokiIngressAuthSecret := lokiingressauthsecret.Reconciler{
+		Client: mgr.GetClient(),
+	}
+
 	loggingSecret := loggingsecret.Reconciler{
 		Client: mgr.GetClient(),
 	}
@@ -191,6 +196,7 @@ func main() {
 			&loggingWiring,
 			&loggingSecrets,
 			&grafanaDatasource,
+			&lokiIngressAuthSecret,
 			&proxyAuth,
 			&loggingSecret,
 			&loggingConfig,

diff --git a/pkg/resource/logging-secret/reconciler.go b/pkg/resource/logging-secret/reconciler.go
@@ -30,12 +30,9 @@ func (r *Reconciler) ReconcileCreate(ctx context.Context, lc loggedcluster.Inter
 	logger.Info("logging-secret create")
 
 	// Retrieve secret containing credentials
-	var objectKey = types.NamespacedName{
-		Name:      loggingcredentials.LoggingCredentialsSecretMeta().Name,
-		Namespace: loggingcredentials.LoggingCredentialsSecretMeta().Namespace,
-	}
 	var loggingCredentialsSecret v1.Secret
-	err := r.Client.Get(ctx, objectKey, &loggingCredentialsSecret)
+	err := r.Client.Get(ctx, types.NamespacedName{Name: loggingcredentials.LoggingCredentialsSecretMeta().Name, Namespace: loggingcredentials.LoggingCredentialsSecretMeta().Namespace},
+		&loggingCredentialsSecret)
 	if err != nil {
 		return ctrl.Result{}, errors.WithStack(err)
 	}
@@ -56,7 +53,7 @@ func (r *Reconciler) ReconcileCreate(ctx context.Context, lc loggedcluster.Inter
 	// Check if secret already exists.
 	logger.Info("logging-secret - getting", "namespace", desiredLoggingSecret.GetNamespace(), "name", desiredLoggingSecret.GetName())
 	var currentLoggingSecret v1.Secret
-	err = r.Client.Get(ctx, objectKey, &currentLoggingSecret)
+	err = r.Client.Get(ctx, types.NamespacedName{Name: desiredLoggingSecret.GetName(), Namespace: desiredLoggingSecret.GetNamespace()}, &currentLoggingSecret)
 	if err != nil {
 		if apimachineryerrors.IsNotFound(err) {
 			logger.Info("logging-secret not found, creating")