From 49252a5f7a98103aab961cc5e3ef3f1c9ae72c98 Mon Sep 17 00:00:00 2001 From: Tobias Trabelsi Date: Tue, 7 Oct 2025 10:14:49 +0200 Subject: [PATCH] feat(): more verbosity --- cmd/main.go | 7 ------- internal/k8s.go | 34 ++++++++++++++++++++++------------ 2 files changed, 22 insertions(+), 19 deletions(-) diff --git a/cmd/main.go b/cmd/main.go index 98012a7..fbf63e0 100644 --- a/cmd/main.go +++ b/cmd/main.go @@ -27,13 +27,6 @@ func main() { internal.StartHealthEndpoint() }() - err = internal.RegisterCiliumCrd() - if err != nil { - log.WithFields(log.Fields{ - "Caller": "Main", - }).Fatal(fmt.Sprintf("Error registering Cilium CRD: %s", err.Error())) - } - log.WithFields(log.Fields{ "Caller": "Main", }).Info("Entering main event loop") diff --git a/internal/k8s.go b/internal/k8s.go index 4740d87..ebdf2b3 100644 --- a/internal/k8s.go +++ b/internal/k8s.go @@ -6,10 +6,10 @@ import ( "fmt" "html/template" + log "github.com/sirupsen/logrus" "k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/client-go/kubernetes/scheme" "k8s.io/client-go/rest" - apiSchema "sigs.k8s.io/controller-runtime/pkg/scheme" ) var CILIUM_GROUP_VERSION = schema.GroupVersion{ @@ -25,7 +25,7 @@ var IP_POOL_TEMPLATE = ` "name": "{{ .Name }}", "annotations": { "argocd.argoproj.io/tracking-id": "cilium-lb:cilium.io/CiliumLoadBalancerIPPool:kube-system/covidnetes-pool", - "managed-by": "canada-kaktus" + "managed-by": "canada-kaktus" } }, "spec": { @@ -70,8 +70,18 @@ func RecreateIPPoolCrd(cfg *Config, name string, ips []string) error { var status int res.StatusCode(&status) - if status >= 200 && status <= 400 { - return fmt.Errorf("failed to post CRD to kube api: %v", res.Error().Error()) + if status < 200 || status >= 400 { + return fmt.Errorf("failed to post CRD to kube api: %v", res.Error()) + } + raw, rawErr := res.Raw() + log.WithFields(log.Fields{ + "Caller": "RecreateIPPoolCrd", + }).Infof("Response from k8s api server: %s", string(raw)) + + if rawErr != nil { + log.WithFields(log.Fields{ + "Caller": "RecreateIPPoolCrd", + }).Warnf("Could not get raw response from k8s api server: %v", rawErr) } return nil @@ -113,11 +123,11 @@ func generateIpPool(name string, ips []string) (string, error) { return buf.String(), nil } -func RegisterCiliumCrd() error { - SchemeBuilder := &apiSchema.Builder{GroupVersion: CILIUM_GROUP_VERSION} - err := SchemeBuilder.AddToScheme(scheme.Scheme) - if err != nil { - return fmt.Errorf("could not register cilium crd: %v", err.Error()) - } - return nil -} +// func RegisterCiliumCrd() error { +// SchemeBuilder := &apiSchema.Builder{GroupVersion: CILIUM_GROUP_VERSION} +// err := SchemeBuilder.AddToScheme(scheme.Scheme) +// if err != nil { +// return fmt.Errorf("could not register cilium crd: %v", err.Error()) +// } +// return nil +// }