fix: Initialize fluentd as nil (#2)

* initialize fluentd as nil * fix: unit tests * debug logs * no explicit nil initialization
caas-team · Feb 22, 2024 · df57463 · df57463
1 parent 042a302
commit df57463
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 25 deletions.
diff --git a/fn.go b/fn.go
@@ -2,6 +2,7 @@ package main
 
 import (
 	"context"
+	"fmt"
 
 	"github.com/crossplane/crossplane-runtime/pkg/errors"
 	"github.com/crossplane/crossplane-runtime/pkg/logging"
@@ -60,15 +61,14 @@ func (f *Function) RunFunction(ctx context.Context, req *fnv1beta1.RunFunctionRe
 
 	projectid, ok := targetns.GetLabels()[in.NamespaceLabel]
 	if !ok {
-		response.Fatal(rsp, errors.New("cannot get project id"))
+		response.Fatal(rsp, fmt.Errorf("cannot get project id %s for namespace %s", projectid, targetns.GetName()))
 		return rsp, nil
 	}
 
 	l := &v1beta1.Logging{}
 	l.Spec.ControlNamespace = ns
 	l.Spec.WatchNamespaceSelector = &metav1.LabelSelector{}
 	l.Spec.WatchNamespaceSelector.MatchLabels = map[string]string{in.NamespaceLabel: projectid}
-	l.Spec.FluentdSpec = &v1beta1.FluentdSpec{}
 
 	cd, err := composed.From(l)
 	if err != nil {

diff --git a/fn_test.go b/fn_test.go
@@ -86,29 +86,6 @@ func TestRunFunction(t *testing.T) {
 										},
 										"enableRecreateWorkloadOnImmutableFieldChange": false,
 										"flowConfigCheckDisabled": false,
-										"fluentd": {
-											"compressConfigFile": false,
-											"disablePvc": false,
-											"enableMsgpackTimeSupport": false,
-											"livenessDefaultCheck": false,
-											"port": 0,
-											"readinessDefaultCheck": {
-												"bufferFileNumber": false,
-												"bufferFileNumberMax": 0,
-												"bufferFreeSpace": false,
-												"bufferFreeSpaceThreshold": 0,
-												"failureThreshold":         0,
-												"initialDelaySeconds":      0,
-												"periodSeconds":            0,
-												"successThreshold":         0,
-												"timeoutSeconds":           0
-											},
-											"tls": {
-												"enabled": false
-											},
-											"volumeMountChmod":      false,
-											"workers":               0
-										},
 										"skipInvalidResources": false
 									},
 									"status": {