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
14 changes: 7 additions & 7 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -26,14 +26,14 @@ require (
k8s.io/klog/v2 v2.130.1
k8s.io/kubectl v0.29.0
kmodules.xyz/cert-manager-util v0.29.0
kmodules.xyz/client-go v0.30.42
kmodules.xyz/client-go v0.30.44
kmodules.xyz/custom-resources v0.30.0
kmodules.xyz/monitoring-agent-api v0.30.2
kubedb.dev/apimachinery v0.50.0
kubedb.dev/db-client-go v0.5.0
kubedb.dev/apimachinery v0.51.0
kubedb.dev/db-client-go v0.6.0
sigs.k8s.io/controller-runtime v0.18.4
sigs.k8s.io/yaml v1.4.0
stash.appscode.dev/apimachinery v0.37.0
stash.appscode.dev/apimachinery v0.38.0
)

require (
Expand Down Expand Up @@ -145,11 +145,11 @@ require (
kmodules.xyz/objectstore-api v0.29.1 // indirect
kmodules.xyz/offshoot-api v0.30.1 // indirect
kmodules.xyz/prober v0.29.0 // indirect
kmodules.xyz/resource-metadata v0.23.1 // indirect
kmodules.xyz/resource-metadata v0.24.1 // indirect
kubeops.dev/csi-driver-cacerts v0.1.0 // indirect
kubeops.dev/petset v0.0.7 // indirect
kubeops.dev/sidekick v0.0.10-0.20241122131943-163e27e5ef71 // indirect
kubestash.dev/apimachinery v0.14.0 // indirect
kubeops.dev/sidekick v0.0.10 // indirect
kubestash.dev/apimachinery v0.15.0 // indirect
sigs.k8s.io/gateway-api v1.1.0 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/kustomize/api v0.17.2 // indirect
Expand Down
28 changes: 14 additions & 14 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -717,8 +717,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.30.42 h1:79x66I8betRJtmFzKS46ujXzXVKAxpXNsm32ayNxTEA=
kmodules.xyz/client-go v0.30.42/go.mod h1:ZOxyEdoSZByjZLkzSM3Q8p1zXMayflK7jQQnWMG2Yj8=
kmodules.xyz/client-go v0.30.44 h1:mLOBXQhvCIhdega9WoN4Px/usqobuKTT2vOPQcbGhXQ=
kmodules.xyz/client-go v0.30.44/go.mod h1:T9Kiu20wXEn65dLBQeegf4+y7oahJBR9ZJO2zGEVLIY=
kmodules.xyz/custom-resources v0.30.0 h1:vR3CbseHMLwR4GvtcJJuRuwIV8voKqFqNii27rMcm1o=
kmodules.xyz/custom-resources v0.30.0/go.mod h1:ZsTuI2mLG2s3byre7bHmpxJ9w0HDqAkRTL1+izGFI24=
kmodules.xyz/monitoring-agent-api v0.30.2 h1:sAgz5P5EXZqhlj1NzJ+QltAgeIx5bGSMj+aYy2EiKaw=
Expand All @@ -729,20 +729,20 @@ kmodules.xyz/offshoot-api v0.30.1 h1:TrulAYO+oBsXe9sZZGTmNWIuI8qD2izMpgcTSPvgAmI
kmodules.xyz/offshoot-api v0.30.1/go.mod h1:T3mpjR6fui0QzOcmQvIuANytW48fe9ytmy/1cgx6D4g=
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.23.1 h1:uEs7E2fUCACbFEkIVe2BbFl+U9kotvE3Op0j9oNPzVY=
kmodules.xyz/resource-metadata v0.23.1/go.mod h1:k7oxVO2BbgXOXfPrf6v8uAki52MLQ01mo4g0PcEyebM=
kubedb.dev/apimachinery v0.50.0 h1:lHhYoXMXFtIrAgMYRvyGXQj1GhKt8/LCiUDr/laDk/4=
kubedb.dev/apimachinery v0.50.0/go.mod h1:s1FTCR0gEwDFY5XjawG5yu9pG94M2A1Zub+9UJSaMVQ=
kubedb.dev/db-client-go v0.5.0 h1:m2DyVW/PDxgbWFNeItZ0ChHk7cC3YZzHshEQSImgUTE=
kubedb.dev/db-client-go v0.5.0/go.mod h1:Y9iJRijKqrhBF0ohZHfobZMqwWfomMg/1tT2fVptQA8=
kmodules.xyz/resource-metadata v0.24.1 h1:l4PmP+zbccPUQmSHKfEmmFLWMXtAHcgaRLWZ3v4WjYM=
kmodules.xyz/resource-metadata v0.24.1/go.mod h1:TIHbYsuqmLl8yhYwV/4Uwwm4CO4GdqGHy1KAOgKhpYY=
kubedb.dev/apimachinery v0.51.0 h1:kkd7P7lfp3qC10E0s78QI99nAdynSfubDU6pBg3nQpk=
kubedb.dev/apimachinery v0.51.0/go.mod h1:MLRK+0bdVef03iqlrT9Jc5Depkb4728LLWL+SmGC1I0=
kubedb.dev/db-client-go v0.6.0 h1:fN6ZYmjlusX7rnS2pLVg0uyAkKtk+LBU7AIvWbTEkw0=
kubedb.dev/db-client-go v0.6.0/go.mod h1:v1OVVO4tYeKHPnPVenDVWttnrm9ZpyULmUK1gTqRK68=
kubeops.dev/csi-driver-cacerts v0.1.0 h1:WDgKNo5QAiMoVy4c/4ARWeCXJbqdcXdcn8VLImV4VZU=
kubeops.dev/csi-driver-cacerts v0.1.0/go.mod h1:5a/ZOn5LFw26PPBpTKvsivBjcvVArOrJX24C+k+przk=
kubeops.dev/petset v0.0.7 h1:F77BTRfUqRVO7kNc8q2oFSSviDmYBqni/osXqu0kgJ4=
kubeops.dev/petset v0.0.7/go.mod h1:lt0SZV4ohRy7RiwLNUnMoauG4lCbcRbSqhMg20rdUQg=
kubeops.dev/sidekick v0.0.10-0.20241122131943-163e27e5ef71 h1:MIrAOBOkxkJuV1mtRTbP1elbLUUp55UmbGrAlFgLO7U=
kubeops.dev/sidekick v0.0.10-0.20241122131943-163e27e5ef71/go.mod h1:KGH6DiNqAfTaVz9bVTvm7e+KPKPN/PkfKkqee89YhW0=
kubestash.dev/apimachinery v0.14.0 h1:mHOR7WFpev7Tar5t7z+fiteO8yg+Ej7sGWo4KggyDCY=
kubestash.dev/apimachinery v0.14.0/go.mod h1:k+My508NVx4V3UyiNMtcrk2QDO7Ex8089VERcfQgFJ0=
kubeops.dev/sidekick v0.0.10 h1:/lOT+yV920F6TTPLc7bKR9HLAG/Yx+sTRm1C7rUz744=
kubeops.dev/sidekick v0.0.10/go.mod h1:VRyiiKGiJikv/8dNCkrXfkwZCv/2HoIhkmtNurs0gcM=
kubestash.dev/apimachinery v0.15.0 h1:2VX9WrLkJhytGA7tNC0yC4htuYJRT3ZlVMLceZ8PeBs=
kubestash.dev/apimachinery v0.15.0/go.mod h1:5N6yz/zo+0AJNhc+dUbs/R/pUf96GcTx47N1Hlhvc88=
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
sigs.k8s.io/gateway-api v1.1.0 h1:DsLDXCi6jR+Xz8/xd0Z1PYl2Pn0TyaFMOPPZIj4inDM=
sigs.k8s.io/gateway-api v1.1.0/go.mod h1:ZH4lHrL2sDi0FHZ9jjneb8kKnGzFWyrTya35sWUTrRs=
Expand All @@ -756,5 +756,5 @@ sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+s
sigs.k8s.io/structured-merge-diff/v4 v4.4.1/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08=
sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=
sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=
stash.appscode.dev/apimachinery v0.37.0 h1:dwKOX6XHTbTMxxRB4+nEyy740NT6+n/Rmr6Cfp+vRqE=
stash.appscode.dev/apimachinery v0.37.0/go.mod h1:Q+GTcB8/VWNqG9yywbMBWiRDnYT29tnEDnGnCYtKq4g=
stash.appscode.dev/apimachinery v0.38.0 h1:tQ4dUdMxm0XZSs4Ieii/DupOjQ3dvpwYnzqC1M8TMCQ=
stash.appscode.dev/apimachinery v0.38.0/go.mod h1:HoMcNxSg7TUHEhbHE+JvdhICrXoEKRvfLuFBKAM40ng=
3 changes: 2 additions & 1 deletion vendor/kmodules.xyz/client-go/api/v1/cluster.go
Original file line number Diff line number Diff line change
Expand Up @@ -192,14 +192,15 @@ type ClusterInfo struct {
CAPI *CAPIClusterInfo `json:"capi" protobuf:"bytes,4,opt,name=capi"`
}

// +kubebuilder:validation:Enum=capa;capg;capz
// +kubebuilder:validation:Enum=capa;capg;capz;caph;capk
type CAPIProvider string

const (
CAPIProviderCAPA CAPIProvider = "capa"
CAPIProviderCAPG CAPIProvider = "capg"
CAPIProviderCAPZ CAPIProvider = "capz"
CAPIProviderCAPH CAPIProvider = "caph"
CAPIProviderCAPK CAPIProvider = "capk"
)

type ClusterClaimInfo struct {
Expand Down
8 changes: 7 additions & 1 deletion vendor/kmodules.xyz/client-go/api/v1/object.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,13 @@ import (
"sigs.k8s.io/controller-runtime/pkg/client"
)

// TypedObjectReference represents an typed namespaced object.
// TypeReference represents an object type.
type TypeReference struct {
APIGroup string `json:"apiGroup,omitempty" protobuf:"bytes,1,opt,name=apiGroup"`
Kind string `json:"kind,omitempty" protobuf:"bytes,2,opt,name=kind"`
}

// TypedObjectReference represents a typed namespaced object.
type TypedObjectReference struct {
APIGroup string `json:"apiGroup,omitempty" protobuf:"bytes,1,opt,name=apiGroup"`
Kind string `json:"kind,omitempty" protobuf:"bytes,2,opt,name=kind"`
Expand Down
16 changes: 16 additions & 0 deletions vendor/kmodules.xyz/client-go/api/v1/zz_generated.deepcopy.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 3 additions & 6 deletions vendor/kmodules.xyz/client-go/client/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -143,8 +143,7 @@ func CreateOrPatchE(ctx context.Context, c client.Client, obj client.Object, tra

func CreateOrPatch(ctx context.Context, c client.Client, obj client.Object, transform TransformFunc, opts ...client.PatchOption) (kutil.VerbType, error) {
return CreateOrPatchE(ctx, c, obj, func(obj client.Object, createOp bool) (client.Object, error) {
transform(obj, createOp)
return obj, nil
return transform(obj, createOp), nil
}, opts...)
}

Expand Down Expand Up @@ -188,8 +187,7 @@ func PatchE(ctx context.Context, c client.Client, obj client.Object, transform P

func Patch(ctx context.Context, c client.Client, obj client.Object, transform PatchFunc, opts ...client.PatchOption) (kutil.VerbType, error) {
return PatchE(ctx, c, obj, func(obj client.Object) (client.Object, error) {
transform(obj)
return obj, nil
return transform(obj), nil
}, opts...)
}

Expand Down Expand Up @@ -232,8 +230,7 @@ func PatchStatusE(ctx context.Context, c client.Client, obj client.Object, trans

func PatchStatus(ctx context.Context, c client.Client, obj client.Object, transform PatchFunc, opts ...client.SubResourcePatchOption) (kutil.VerbType, error) {
return PatchStatusE(ctx, c, obj, func(obj client.Object) (client.Object, error) {
transform(obj)
return obj, nil
return transform(obj), nil
}, opts...)
}

Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ spec:
name:
type: string
sourceRef:
description: TypedObjectReference represents an typed namespaced
description: TypedObjectReference represents a typed namespaced
object.
properties:
apiGroup:
Expand Down Expand Up @@ -143,7 +143,7 @@ spec:
name:
type: string
sourceRef:
description: TypedObjectReference represents an
description: TypedObjectReference represents a
typed namespaced object.
properties:
apiGroup:
Expand Down Expand Up @@ -218,7 +218,7 @@ spec:
name:
type: string
sourceRef:
description: TypedObjectReference represents an typed namespaced
description: TypedObjectReference represents a typed namespaced
object.
properties:
apiGroup:
Expand Down Expand Up @@ -256,7 +256,7 @@ spec:
name:
type: string
sourceRef:
description: TypedObjectReference represents an typed namespaced
description: TypedObjectReference represents a typed namespaced
object.
properties:
apiGroup:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1336,7 +1336,7 @@ spec:
name:
type: string
sourceRef:
description: TypedObjectReference represents an
description: TypedObjectReference represents a
typed namespaced object.
properties:
apiGroup:
Expand Down Expand Up @@ -1411,7 +1411,7 @@ spec:
name:
type: string
sourceRef:
description: TypedObjectReference represents an typed namespaced
description: TypedObjectReference represents a typed namespaced
object.
properties:
apiGroup:
Expand Down Expand Up @@ -1449,7 +1449,7 @@ spec:
name:
type: string
sourceRef:
description: TypedObjectReference represents an typed namespaced
description: TypedObjectReference represents a typed namespaced
object.
properties:
apiGroup:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,11 @@ spec:
type: object
name:
type: string
show:
type: boolean
required:
- items
- name
- show
type: object
type: array
header:
Expand All @@ -60,18 +63,26 @@ spec:
type: boolean
type: object
info:
type: boolean
additionalProperties:
type: boolean
type: object
insight:
type: boolean
name:
type: string
show:
type: boolean
required:
- info
- insight
- show
type: object
type: array
show:
type: boolean
required:
- name
- show
type: object
type: array
resource:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ spec:
name:
type: string
sourceRef:
description: TypedObjectReference represents an typed
description: TypedObjectReference represents a typed
namespaced object.
properties:
apiGroup:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ spec:
name:
type: string
sourceRef:
description: TypedObjectReference represents an typed namespaced
description: TypedObjectReference represents a typed namespaced
object.
properties:
apiGroup:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ spec:
name:
type: string
sourceRef:
description: TypedObjectReference represents an typed namespaced
description: TypedObjectReference represents a typed namespaced
object.
properties:
apiGroup:
Expand Down Expand Up @@ -143,7 +143,7 @@ spec:
name:
type: string
sourceRef:
description: TypedObjectReference represents an
description: TypedObjectReference represents a
typed namespaced object.
properties:
apiGroup:
Expand Down Expand Up @@ -218,7 +218,7 @@ spec:
name:
type: string
sourceRef:
description: TypedObjectReference represents an typed namespaced
description: TypedObjectReference represents a typed namespaced
object.
properties:
apiGroup:
Expand Down Expand Up @@ -256,7 +256,7 @@ spec:
name:
type: string
sourceRef:
description: TypedObjectReference represents an typed namespaced
description: TypedObjectReference represents a typed namespaced
object.
properties:
apiGroup:
Expand Down
Loading
Loading