Skip to content

Commit a03627a

Browse files
committed
feat: Create Kubernetes events on deletion and deletion failure
1 parent 8e662ae commit a03627a

File tree

375 files changed

+39447
-12291
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

375 files changed

+39447
-12291
lines changed

go.mod

+20-19
Original file line numberDiff line numberDiff line change
@@ -3,50 +3,51 @@ module github.com/TwiN/k8s-ttl-controller
33
go 1.19
44

55
require (
6+
github.com/TwiN/kevent v0.1.0
67
github.com/xhit/go-str2duration/v2 v2.0.0
78
k8s.io/api v0.25.4
89
k8s.io/apimachinery v0.25.4
910
k8s.io/client-go v0.25.4
1011
)
1112

1213
require (
13-
github.com/PuerkitoBio/purell v1.1.1 // indirect
14-
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
1514
github.com/davecgh/go-spew v1.1.1 // indirect
16-
github.com/emicklei/go-restful/v3 v3.8.0 // indirect
15+
github.com/emicklei/go-restful/v3 v3.10.0 // indirect
1716
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
1817
github.com/go-logr/logr v1.2.3 // indirect
1918
github.com/go-openapi/jsonpointer v0.19.5 // indirect
20-
github.com/go-openapi/jsonreference v0.19.5 // indirect
21-
github.com/go-openapi/swag v0.19.14 // indirect
19+
github.com/go-openapi/jsonreference v0.20.0 // indirect
20+
github.com/go-openapi/swag v0.22.3 // indirect
2221
github.com/gogo/protobuf v1.3.2 // indirect
22+
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
2323
github.com/golang/protobuf v1.5.2 // indirect
24-
github.com/google/gnostic v0.5.7-v3refs // indirect
25-
github.com/google/gofuzz v1.1.0 // indirect
24+
github.com/google/gnostic v0.6.9 // indirect
25+
github.com/google/go-cmp v0.5.9 // indirect
26+
github.com/google/gofuzz v1.2.0 // indirect
2627
github.com/imdario/mergo v0.3.6 // indirect
2728
github.com/josharian/intern v1.0.0 // indirect
2829
github.com/json-iterator/go v1.1.12 // indirect
29-
github.com/mailru/easyjson v0.7.6 // indirect
30+
github.com/mailru/easyjson v0.7.7 // indirect
3031
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
3132
github.com/modern-go/reflect2 v1.0.2 // indirect
3233
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
3334
github.com/pkg/errors v0.9.1 // indirect
3435
github.com/spf13/pflag v1.0.5 // indirect
35-
golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect
36-
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
37-
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect
38-
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
39-
golang.org/x/text v0.3.7 // indirect
40-
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
36+
golang.org/x/net v0.2.0 // indirect
37+
golang.org/x/oauth2 v0.2.0 // indirect
38+
golang.org/x/sys v0.2.0 // indirect
39+
golang.org/x/term v0.2.0 // indirect
40+
golang.org/x/text v0.4.0 // indirect
41+
golang.org/x/time v0.2.0 // indirect
4142
google.golang.org/appengine v1.6.7 // indirect
42-
google.golang.org/protobuf v1.28.0 // indirect
43+
google.golang.org/protobuf v1.28.1 // indirect
4344
gopkg.in/inf.v0 v0.9.1 // indirect
4445
gopkg.in/yaml.v2 v2.4.0 // indirect
4546
gopkg.in/yaml.v3 v3.0.1 // indirect
46-
k8s.io/klog/v2 v2.70.1 // indirect
47-
k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect
48-
k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed // indirect
47+
k8s.io/klog/v2 v2.80.1 // indirect
48+
k8s.io/kube-openapi v0.0.0-20221110221610-a28e98eb7c70 // indirect
49+
k8s.io/utils v0.0.0-20221108210102-8e77b1f39fe2 // indirect
4950
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
5051
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
51-
sigs.k8s.io/yaml v1.2.0 // indirect
52+
sigs.k8s.io/yaml v1.3.0 // indirect
5253
)

go.sum

+77-303
Large diffs are not rendered by default.

main.go

+11-6
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ import (
99
"strings"
1010
"time"
1111

12-
"github.com/xhit/go-str2duration/v2"
12+
"github.com/TwiN/kevent"
13+
str2duration "github.com/xhit/go-str2duration/v2"
1314
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1415
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
1516
"k8s.io/apimachinery/pkg/runtime/schema"
@@ -44,7 +45,8 @@ func main() {
4445
if err != nil {
4546
panic("failed to create Kubernetes clients: " + err.Error())
4647
}
47-
if err := Reconcile(kubernetesClient, dynamicClient); err != nil {
48+
eventManager := kevent.NewEventManager(kubernetesClient, "k8s-ttl-controller")
49+
if err := Reconcile(kubernetesClient, dynamicClient, eventManager); err != nil {
4850
log.Printf("Error during execution: %s", err.Error())
4951
executionFailedCounter++
5052
if executionFailedCounter > MaximumFailedExecutionBeforePanic {
@@ -62,7 +64,7 @@ func main() {
6264
// Reconcile loops over all resources and deletes all sub resources that have expired
6365
//
6466
// Returns an error if an execution lasts for longer than ExecutionTimeout
65-
func Reconcile(kubernetesClient kubernetes.Interface, dynamicClient dynamic.Interface) error {
67+
func Reconcile(kubernetesClient kubernetes.Interface, dynamicClient dynamic.Interface, eventManager *kevent.EventManager) error {
6668
// Use Kubernetes' discovery API to retrieve all resources
6769
_, resources, err := kubernetesClient.Discovery().ServerGroupsAndResources()
6870
if err != nil {
@@ -78,7 +80,7 @@ func Reconcile(kubernetesClient kubernetes.Interface, dynamicClient dynamic.Inte
7880
timeout <- true
7981
}()
8082
go func() {
81-
result <- DoReconcile(dynamicClient, resources)
83+
result <- DoReconcile(dynamicClient, eventManager, resources)
8284
}()
8385
select {
8486
case <-timeout:
@@ -89,7 +91,7 @@ func Reconcile(kubernetesClient kubernetes.Interface, dynamicClient dynamic.Inte
8991
}
9092

9193
// DoReconcile goes over all API resources specified, retrieves all sub resources and deletes those who have expired
92-
func DoReconcile(dynamicClient dynamic.Interface, resources []*metav1.APIResourceList) bool {
94+
func DoReconcile(dynamicClient dynamic.Interface, eventManager *kevent.EventManager, resources []*metav1.APIResourceList) bool {
9395
for _, resource := range resources {
9496
if len(resource.APIResources) == 0 {
9597
continue
@@ -139,13 +141,16 @@ func DoReconcile(dynamicClient dynamic.Interface, resources []*metav1.APIResourc
139141
}
140142
ttlExpired := time.Now().After(item.GetCreationTimestamp().Add(ttlInDuration))
141143
if ttlExpired {
142-
log.Printf("[%s/%s] is configured with a TTL of %s, which means it has expired %s ago", apiResource.Name, item.GetName(), ttl, time.Since(item.GetCreationTimestamp().Add(ttlInDuration)).Round(time.Second))
144+
durationSinceExpired := time.Since(item.GetCreationTimestamp().Add(ttlInDuration)).Round(time.Second)
145+
log.Printf("[%s/%s] is configured with a TTL of %s, which means it has expired %s ago", apiResource.Name, item.GetName(), ttl, durationSinceExpired)
143146
err := dynamicClient.Resource(gvr).Namespace(item.GetNamespace()).Delete(context.TODO(), item.GetName(), metav1.DeleteOptions{})
144147
if err != nil {
145148
log.Printf("[%s/%s] failed to delete: %s\n", apiResource.Name, item.GetName(), err)
149+
eventManager.Create(item.GetNamespace(), item.GetKind(), item.GetName(), "FailedToDeleteExpiredTTL", "Unable to delete expired resource:"+err.Error(), true)
146150
// XXX: Should we retry with GracePeriodSeconds set to &0 to force immediate deletion after the first attempt failed?
147151
} else {
148152
log.Printf("[%s/%s] deleted", apiResource.Name, item.GetName())
153+
eventManager.Create(item.GetNamespace(), item.GetKind(), item.GetName(), "DeletedExpiredTTL", "Deleted resource because "+ttl+" or more has elapsed", false)
149154
}
150155
// Cool off a tiny bit to avoid hitting the API too often
151156
time.Sleep(ThrottleDuration)

vendor/github.com/PuerkitoBio/purell/.gitignore

-5
This file was deleted.

vendor/github.com/PuerkitoBio/purell/.travis.yml

-12
This file was deleted.

vendor/github.com/PuerkitoBio/purell/LICENSE

-12
This file was deleted.

vendor/github.com/PuerkitoBio/purell/README.md

-188
This file was deleted.

0 commit comments

Comments
 (0)