Skip to content

Commit

Permalink
Update deps
Browse files Browse the repository at this point in the history 
Signed-off-by: Neaj Morshad <[email protected]>
  • Loading branch information
@Neaj-Morshad-101
Neaj-Morshad-101 committed Jul 9, 2024
1 parent 2b1c4ae commit f2427ed
Show file tree
Hide file tree
Showing 5 changed files with 97 additions and 16 deletions.
4 changes: 2 additions & 2 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ require (
k8s.io/klog/v2 v2.130.1
kmodules.xyz/client-go v0.30.9
kmodules.xyz/custom-resources v0.30.0
kubedb.dev/apimachinery v0.47.0-rc.0.0.20240705093316-3b5044566fdb
kubedb.dev/apimachinery v0.47.0-rc.0.0.20240709083909-6eecffe448fb
)

require (
Expand Down Expand Up @@ -110,7 +110,7 @@ require (
kmodules.xyz/objectstore-api v0.29.1 // indirect
kmodules.xyz/offshoot-api v0.29.4 // indirect
kmodules.xyz/prober v0.29.0 // indirect
kmodules.xyz/resource-metadata v0.18.9 // indirect
kmodules.xyz/resource-metadata v0.18.10 // indirect
kubeops.dev/petset v0.0.6 // indirect
kubestash.dev/apimachinery v0.10.0 // indirect
sigs.k8s.io/controller-runtime v0.18.4 // indirect
Expand Down
8 changes: 4 additions & 4 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -592,10 +592,10 @@ kmodules.xyz/offshoot-api v0.29.4 h1:WQV2BIUIoVKKiqZNmZ4gAy367jEdwBhEl3dFCLZM1qA
kmodules.xyz/offshoot-api v0.29.4/go.mod h1:e+NQ0s4gW/YTPWBWEfdISZcmk+tlTq8IjvP5SLdqvko=
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.9 h1:W/39Blg0hCvZYl0rReDIPiOMQuMN//pKVqRjhWAUrKo=
kmodules.xyz/resource-metadata v0.18.9/go.mod h1:qqieeMPdwJIEyAVkGcgh7h9PZbZTLw4KNEkkqEh5EyA=
kubedb.dev/apimachinery v0.47.0-rc.0.0.20240705093316-3b5044566fdb h1:Os9W5ePqU0SwJjKlfPKnVQ06abio/ip9a1tcBcocJr0=
kubedb.dev/apimachinery v0.47.0-rc.0.0.20240705093316-3b5044566fdb/go.mod h1:2mEFBi2aURLGNbMefYC7xUalF/JWK7a1RA0zWNDCdw8=
kmodules.xyz/resource-metadata v0.18.10 h1:B0DAMsJJBuSOGCKzptZvB8AWcbxzDdUm+3CIE7g9ftE=
kmodules.xyz/resource-metadata v0.18.10/go.mod h1:PXyZXif1b1QRpe0Pwr92OeOveptZricB0jLssCjsYTc=
kubedb.dev/apimachinery v0.47.0-rc.0.0.20240709083909-6eecffe448fb h1:ux9KZ54n4Ju4m+shsFyHJIBadK7EQG8LWUdpCvd3DUE=
kubedb.dev/apimachinery v0.47.0-rc.0.0.20240709083909-6eecffe448fb/go.mod h1:ZUYhEuFYC0URg0/vNF8CCKxTrv91B9KuxwMREz2enko=
kubeops.dev/petset v0.0.6 h1:0IbvxD9fadZfH+3iMZWzN6ZHsO0vX458JlioamwyPKQ=
kubeops.dev/petset v0.0.6/go.mod h1:A15vh0r979NsvL65DTIZKWsa/NoX9VapHBAEw1ZsdYI=
kubestash.dev/apimachinery v0.10.0 h1:38rSSEojixDvmsugS2YPGg7IFahKhPP02Hz9m9hrtQ8=
Expand Down
50 changes: 50 additions & 0 deletions vendor/kmodules.xyz/resource-metadata/crds/identity.k8s.appscode.com_siteinfos.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,58 @@ spec:
description: 'Capacity represents the total resources of a node.
More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#capacity'
type: object
controlPlane:
properties:
allocatable:
additionalProperties:
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
description: Allocatable represents the resources of a node
that are available for scheduling. Defaults to Capacity.
type: object
capacity:
additionalProperties:
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
description: 'Capacity represents the total resources of a
node. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#capacity'
type: object
count:
type: integer
type: object
count:
type: integer
workers:
properties:
allocatable:
additionalProperties:
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
description: Allocatable represents the resources of a node
that are available for scheduling. Defaults to Capacity.
type: object
capacity:
additionalProperties:
anyOf:
- type: integer
- type: string
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
x-kubernetes-int-or-string: true
description: 'Capacity represents the total resources of a
node. More info: https://kubernetes.io/docs/concepts/storage/persistent-volumes#capacity'
type: object
count:
type: integer
type: object
type: object
version:
description: 'Info contains versioning information. TODO: Add []string
Expand Down
47 changes: 39 additions & 8 deletions vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/conversion.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -623,10 +623,21 @@ func Convert_v1_MongoDBSpec_To_v1alpha2_MongoDBSpec(in *v1.MongoDBSpec, out *Mon
}

func Convert_v1alpha2_RedisClusterSpec_To_v1_RedisClusterSpec(in *RedisClusterSpec, out *v1.RedisClusterSpec, s conversion.Scope) error {
out.Shards = (*int32)(unsafe.Pointer(in.Master))
if in.Master != nil {
out.Shards = (*int32)(unsafe.Pointer(in.Master))
} else {
out.Shards = nil
}

if in.Replicas != nil {
replicas := *in.Replicas + 1
out.Replicas = (*int32)(unsafe.Pointer(&replicas))
convert := func(i int32) *int32 {
p := new(int32)
*p = i
return p
}
out.Replicas = convert(*in.Replicas + 1)
} else {
out.Replicas = nil
}
return nil
}
Expand All @@ -635,14 +646,18 @@ func Convert_v1alpha2_RedisSpec_To_v1_RedisSpec(in *RedisSpec, out *v1.RedisSpec
if err := Convert_v1alpha2_AutoOpsSpec_To_v1_AutoOpsSpec(&in.AutoOps, &out.AutoOps, s); err != nil {
return err
}

if out.Cluster == nil {
out.Cluster = &v1.RedisClusterSpec{}
}
if err := Convert_v1alpha2_RedisClusterSpec_To_v1_RedisClusterSpec(in.Cluster, out.Cluster, s); err != nil {
return err
}

out.Version = in.Version
out.Replicas = (*int32)(unsafe.Pointer(in.Replicas))
out.Mode = v1.RedisMode(in.Mode)
out.SentinelRef = (*v1.RedisSentinelRef)(unsafe.Pointer(in.SentinelRef))
out.Cluster = (*v1.RedisClusterSpec)(unsafe.Pointer(in.Cluster))
out.StorageType = v1.StorageType(in.StorageType)
out.Storage = (*corev1.PersistentVolumeClaimSpec)(unsafe.Pointer(in.Storage))
out.AuthSecret = (*v1.SecretReference)(unsafe.Pointer(in.AuthSecret))
Expand Down Expand Up @@ -675,26 +690,42 @@ func Convert_v1alpha2_RedisSpec_To_v1_RedisSpec(in *RedisSpec, out *v1.RedisSpec
}

func Convert_v1_RedisClusterSpec_To_v1alpha2_RedisClusterSpec(in *v1.RedisClusterSpec, out *RedisClusterSpec, s conversion.Scope) error {
out.Master = (*int32)(unsafe.Pointer(in.Shards))
if in.Shards != nil {
out.Master = (*int32)(unsafe.Pointer(in.Shards))
} else {
out.Master = nil
}

if in.Replicas != nil {
replicas := *in.Replicas - 1
out.Replicas = (*int32)(unsafe.Pointer(&replicas))
convert := func(i int32) *int32 {
p := new(int32)
*p = i
return p
}
out.Replicas = convert(*in.Replicas - 1)
} else {
out.Replicas = nil
}

return nil
}

func Convert_v1_RedisSpec_To_v1alpha2_RedisSpec(in *v1.RedisSpec, out *RedisSpec, s conversion.Scope) error {
if err := Convert_v1_AutoOpsSpec_To_v1alpha2_AutoOpsSpec(&in.AutoOps, &out.AutoOps, s); err != nil {
return err
}

if out.Cluster == nil {
out.Cluster = &RedisClusterSpec{}
}
if err := Convert_v1_RedisClusterSpec_To_v1alpha2_RedisClusterSpec(in.Cluster, out.Cluster, s); err != nil {
return err
}

out.Version = in.Version
out.Replicas = (*int32)(unsafe.Pointer(in.Replicas))
out.Mode = RedisMode(in.Mode)
out.SentinelRef = (*RedisSentinelRef)(unsafe.Pointer(in.SentinelRef))
out.Cluster = (*RedisClusterSpec)(unsafe.Pointer(in.Cluster))
out.StorageType = StorageType(in.StorageType)
out.Storage = (*corev1.PersistentVolumeClaimSpec)(unsafe.Pointer(in.Storage))
out.AuthSecret = (*SecretReference)(unsafe.Pointer(in.AuthSecret))
Expand Down
4 changes: 2 additions & 2 deletions vendor/modules.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -788,12 +788,12 @@ kmodules.xyz/offshoot-api/api/v2
# kmodules.xyz/prober v0.29.0
## explicit; go 1.21.5
kmodules.xyz/prober/api/v1
# kmodules.xyz/resource-metadata v0.18.9
# kmodules.xyz/resource-metadata v0.18.10
## explicit; go 1.22.1
kmodules.xyz/resource-metadata/apis/node
kmodules.xyz/resource-metadata/apis/node/v1alpha1
kmodules.xyz/resource-metadata/crds
# kubedb.dev/apimachinery v0.47.0-rc.0.0.20240705093316-3b5044566fdb
# kubedb.dev/apimachinery v0.47.0-rc.0.0.20240709083909-6eecffe448fb
## explicit; go 1.22.1
kubedb.dev/apimachinery/apis
kubedb.dev/apimachinery/apis/archiver/v1alpha1
Expand Down

0 comments on commit f2427ed

Please sign in to comment.