Fix webhook server

Signed-off-by: Tamal Saha <[email protected]>
stashed · Feb 10, 2024 · 8cb8f6f · 8cb8f6f
1 parent 4bd38bd
commit 8cb8f6f
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 8 deletions.
diff --git a/go.mod b/go.mod
@@ -43,7 +43,7 @@ require (
  kmodules.xyz/offshoot-api v0.29.0
  kmodules.xyz/openshift v0.29.0
  kmodules.xyz/prober v0.29.0
- kmodules.xyz/webhook-runtime v0.29.0
+ kmodules.xyz/webhook-runtime v0.29.1
  sigs.k8s.io/controller-runtime v0.17.0
  stash.appscode.dev/apimachinery v0.33.0-rc.0
 )

diff --git a/go.sum b/go.sum
@@ -1588,8 +1588,8 @@ kmodules.xyz/resource-metadata v0.18.2-0.20240209092240-01f2d51a9f27 h1:MVAZE8rS
 kmodules.xyz/resource-metadata v0.18.2-0.20240209092240-01f2d51a9f27/go.mod h1:I9HeSgkshwzwUy0IDhp4yIfRFbFQJ21syeSf4NsB04o=
 kmodules.xyz/resource-metrics v0.29.0 h1:YBSVCbGdAugUqZK4igHu3fPhxvpYar4xejE6njryNM4=
 kmodules.xyz/resource-metrics v0.29.0/go.mod h1:OuG/QobZ7o8GFHl/u3lqaUR0fDZDegxtV8Vdh+MNBD4=
-kmodules.xyz/webhook-runtime v0.29.0 h1:6W3/MMcaCwLGbEggj6i5+WmOziwV3WwroWpfwe29rTU=
-kmodules.xyz/webhook-runtime v0.29.0/go.mod h1:/TBpnSdTISjjUh4euI3XhNlpFU937CfKYoWjDm39pUY=
+kmodules.xyz/webhook-runtime v0.29.1 h1:SQ8NvwJpxv5CUuXIubSg9g0Bk8BBnj4dhCWEk6Ou8g8=
+kmodules.xyz/webhook-runtime v0.29.1/go.mod h1:WVgNO4NqFdYwYZ82L6QIycN1Ax47y+yXi7XIHekYylo=
 nhooyr.io/websocket v1.8.7/go.mod h1:B70DZP8IakI65RVQ51MsWP/8jndNma26DVA/nFSCgW0=
 rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
 rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=

diff --git a/vendor/kmodules.xyz/webhook-runtime/admission/v1beta1/generic/generic.go b/vendor/kmodules.xyz/webhook-runtime/admission/v1beta1/generic/generic.go
@@ -42,7 +42,7 @@ type GenericWebhook struct {
  plural schema.GroupVersionResource
  singular string
 
- srcGroups sets.String
+ srcGroups sets.Set[string]
  target schema.GroupVersionKind
  factory api.GetterFactory
  get api.GetFunc
@@ -65,7 +65,7 @@ func NewGenericWebhook(
  return &GenericWebhook{
  plural: plural,
  singular: singular,
- srcGroups: sets.NewString(srcGroups...),
+ srcGroups: sets.New[string](srcGroups...),
  target: target,
  factory: factory,
  handler: handler,

diff --git a/vendor/kmodules.xyz/webhook-runtime/admission/v1beta1/workload/workload.go b/vendor/kmodules.xyz/webhook-runtime/admission/v1beta1/workload/workload.go
@@ -49,7 +49,7 @@ type WorkloadWebhook struct {
  singular string
  kind string
 
- srcGroups sets.String
+ srcGroups sets.Set[string]
  factory api.GetterFactory
  get api.GetFunc
  handler admission.ResourceHandler
@@ -71,7 +71,7 @@ func NewWorkloadWebhook(
  plural: plural,
  singular: singular,
  kind: kind,
- srcGroups: sets.NewString(core.GroupName, appsv1.GroupName, extensions.GroupName, batchv1.GroupName),
+ srcGroups: sets.New[string](core.GroupName, appsv1.GroupName, extensions.GroupName, batchv1.GroupName),
  factory: factory,
  handler: handler,
  }

diff --git a/vendor/kmodules.xyz/webhook-runtime/registry/admissionreview/v1beta1/admission_review.go b/vendor/kmodules.xyz/webhook-runtime/registry/admissionreview/v1beta1/admission_review.go
@@ -18,6 +18,7 @@ package v1beta1
 
 import (
  "context"
+ "strings"
 
  admission "k8s.io/api/admission/v1beta1"
  metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -39,6 +40,7 @@ var (
  _ rest.Scoper = &REST{}
  _ rest.GroupVersionKindProvider = &REST{}
  _ rest.Storage = &REST{}
+ _ rest.SingularNameProvider = &REST{}
 )
 
 func NewREST(hookFn AdmissionHookFunc) *REST {
@@ -55,6 +57,10 @@ func (r *REST) GroupVersionKind(_ schema.GroupVersion) schema.GroupVersionKind {
  return admission.SchemeGroupVersion.WithKind("AdmissionReview")
 }
 
+func (r *REST) GetSingularName() string {
+ return strings.ToLower("AdmissionReview")
+}
+
 func (r *REST) NamespaceScoped() bool {
  return false
 }

diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -1919,7 +1919,7 @@ kmodules.xyz/resource-metrics/core/v1
 kmodules.xyz/resource-metrics/kubedb.com/v1alpha2
 kmodules.xyz/resource-metrics/kubevault.com/v1alpha2
 kmodules.xyz/resource-metrics/ops.kubedb.com/v1alpha1
-# kmodules.xyz/webhook-runtime v0.29.0
+# kmodules.xyz/webhook-runtime v0.29.1
 ## explicit; go 1.21.5
 kmodules.xyz/webhook-runtime/admission
 kmodules.xyz/webhook-runtime/admission/v1beta1