Log if license-proxyserver pods are restarted after adding license (#340

) Signed-off-by: Tamal Saha <[email protected]>
kubeops · Oct 10, 2024 · eaabd33 · eaabd33
1 parent 048d8b5
commit eaabd33
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/go.mod b/go.mod
@@ -45,7 +45,7 @@ require (
 	k8s.io/kube-state-metrics/v2 v2.12.0
 	kmodules.xyz/apiversion v0.2.0
 	kmodules.xyz/authorizer v0.29.1
-	kmodules.xyz/client-go v0.30.22-0.20241009094042-175fd7e41d7e
+	kmodules.xyz/client-go v0.30.22
 	kmodules.xyz/custom-resources v0.30.0
 	kmodules.xyz/go-containerregistry v0.0.12
 	kmodules.xyz/monitoring-agent-api v0.30.2-0.20241001043315-b98120efea48

diff --git a/go.sum b/go.sum
@@ -922,8 +922,8 @@ kmodules.xyz/apiversion v0.2.0 h1:vAQYqZFm4xu4pbB1cAdHbFEPES6EQkcR4wc06xdTOWk=
 kmodules.xyz/apiversion v0.2.0/go.mod h1:oPX8g8LvlPdPX3Yc5YvCzJHQnw3YF/X4/jdW0b1am80=
 kmodules.xyz/authorizer v0.29.1 h1:uByGGoryKbZcfiEAhjcK/Y345I9mygNQP7DVpkMbNQQ=
 kmodules.xyz/authorizer v0.29.1/go.mod h1:kZRhclL8twzyt2bQuJQJbpYww2sc+qFr8I5PPoq/sWY=
-kmodules.xyz/client-go v0.30.22-0.20241009094042-175fd7e41d7e h1:Fpeo10W+ypAqBngzRxokccAMtxM6ddEGUMnZEy2bSzU=
-kmodules.xyz/client-go v0.30.22-0.20241009094042-175fd7e41d7e/go.mod h1:CAu+JlA8RVGtj6LQHu0Q1w2mnFUajuti49c7T1AvGdM=
+kmodules.xyz/client-go v0.30.22 h1:xo9vPI+tyK/uHCI3ek8z9eDQerswOPskNEQbBgBpZPw=
+kmodules.xyz/client-go v0.30.22/go.mod h1:CAu+JlA8RVGtj6LQHu0Q1w2mnFUajuti49c7T1AvGdM=
 kmodules.xyz/crd-schema-fuzz v0.29.1 h1:zJTlWYOrT5dsVVHW8HGcnR/vaWfxQfNh11QwTtkYpcs=
 kmodules.xyz/crd-schema-fuzz v0.29.1/go.mod h1:n708z9YQqLMP2KNLQVgBcRJw1QpSWLvpNCEi+KJDOYE=
 kmodules.xyz/custom-resources v0.30.0 h1:vR3CbseHMLwR4GvtcJJuRuwIV8voKqFqNii27rMcm1o=

diff --git a/pkg/registry/offline/addofflinelicense/storage.go b/pkg/registry/offline/addofflinelicense/storage.go
@@ -33,6 +33,7 @@ import (
 	apirequest "k8s.io/apiserver/pkg/endpoints/request"
 	"k8s.io/apiserver/pkg/registry/rest"
 	"k8s.io/client-go/util/cert"
+	"k8s.io/klog/v2"
 	kutil "kmodules.xyz/client-go"
 	cg "kmodules.xyz/client-go/client"
 	"kmodules.xyz/client-go/meta"
@@ -110,10 +111,11 @@ func (r *Storage) Create(ctx context.Context, obj runtime.Object, _ rest.Validat
 	defer func() {
 		if vt != kutil.VerbUnchanged {
 			// restart license-proxyserver pods
-			_ = r.kc.DeleteAllOf(ctx, &core.Pod{}, client.InNamespace(meta.PodNamespace()), client.MatchingLabels{
+			e2 := r.kc.DeleteAllOf(ctx, &core.Pod{}, client.InNamespace(meta.PodNamespace()), client.MatchingLabels{
 				"app.kubernetes.io/instance": "license-proxyserver",
 				"app.kubernetes.io/name":     "license-proxyserver",
 			})
+			klog.InfoS("restarted license-proxyserver pods", "err", e2)
 		}
 	}()
 

diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -2006,7 +2006,7 @@ kmodules.xyz/authorizer/apiserver
 kmodules.xyz/authorizer/rbac
 kmodules.xyz/authorizer/rbac/helpers
 kmodules.xyz/authorizer/rbac/validation
-# kmodules.xyz/client-go v0.30.22-0.20241009094042-175fd7e41d7e
+# kmodules.xyz/client-go v0.30.22
 ## explicit; go 1.22.0
 kmodules.xyz/client-go
 kmodules.xyz/client-go/api/v1