Update deps

Signed-off-by: Tamal Saha <[email protected]>

go.mod

@@ -26,7 +26,7 @@ require (
  k8s.io/apimachinery v0.30.2
  k8s.io/client-go v0.30.2
  k8s.io/klog/v2 v2.130.1
- kmodules.xyz/client-go v0.30.21
+ kmodules.xyz/client-go v0.30.27
  kmodules.xyz/crd-schema-fuzz v0.29.1
  kmodules.xyz/resource-metadata v0.19.0
  sigs.k8s.io/yaml v1.4.0

go.sum

@@ -740,8 +740,8 @@ k8s.io/kube-openapi v0.0.0-20240703190633-0aa61b46e8c2 h1:T5TEV4a+pEjc+j9Xui3MGG
 k8s.io/kube-openapi v0.0.0-20240703190633-0aa61b46e8c2/go.mod h1:UxDHUPsUwTOOxSU+oXURfFBcAS6JwiRXTYqYwfuGowc=
 k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0 h1:jgGTlFYnhF1PM1Ax/lAlxUPE+KfCIXHaathvJg1C3ak=
 k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
-kmodules.xyz/client-go v0.30.21 h1:Uye+aPmqgcO4qb1GeIgQEVZ9q5XK/9V3Xu+Vglj3L/0=
-kmodules.xyz/client-go v0.30.21/go.mod h1:CAu+JlA8RVGtj6LQHu0Q1w2mnFUajuti49c7T1AvGdM=
+kmodules.xyz/client-go v0.30.27 h1:pmM11k/XNVGTFp22qRsXBnGRnFeLNGX2lB9I0Gu+JWY=
+kmodules.xyz/client-go v0.30.27/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/go-containerregistry v0.0.12 h1:Tl32QGmSqRVm9PUEb/f3dgDeu9zW5fVzt3qmAFIE37I=

vendor/kmodules.xyz/client-go/api/v1/certificates.go

@@ -59,6 +59,10 @@ type CertificateSpec struct {
  Duration *metav1.Duration `json:"duration,omitempty" protobuf:"bytes,5,opt,name=duration"`
 
  // Certificate renew before expiration duration
+ //
+ // Deprecated use `ReconfigureTLS` type OpsRequest instead.
+ //
+ // +deprecated
  // +optional
  RenewBefore *metav1.Duration `json:"renewBefore,omitempty" protobuf:"bytes,6,opt,name=renewBefore"`
 

vendor/kmodules.xyz/client-go/api/v1/cluster.go

@@ -54,10 +54,10 @@ type ClusterMetadata struct {
  Name string `json:"name,omitempty" protobuf:"bytes,2,opt,name=name"`
  DisplayName string `json:"displayName,omitempty" protobuf:"bytes,3,opt,name=displayName"`
  Provider HostingProvider `json:"provider,omitempty" protobuf:"bytes,4,opt,name=provider,casttype=HostingProvider"`
- OwnerID string `json:"ownerID,omitempty"`
- OwnerType string `json:"ownerType,omitempty"`
- APIEndpoint string `json:"apiEndpoint,omitempty"`
- CABundle string `json:"caBundle,omitempty"`
+ OwnerID string `json:"ownerID,omitempty" protobuf:"bytes,5,opt,name=ownerID"`
+ OwnerType string `json:"ownerType,omitempty" protobuf:"bytes,6,opt,name=ownerType"`
+ APIEndpoint string `json:"apiEndpoint,omitempty" protobuf:"bytes,7,opt,name=apiEndpoint"`
+ CABundle string `json:"caBundle,omitempty" protobuf:"bytes,8,opt,name=caBundle"`
 }
 
 func (md ClusterMetadata) State() string {
@@ -151,18 +151,18 @@ func (cm ClusterManager) String() string {
 }
 
 type CAPIClusterInfo struct {
- Provider CAPIProvider `json:"provider"`
- Namespace string `json:"namespace"`
- ClusterName string `json:"clusterName"`
+ Provider CAPIProvider `json:"provider" protobuf:"bytes,1,opt,name=provider,casttype=CAPIProvider"`
+ Namespace string `json:"namespace" protobuf:"bytes,2,opt,name=namespace"`
+ ClusterName string `json:"clusterName" protobuf:"bytes,3,opt,name=clusterName"`
 }
 
 // ClusterInfo used in ace-installer
 type ClusterInfo struct {
- UID string `json:"uid"`
- Name string `json:"name"`
- ClusterManagers []string `json:"clusterManagers"`
+ UID string `json:"uid" protobuf:"bytes,1,opt,name=uid"`
+ Name string `json:"name" protobuf:"bytes,2,opt,name=name"`
+ ClusterManagers []string `json:"clusterManagers" protobuf:"bytes,3,rep,name=clusterManagers"`
  // +optional
- CAPI *CAPIClusterInfo `json:"capi"`
+ CAPI *CAPIClusterInfo `json:"capi" protobuf:"bytes,4,opt,name=capi"`
 }
 
 // +kubebuilder:validation:Enum=capa;capg;capz

vendor/kmodules.xyz/client-go/meta/hash.go

@@ -33,7 +33,11 @@ func ResourceHash(obj metav1.Object) string {
  h := xxh3.New()
  _, _ = h.WriteString(string(obj.GetUID()))
  _, _ = h.WriteString(",")
- _, _ = h.WriteString(strconv.FormatInt(obj.GetGeneration(), 10))
+ if obj.GetGeneration() > 0 {
+ _, _ = h.WriteString(strconv.FormatInt(obj.GetGeneration(), 10))
+ } else {
+ _, _ = h.WriteString(ObjectHash(obj))
+ }
  return strconv.FormatUint(h.Sum64(), 10)
 }
 
@@ -57,11 +61,20 @@ func ObjectHash(in metav1.Object) string {
  obj["annotations"] = data
  }
 
- st := structs.New(in)
- for _, field := range st.Fields() {
- fieldName := field.Name()
- if fieldName != "ObjectMeta" && fieldName != "TypeMeta" && fieldName != "Status" {
- obj[fieldName] = field.Value()
+ u, isUnstructured := in.(*unstructured.Unstructured)
+ if isUnstructured {
+ for fieldName, v := range u.UnstructuredContent() {
+ if fieldName != "metadata" && fieldName != "apiVersion" && fieldName != "kind" && fieldName != "status" {
+ obj[fieldName] = v
+ }
+ }
+ } else {
+ st := structs.New(in)
+ for _, field := range st.Fields() {
+ fieldName := field.Name()
+ if fieldName != "ObjectMeta" && fieldName != "TypeMeta" && fieldName != "Status" {
+ obj[fieldName] = field.Value()
+ }
  }
  }
 

vendor/modules.txt

@@ -1028,7 +1028,7 @@ k8s.io/utils/pointer
 k8s.io/utils/ptr
 k8s.io/utils/strings/slices
 k8s.io/utils/trace
-# kmodules.xyz/client-go v0.30.21
+# kmodules.xyz/client-go v0.30.27
 ## explicit; go 1.22.0
 kmodules.xyz/client-go
 kmodules.xyz/client-go/api/v1