diff --git a/go.mod b/go.mod index 83a8fb5..3d4c05f 100644 --- a/go.mod +++ b/go.mod @@ -3,11 +3,11 @@ module git.ar21.de/yolokube/go-traefik-certmanager go 1.23.4 require ( - github.com/alecthomas/kong v1.6.1 + github.com/alecthomas/kong v1.6.0 github.com/cert-manager/cert-manager v1.16.2 - k8s.io/api v0.32.1 - k8s.io/apimachinery v0.32.1 - k8s.io/client-go v0.32.1 + k8s.io/api v0.32.0 + k8s.io/apimachinery v0.32.0 + k8s.io/client-go v0.32.0 ) require ( diff --git a/go.sum b/go.sum index cf3f2cd..bc3fff0 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,7 @@ github.com/alecthomas/assert/v2 v2.11.0 h1:2Q9r3ki8+JYXvGsDyBXwH3LcJ+WK5D0gc5E8vS6K3D0= github.com/alecthomas/assert/v2 v2.11.0/go.mod h1:Bze95FyfUr7x34QZrjL+XP+0qgp/zg8yS+TtBj1WA3k= -github.com/alecthomas/kong v1.6.1 h1:/7bVimARU3uxPD0hbryPE8qWrS3Oz3kPQoxA/H2NKG8= -github.com/alecthomas/kong v1.6.1/go.mod h1:p2vqieVMeTAnaC83txKtXe8FLke2X07aruPWXyMPQrU= +github.com/alecthomas/kong v1.6.0 h1:mwOzbdMR7uv2vul9J0FU3GYxE7ls/iX1ieMg5WIM6gE= +github.com/alecthomas/kong v1.6.0/go.mod h1:p2vqieVMeTAnaC83txKtXe8FLke2X07aruPWXyMPQrU= github.com/alecthomas/repr v0.4.0 h1:GhI2A8MACjfegCPVq9f1FLvIBS+DrQ2KQBFZP1iFzXc= github.com/alecthomas/repr v0.4.0/go.mod h1:Fr0507jx4eOXV7AlPV6AVZLYrLIuIeSOWtW57eE/O/4= github.com/cert-manager/cert-manager v1.16.2 h1:c9UU2E+8XWGruyvC/mdpc1wuLddtgmNr8foKdP7a8Jg= @@ -122,14 +122,14 @@ gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -k8s.io/api v0.32.1 h1:f562zw9cy+GvXzXf0CKlVQ7yHJVYzLfL6JAS4kOAaOc= -k8s.io/api v0.32.1/go.mod h1:/Yi/BqkuueW1BgpoePYBRdDYfjPF5sgTr5+YqDZra5k= +k8s.io/api v0.32.0 h1:OL9JpbvAU5ny9ga2fb24X8H6xQlVp+aJMFlgtQjR9CE= +k8s.io/api v0.32.0/go.mod h1:4LEwHZEf6Q/cG96F3dqR965sYOfmPM7rq81BLgsE0p0= k8s.io/apiextensions-apiserver v0.31.1 h1:L+hwULvXx+nvTYX/MKM3kKMZyei+UiSXQWciX/N6E40= k8s.io/apiextensions-apiserver v0.31.1/go.mod h1:tWMPR3sgW+jsl2xm9v7lAyRF1rYEK71i9G5dRtkknoQ= -k8s.io/apimachinery v0.32.1 h1:683ENpaCBjma4CYqsmZyhEzrGz6cjn1MY/X2jB2hkZs= -k8s.io/apimachinery v0.32.1/go.mod h1:GpHVgxoKlTxClKcteaeuF1Ul/lDVb74KpZcxcmLDElE= -k8s.io/client-go v0.32.1 h1:otM0AxdhdBIaQh7l1Q0jQpmo7WOFIk5FFa4bg6YMdUU= -k8s.io/client-go v0.32.1/go.mod h1:aTTKZY7MdxUaJ/KiUs8D+GssR9zJZi77ZqtzcGXIiDg= +k8s.io/apimachinery v0.32.0 h1:cFSE7N3rmEEtv4ei5X6DaJPHHX0C+upp+v5lVPiEwpg= +k8s.io/apimachinery v0.32.0/go.mod h1:GpHVgxoKlTxClKcteaeuF1Ul/lDVb74KpZcxcmLDElE= +k8s.io/client-go v0.32.0 h1:DimtMcnN/JIKZcrSrstiwvvZvLjG0aSxy8PxN8IChp8= +k8s.io/client-go v0.32.0/go.mod h1:boDWvdM1Drk4NJj/VddSLnx59X3OPgwrOo0vGbtq9+8= k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk= k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE= k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f h1:GA7//TjRY9yWGy1poLzYYJJ4JRdzg3+O6e8I+e+8T5Y= diff --git a/pkg/ingressroute/ingressroute.go b/pkg/ingressroute/ingressroute.go index 45e3f27..4413391 100644 --- a/pkg/ingressroute/ingressroute.go +++ b/pkg/ingressroute/ingressroute.go @@ -52,13 +52,13 @@ func (i *ingressRouteClient) Watch(stopCh chan struct{}) { AddFunc: func(obj interface{}) { key, err := cache.MetaNamespaceKeyFunc(obj) if err == nil { - queue.Add(event{key: key, eventType: watch.Added}) + queue.Add(event{key: key, eventType: watch.Added, object: &obj}) } }, UpdateFunc: func(_, newObj interface{}) { key, err := cache.MetaNamespaceKeyFunc(newObj) if err == nil { - queue.Add(event{key: key, eventType: watch.Modified}) + queue.Add(event{key: key, eventType: watch.Modified, object: &newObj}) } }, DeleteFunc: func(obj interface{}) { @@ -66,9 +66,9 @@ func (i *ingressRouteClient) Watch(stopCh chan struct{}) { return } - key, err := cache.MetaNamespaceKeyFunc(obj) + key, err := cache.DeletionHandlingMetaNamespaceKeyFunc(obj) if err == nil { - queue.Add(event{key: key, eventType: watch.Deleted}) + queue.Add(event{key: key, eventType: watch.Deleted, object: &obj}) } }, }) @@ -79,12 +79,12 @@ func (i *ingressRouteClient) Watch(stopCh chan struct{}) { go informer.Run(stopCh) wait.Until(func() { - for i.processNextItem(queue, informer) { + for i.processNextItem(queue) { } }, time.Second, stopCh) } -func (i *ingressRouteClient) processNextItem(queue workqueue.TypedRateLimitingInterface[any], informer cache.SharedInformer) bool { +func (i *ingressRouteClient) processNextItem(queue workqueue.TypedRateLimitingInterface[any]) bool { item, quit := queue.Get() if quit { return false @@ -105,13 +105,7 @@ func (i *ingressRouteClient) processNextItem(queue workqueue.TypedRateLimitingIn return true } - obj, exists, err := informer.GetStore().GetByKey(event.key) - if err != nil || !exists { - log.Printf("Failed to retrieve object for key %s: %v", event.key, err) - return true - } - - convObj, err := runtime.DefaultUnstructuredConverter.ToUnstructured(obj) + convObj, err := runtime.DefaultUnstructuredConverter.ToUnstructured(event.object) if err != nil { log.Printf("Failed to convert unstructured object for key %s: %v", event.key, err) return true @@ -149,13 +143,15 @@ func (i *ingressRouteClient) processNextItem(queue workqueue.TypedRateLimitingIn } else { log.Printf("Failed to create certificate %s: %v", event.key, createErr) } + } else { + log.Printf("Certificate %s for %s created", secretName, event.key) } - log.Printf("Certificate %s for %s created", secretName, event.key) case watch.Deleted: if deleteErr := i.client.certmanager.Certificates.Delete(context.Background(), namespace, secretName); deleteErr != nil { log.Printf("Failed to delete certificate %s: %v", event.key, deleteErr) + } else { + log.Printf("Certificate %s for %s deleted", secretName, event.key) } - log.Printf("Certificate %s for %s deleted", secretName, event.key) } return true @@ -164,6 +160,7 @@ func (i *ingressRouteClient) processNextItem(queue workqueue.TypedRateLimitingIn type event struct { key string eventType watch.EventType + object *interface{} } func routeInterfaceToMapSlice(input []interface{}) ([]map[string]interface{}, error) {