Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ require (
k8s.io/klog/v2 v2.130.1
k8s.io/kubectl v0.32.3
kmodules.xyz/cert-manager-util v0.29.0
kmodules.xyz/client-go v0.34.2
kmodules.xyz/client-go v0.34.3
kmodules.xyz/custom-resources v0.34.0
kmodules.xyz/monitoring-agent-api v0.34.1
kubedb.dev/apimachinery v0.61.0-rc.1
kubedb.dev/db-client-go v0.16.0-rc.1
kubedb.dev/apimachinery v0.61.0
kubedb.dev/db-client-go v0.16.0
kubeops.dev/petset v0.0.15
sigs.k8s.io/controller-runtime v0.22.4
sigs.k8s.io/yaml v1.6.0
Expand Down Expand Up @@ -169,11 +169,11 @@ require (
kmodules.xyz/objectstore-api v0.34.0 // indirect
kmodules.xyz/offshoot-api v0.34.0 // indirect
kmodules.xyz/prober v0.34.0 // indirect
kmodules.xyz/resource-metadata v0.42.1 // indirect
kmodules.xyz/resource-metadata v0.42.4 // indirect
kubeops.dev/csi-driver-cacerts v0.5.0 // indirect
kubeops.dev/operator-shard-manager v0.0.5 // indirect
kubeops.dev/sidekick v0.0.12 // indirect
kubestash.dev/apimachinery v0.24.0-rc.0 // indirect
kubestash.dev/apimachinery v0.24.0 // indirect
open-cluster-management.io/api v1.1.1-0.20251222023835-510285203ee6 // indirect
sigs.k8s.io/gateway-api v1.4.0 // indirect
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
Expand Down
20 changes: 10 additions & 10 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -738,8 +738,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.34.2 h1:2Cec+nyfj9kfbR+5KPK3AksxN6h4jSjhn/tw+Dhqggo=
kmodules.xyz/client-go v0.34.2/go.mod h1:kQRuGMxhb+B9rVdcfBzjK+PV7oBDo+SaDiQ66u1QG+4=
kmodules.xyz/client-go v0.34.3 h1:2K2Tjwwy62QOpgIpuRB0STDAt2e7omkKt06oC8YV+/U=
kmodules.xyz/client-go v0.34.3/go.mod h1:myCt7AfRao4PBdUtKXu01xxbqqmLZ5U8fW0LQDaifhQ=
kmodules.xyz/custom-resources v0.34.0 h1:ljkIYzIq0A3Awj87kkpuYqS9aifuyR3Hr9q2OVKoojM=
kmodules.xyz/custom-resources v0.34.0/go.mod h1:pcA/n/CnrycjKCRNtU9Z+l5svhzFncLY2Kn9pqeXDVs=
kmodules.xyz/monitoring-agent-api v0.34.1 h1:0ANZgff50xF9D9cFng1NBVmSeLwiYPsZKiFLcxAY9bQ=
Expand All @@ -750,12 +750,12 @@ kmodules.xyz/offshoot-api v0.34.0 h1:HnOOp8FrCjTWjtNApRDo6Ahe79tOlLrJmyye4xxO4Kk
kmodules.xyz/offshoot-api v0.34.0/go.mod h1:F+B59yYw4CZJ4uD4xu6C+mMLzIXUtuH7E+SbDICl9jE=
kmodules.xyz/prober v0.34.0 h1:ElZkZYCjLaytAA0M8EH42To7i9gh1IIX+d0qfaIohys=
kmodules.xyz/prober v0.34.0/go.mod h1:rsu/fxxfNxY70GDbH6Ju8G66459hi7AhWSSBoiIp8ic=
kmodules.xyz/resource-metadata v0.42.1 h1:RxAi354cKOeCVLoZI+WjR+tooU4lEq/axIafm1SYa20=
kmodules.xyz/resource-metadata v0.42.1/go.mod h1:xntcQko2QLbLEHwGE4TQ7I/80fcBQzcexbep97Akstk=
kubedb.dev/apimachinery v0.61.0-rc.1 h1:PKF3R0wFe8PwVPaDDBxNh49KAcw3uQhpIoGS3cWnx9U=
kubedb.dev/apimachinery v0.61.0-rc.1/go.mod h1:PscykF7tqpp+MS9Q7P+lxceW4pUnkWKzNZg2fdMA4Jw=
kubedb.dev/db-client-go v0.16.0-rc.1 h1:ytfC5VJzvl08DaT7yL0/P72npWLujNfgT1gEMEPUaZY=
kubedb.dev/db-client-go v0.16.0-rc.1/go.mod h1:HLmeMqgc6vsSS2Fn6tM9U66IjoUv+pnXUBuzpBypWT0=
kmodules.xyz/resource-metadata v0.42.4 h1:nFVo+PKmwWdzVwk7U3VZuKBQj3tPo6fyY5BC7gE2OB8=
kmodules.xyz/resource-metadata v0.42.4/go.mod h1:++18wSB28Wrw3ZxnOd8o8IVg7oMyWPwaPfuLw21QnPc=
kubedb.dev/apimachinery v0.61.0 h1:gYI8RFr6W9k9+961fwoWz/6DVGmX0NwPXlTzPBYKxB4=
kubedb.dev/apimachinery v0.61.0/go.mod h1:LaumaEPYGkieolZcvmT75qqZxKbcN0mZ4xIuA85TZaY=
kubedb.dev/db-client-go v0.16.0 h1:mvlFoVQfyvzxegVHz07IXbzhTDdYOTz3zsm3PJZ//PE=
kubedb.dev/db-client-go v0.16.0/go.mod h1:W4tETd5ZYrVL5fFM0Kn2uF2wyLWMgllnMqfJADu3Gak=
kubeops.dev/csi-driver-cacerts v0.5.0 h1:WaKfoIyh7rx9rNZ65wJ3GkzhECkOjxd9dcO0iEx3xKU=
kubeops.dev/csi-driver-cacerts v0.5.0/go.mod h1:VNbwC3gTWfmdQCVxd8mkVx+n1+0F1lOA5X3usyZN1rk=
kubeops.dev/operator-shard-manager v0.0.5 h1:i7VnyUfIa9u3RQhSTVWNsooXcgmrWWxJyI9gJ10onE8=
Expand All @@ -764,8 +764,8 @@ kubeops.dev/petset v0.0.15 h1:iwTRFAp0RNw0A87sw2c97UZ6WIA9H/nhJBpDhXLa7fk=
kubeops.dev/petset v0.0.15/go.mod h1:sw96WiXfzhpmKpXj4a5AdmEHs0Bx4QMhf+iW15zY4Gg=
kubeops.dev/sidekick v0.0.12 h1:pmUjQLZDKxgREiM6z0PogLR1aDbgvkE9jRjbxG6dEt0=
kubeops.dev/sidekick v0.0.12/go.mod h1:RU7QH3E8DOLw15rBYlOOJSyczuwAnVVtYyZjJb00UB8=
kubestash.dev/apimachinery v0.24.0-rc.0 h1:JRVGCjDvJo0qEQLpuP6gNKmFEgBbp+e20qUsnhYNA+c=
kubestash.dev/apimachinery v0.24.0-rc.0/go.mod h1:Y+/8u+3kPWBuaVchmUn4/AlaGW0nLUZh57JWwvNiDlE=
kubestash.dev/apimachinery v0.24.0 h1:NLPLHAyN/TpPP4kA9NMQT1Lg/CTlCzBqGP/aybVdlN8=
kubestash.dev/apimachinery v0.24.0/go.mod h1:OV3Iq2tVRAW7k7LsukL+R33I5H/gfT2YddBdXo8DTjI=
open-cluster-management.io/api v1.1.1-0.20251222023835-510285203ee6 h1:mfcUKaSOYVDLzuontUOcasesbU9whNnvgrA0qf9trKs=
open-cluster-management.io/api v1.1.1-0.20251222023835-510285203ee6/go.mod h1:YcmA6SpGEekIMxdoeVIIyOaBhMA6ImWRLXP4g8n8T+4=
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
Expand Down
2 changes: 1 addition & 1 deletion vendor/kmodules.xyz/client-go/api/v1/certificates.go
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ func RemoveCertificate(certificates []CertificateSpec, alias string) []Certifica
type stringSetMerger struct{}

func (t stringSetMerger) Transformer(typ reflect.Type) func(dst, src reflect.Value) error {
if typ == reflect.TypeOf([]string{}) {
if typ == reflect.TypeFor[[]string]() {
return func(dst, src reflect.Value) error {
if dst.CanSet() {
if dst.Len() <= 1 && src.Len() == 0 {
Expand Down
43 changes: 40 additions & 3 deletions vendor/kmodules.xyz/client-go/api/v1/cluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import (
"crypto/hmac"
"crypto/sha256"
"encoding/base64"
"encoding/json"
"fmt"
)

Expand Down Expand Up @@ -143,7 +144,43 @@ type ClusterClaimInfo struct {
}

type ClusterClaimFeatures struct {
EnabledFeatures []string `json:"enabledFeatures,omitempty" protobuf:"bytes,1,rep,name=enabledFeatures"`
ExternallyManagedFeatures []string `json:"externallyManagedFeatures,omitempty" protobuf:"bytes,2,rep,name=externallyManagedFeatures"`
DisabledFeatures []string `json:"disabledFeatures,omitempty" protobuf:"bytes,3,rep,name=disabledFeatures"`
EnabledFeatures map[string]string `json:"enabledFeatures,omitempty" protobuf:"bytes,1,opt,name=enabledFeatures"`
ExternallyManagedFeatures []string `json:"externallyManagedFeatures,omitempty" protobuf:"bytes,2,opt,name=externallyManagedFeatures"`
DisabledFeatures []string `json:"disabledFeatures,omitempty" protobuf:"bytes,3,opt,name=disabledFeatures"`
}

func (f *ClusterClaimFeatures) UnmarshalJSON(data []byte) error {
aux := &struct {
EnabledFeatures any `json:"enabledFeatures,omitempty"`
ExternallyManagedFeatures []string `json:"externallyManagedFeatures,omitempty"`
DisabledFeatures []string `json:"disabledFeatures,omitempty"`
}{}

if err := json.Unmarshal(data, aux); err != nil {
return err
}

f.EnabledFeatures = toStringMap(aux.EnabledFeatures)
f.ExternallyManagedFeatures = aux.ExternallyManagedFeatures
f.DisabledFeatures = aux.DisabledFeatures
return nil
}

func toStringMap(v any) map[string]string {
result := make(map[string]string)
switch val := v.(type) {
case []any:
for _, item := range val {
if str, ok := item.(string); ok {
result[str] = ""
}
}
case map[string]any:
for k, item := range val {
if str, ok := item.(string); ok {
result[k] = str
}
}
}
return result
}
Loading
Loading