From 8389f7600338caf0b614d4991e425cf22e224906 Mon Sep 17 00:00:00 2001 From: Tamal Saha Date: Sat, 6 Jan 2024 02:54:59 -0800 Subject: [PATCH] Update deps Signed-off-by: Tamal Saha --- go.mod | 6 +++--- go.sum | 12 +++++------ .../client-go/apiextensions/kubernetes.go | 20 +++++++++++++++++++ vendor/modules.txt | 6 +++--- 4 files changed, 32 insertions(+), 12 deletions(-) diff --git a/go.mod b/go.mod index 9501fa11f..ca0f94b6f 100644 --- a/go.mod +++ b/go.mod @@ -24,10 +24,10 @@ require ( k8s.io/klog/v2 v2.110.1 k8s.io/kubectl v0.29.0 kmodules.xyz/cert-manager-util v0.29.0 - kmodules.xyz/client-go v0.29.5 + kmodules.xyz/client-go v0.29.6-0.20240106073345-92f92b4d6985 kmodules.xyz/custom-resources v0.29.0 kmodules.xyz/monitoring-agent-api v0.29.0 - kubedb.dev/apimachinery v0.40.1-0.20240104031132-a1d475ceb73e + kubedb.dev/apimachinery v0.40.1-0.20240106103518-87c402a1ae51 kubedb.dev/db-client-go v0.0.8 sigs.k8s.io/controller-runtime v0.16.3 sigs.k8s.io/yaml v1.4.0 @@ -135,7 +135,7 @@ require ( kmodules.xyz/objectstore-api v0.29.0 // indirect kmodules.xyz/offshoot-api v0.29.0 // indirect kmodules.xyz/prober v0.29.0 // indirect - kmodules.xyz/resource-metadata v0.18.2-0.20240101021508-7630737cb0e6 // indirect + kmodules.xyz/resource-metadata v0.18.2-0.20240105072614-e92a8a48d400 // indirect kubeops.dev/sidekick v0.0.5-0.20231225214445-a15c70833046 // indirect kubestash.dev/apimachinery v0.3.1-0.20231231034418-cc46ddfd674a // indirect sigs.k8s.io/gateway-api v0.8.0 // indirect diff --git a/go.sum b/go.sum index 0bcbdfb15..1a74cc684 100644 --- a/go.sum +++ b/go.sum @@ -805,8 +805,8 @@ kmodules.xyz/apiversion v0.2.0 h1:vAQYqZFm4xu4pbB1cAdHbFEPES6EQkcR4wc06xdTOWk= kmodules.xyz/apiversion v0.2.0/go.mod h1:oPX8g8LvlPdPX3Yc5YvCzJHQnw3YF/X4/jdW0b1am80= kmodules.xyz/cert-manager-util v0.29.0 h1:HjEaEsv66xeMKiI8LwfTRls0z9V9L0qEvPBdOcX/CsI= kmodules.xyz/cert-manager-util v0.29.0/go.mod h1:0YuaPwp+P3Pw7Spxf6eDhOCMDDNXfNV2xIuxIexT1QU= -kmodules.xyz/client-go v0.29.5 h1:iRl4MoV+96TM1csInOCWjn5xSOXzuYlil6CO40vXLHU= -kmodules.xyz/client-go v0.29.5/go.mod h1:pHuzpwzEcDUIGjVVvwz9N8lY+6A7HXwvs2d7NtK7Hho= +kmodules.xyz/client-go v0.29.6-0.20240106073345-92f92b4d6985 h1:TrYD40aWXVm+8KkFoQ+FSw5rr6DN2EwjYX9MCzy5y3c= +kmodules.xyz/client-go v0.29.6-0.20240106073345-92f92b4d6985/go.mod h1:pHuzpwzEcDUIGjVVvwz9N8lY+6A7HXwvs2d7NtK7Hho= kmodules.xyz/custom-resources v0.29.0 h1:RaDM2+wSVXiwIvLqmkTVYpwoH83AC8wruXe2p2rOZNY= kmodules.xyz/custom-resources v0.29.0/go.mod h1:MzZyXtxdg1PDxGk3RTTO1Xv3KiVqZnIonSwmxVbagOY= kmodules.xyz/monitoring-agent-api v0.29.0 h1:gpFl6OZrlMLb/ySMHdREI9EwGtnJ91oZBn9H1UFRwB4= @@ -817,10 +817,10 @@ kmodules.xyz/offshoot-api v0.29.0 h1:GHLhxxT9jU1N8+FvOCCeJNyU5g0duYS46UGrs6AHNLY kmodules.xyz/offshoot-api v0.29.0/go.mod h1:5NxhBblXoDHWStx9HCDJR2KFTwYjEZ7i1Id3jelIunw= kmodules.xyz/prober v0.29.0 h1:Ex7m4F9rH7uWNNJlLgP63ROOM+nUATJkC2L5OQ7nwMg= kmodules.xyz/prober v0.29.0/go.mod h1:UtK+HKyI1lFLEKX+HFLyOCVju6TO93zv3kwGpzqmKOo= -kmodules.xyz/resource-metadata v0.18.2-0.20240101021508-7630737cb0e6 h1:a1ZAbqyIL41vgnsbkKP64r9fQBOVxpmaM+5GpwPJhcc= -kmodules.xyz/resource-metadata v0.18.2-0.20240101021508-7630737cb0e6/go.mod h1:XsCdEKjfoulX29tMGviDhjT/jLl158uvMvXlKOhK1as= -kubedb.dev/apimachinery v0.40.1-0.20240104031132-a1d475ceb73e h1:W4P/V/i6PkCL6ODaG7M2669AhhnRv8PYhvOFHTrVeWg= -kubedb.dev/apimachinery v0.40.1-0.20240104031132-a1d475ceb73e/go.mod h1:pa3rY23DEC7j4c0H2uIe6uG7YUbNnT1qA3p7UBr3pwQ= +kmodules.xyz/resource-metadata v0.18.2-0.20240105072614-e92a8a48d400 h1:bmd9/fvbhE55xtMF9hXVzjoUZFLGjMfEoHSHu9Hw6Gc= +kmodules.xyz/resource-metadata v0.18.2-0.20240105072614-e92a8a48d400/go.mod h1:XsCdEKjfoulX29tMGviDhjT/jLl158uvMvXlKOhK1as= +kubedb.dev/apimachinery v0.40.1-0.20240106103518-87c402a1ae51 h1:6RgHui7DPEXOSGIAWY9N3gytdbQHH1Yry2hwKSQdDsc= +kubedb.dev/apimachinery v0.40.1-0.20240106103518-87c402a1ae51/go.mod h1:pa3rY23DEC7j4c0H2uIe6uG7YUbNnT1qA3p7UBr3pwQ= kubedb.dev/db-client-go v0.0.8 h1:u95a8//A2ItHpM73YFqYiFRZcYQhDODrnoDDgYjqKuQ= kubedb.dev/db-client-go v0.0.8/go.mod h1:d3/Eztn7mzjEYwHI5+aALMOaLwAWRh0eRlCoKKD5cU4= kubeops.dev/sidekick v0.0.5-0.20231225214445-a15c70833046 h1:X1ieV+IXqNesmFwSH6NEVF1J2wO0vplC4k6v3Vmq0d0= diff --git a/vendor/kmodules.xyz/client-go/apiextensions/kubernetes.go b/vendor/kmodules.xyz/client-go/apiextensions/kubernetes.go index cab174972..63052359d 100644 --- a/vendor/kmodules.xyz/client-go/apiextensions/kubernetes.go +++ b/vendor/kmodules.xyz/client-go/apiextensions/kubernetes.go @@ -109,3 +109,23 @@ func WaitForCRDReady(client crd_cs.Interface, crds []*CustomResourceDefinition) }) return errors.Wrap(err, "timed out waiting for CRD") } + +func RemoveCRDs(client crd_cs.Interface, crds []*CustomResourceDefinition) error { + for _, crd := range crds { + // Use crd v1 for k8s >= 1.16, if available + // ref: https://github.com/kubernetes/kubernetes/issues/91395 + if crd.V1 == nil { + gvr := schema.GroupVersionResource{ + Group: crd.V1beta1.Spec.Group, + Version: crd.V1beta1.Spec.Versions[0].Name, + Resource: crd.V1beta1.Spec.Names.Plural, + } + return fmt.Errorf("missing V1 definition for %s", gvr) + } + err := client.ApiextensionsV1().CustomResourceDefinitions().Delete(context.TODO(), crd.V1.Name, metav1.DeleteOptions{}) + if err != nil && !kerr.IsNotFound(err) { + return err + } + } + return nil +} diff --git a/vendor/modules.txt b/vendor/modules.txt index 2bc2bdbe7..e4ab2d9ee 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1433,7 +1433,7 @@ kmodules.xyz/apiversion # kmodules.xyz/cert-manager-util v0.29.0 ## explicit; go 1.21.5 kmodules.xyz/cert-manager-util/certmanager/v1 -# kmodules.xyz/client-go v0.29.5 +# kmodules.xyz/client-go v0.29.6-0.20240106073345-92f92b4d6985 ## explicit; go 1.21.5 kmodules.xyz/client-go kmodules.xyz/client-go/api/v1 @@ -1475,12 +1475,12 @@ kmodules.xyz/offshoot-api/api/v1 # kmodules.xyz/prober v0.29.0 ## explicit; go 1.21.5 kmodules.xyz/prober/api/v1 -# kmodules.xyz/resource-metadata v0.18.2-0.20240101021508-7630737cb0e6 +# kmodules.xyz/resource-metadata v0.18.2-0.20240105072614-e92a8a48d400 ## explicit; go 1.21.5 kmodules.xyz/resource-metadata/apis/node kmodules.xyz/resource-metadata/apis/node/v1alpha1 kmodules.xyz/resource-metadata/crds -# kubedb.dev/apimachinery v0.40.1-0.20240104031132-a1d475ceb73e +# kubedb.dev/apimachinery v0.40.1-0.20240106103518-87c402a1ae51 ## explicit; go 1.21.5 kubedb.dev/apimachinery/apis kubedb.dev/apimachinery/apis/archiver/v1alpha1