From 2c5c1ce7069771a81d865489407b36811de8e6ea Mon Sep 17 00:00:00 2001 From: Neaj Morshad Date: Mon, 18 Mar 2024 16:48:24 +0600 Subject: [PATCH] Rebase Signed-off-by: Neaj Morshad --- go.mod | 15 ++-------- go.sum | 11 +++---- .../apis/kubedb/v1alpha2/mssql_helpers.go | 4 +-- .../apis/kubedb/v1alpha2/mssql_types.go | 2 +- .../kubedb/v1alpha2/zz_generated.deepcopy.go | 29 +++++++++++++++++++ vendor/modules.txt | 18 +++++++----- 6 files changed, 50 insertions(+), 29 deletions(-) diff --git a/go.mod b/go.mod index 9b5723e63..a0e746319 100644 --- a/go.mod +++ b/go.mod @@ -24,15 +24,12 @@ require ( k8s.io/klog/v2 v2.120.1 kmodules.xyz/client-go v0.29.13 kmodules.xyz/custom-resources v0.29.1 - kubedb.dev/apimachinery v0.44.0 + kubedb.dev/apimachinery v0.44.1-0.20240318093844-0a541bba243a sigs.k8s.io/controller-runtime v0.17.2 xorm.io/xorm v1.3.6 ) -require ( - github.com/microsoft/go-mssqldb v1.6.0 - kubedb.dev/mssql v0.0.0-00010101000000-000000000000 -) +require github.com/microsoft/go-mssqldb v1.6.0 require ( github.com/beorn7/perks v1.0.1 // indirect @@ -102,23 +99,16 @@ require ( github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a // indirect github.com/yudai/gojsondiff v1.0.0 // indirect github.com/yudai/golcs v0.0.0-20170316035057-ecda9a501e82 // indirect - golang.org/x/crypto v0.19.0 // indirect github.com/zeebo/xxh3 v1.0.2 // indirect golang.org/x/crypto v0.19.0 // indirect golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect golang.org/x/net v0.21.0 // indirect - golang.org/x/mod v0.15.0 // indirect - golang.org/x/net v0.21.0 // indirect golang.org/x/oauth2 v0.15.0 // indirect - golang.org/x/sync v0.5.0 // indirect - golang.org/x/sys v0.17.0 // indirect - golang.org/x/term v0.17.0 // indirect golang.org/x/sync v0.6.0 // indirect golang.org/x/sys v0.17.0 // indirect golang.org/x/term v0.17.0 // indirect golang.org/x/text v0.14.0 // indirect golang.org/x/time v0.5.0 // indirect - golang.org/x/tools v0.18.0 // indirect gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect gomodules.xyz/mergo v0.3.13 // indirect gomodules.xyz/pointer v0.1.0 // indirect @@ -137,6 +127,7 @@ require ( kmodules.xyz/apiversion v0.2.0 // indirect kmodules.xyz/monitoring-agent-api v0.29.0 // indirect kmodules.xyz/offshoot-api v0.29.0 // indirect + kmodules.xyz/resource-metadata v0.18.2 // indirect kubeops.dev/petset v0.0.5 // indirect modernc.org/memory v1.5.0 // indirect modernc.org/token v1.1.0 // indirect diff --git a/go.sum b/go.sum index b326ed834..5298f9499 100644 --- a/go.sum +++ b/go.sum @@ -99,7 +99,6 @@ github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nos github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM= github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= -github.com/go-logr/logr v1.3.0/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ= github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY= github.com/go-logr/zapr v1.3.0 h1:XGdV8XW8zdwFiwOA2Dryh1gj2KRQyOOoNmBy4EplIcQ= @@ -504,10 +503,6 @@ golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.13.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y= golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.16.0 h1:xWw16ngr6ZMtmxDyKyIgsE93KNKz5HKmMa3b8ALHidU= -golang.org/x/sys v0.16.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y= -golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= @@ -619,8 +614,10 @@ kmodules.xyz/monitoring-agent-api v0.29.0 h1:gpFl6OZrlMLb/ySMHdREI9EwGtnJ91oZBn9 kmodules.xyz/monitoring-agent-api v0.29.0/go.mod h1:iNbvaMTgVFOI5q2LJtGK91j4Dmjv4ZRiRdasGmWLKQI= kmodules.xyz/offshoot-api v0.29.0 h1:GHLhxxT9jU1N8+FvOCCeJNyU5g0duYS46UGrs6AHNLY= kmodules.xyz/offshoot-api v0.29.0/go.mod h1:5NxhBblXoDHWStx9HCDJR2KFTwYjEZ7i1Id3jelIunw= -kubedb.dev/apimachinery v0.44.0 h1:R7tiR35tmjJxNlpHUS8PVPmSrnFMfLycDE0c9XEU1/A= -kubedb.dev/apimachinery v0.44.0/go.mod h1:7daaaWragCFLV38plrrJtsOuzinBSX3enMpliqlm3Uo= +kmodules.xyz/resource-metadata v0.18.2 h1:rfyq0Wnzx/2OiWGFbHTRp9cVvr2KI8xOCyy7gUVytm4= +kmodules.xyz/resource-metadata v0.18.2/go.mod h1:Vb2bFCOX4uz2TsRRMzTkUqFWWOjJ261lY8Hs2HWgzh4= +kubedb.dev/apimachinery v0.44.1-0.20240318093844-0a541bba243a h1:FFNS0dHFjtaAUf810fI6mEhYrzfqvllIYzrPF5T5BkM= +kubedb.dev/apimachinery v0.44.1-0.20240318093844-0a541bba243a/go.mod h1:7daaaWragCFLV38plrrJtsOuzinBSX3enMpliqlm3Uo= kubeops.dev/petset v0.0.5 h1:VVXi39JhjondlbHyZ98z0MLp6VCmiCMinL59K48Y2zA= kubeops.dev/petset v0.0.5/go.mod h1:ijtKT1HlAht2vBEZj5LW7C00XEs3B0d1VdCQgd5V4cA= lukechampine.com/uint128 v1.1.1/go.mod h1:c4eWIwlEGaxC/+H1VguhU4PHXNWDCDMUlWdIWl2j1gk= diff --git a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/mssql_helpers.go b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/mssql_helpers.go index d4b14d78f..945246a6d 100644 --- a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/mssql_helpers.go +++ b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/mssql_helpers.go @@ -3,11 +3,11 @@ package v1alpha2 import ( "context" "fmt" - "kubedb.dev/apimachinery/apis" - "kubedb.dev/apimachinery/apis/kubedb" "strings" + "kubedb.dev/apimachinery/apis" catalog "kubedb.dev/apimachinery/apis/catalog/v1alpha1" + "kubedb.dev/apimachinery/apis/kubedb" "gomodules.xyz/pointer" core "k8s.io/api/core/v1" diff --git a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/mssql_types.go b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/mssql_types.go index b7313c240..bcda16e52 100644 --- a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/mssql_types.go +++ b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/mssql_types.go @@ -143,7 +143,7 @@ type MsSQLStatus struct { Conditions []kmapi.Condition `json:"conditions,omitempty"` } -//+kubebuilder:object:root=true +// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object // MsSQLList contains a list of MsSQL type MsSQLList struct { diff --git a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/zz_generated.deepcopy.go b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/zz_generated.deepcopy.go index 1cc5f5c06..e0db57535 100644 --- a/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/zz_generated.deepcopy.go +++ b/vendor/kubedb.dev/apimachinery/apis/kubedb/v1alpha2/zz_generated.deepcopy.go @@ -2523,6 +2523,27 @@ func (in *MsSQL) DeepCopyObject() runtime.Object { return nil } +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *MsSQLApp) DeepCopyInto(out *MsSQLApp) { + *out = *in + if in.MsSQL != nil { + in, out := &in.MsSQL, &out.MsSQL + *out = new(MsSQL) + (*in).DeepCopyInto(*out) + } + return +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new MsSQLApp. +func (in *MsSQLApp) DeepCopy() *MsSQLApp { + if in == nil { + return nil + } + out := new(MsSQLApp) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *MsSQLAvailabilityGroupSpec) DeepCopyInto(out *MsSQLAvailabilityGroupSpec) { *out = *in @@ -2569,6 +2590,14 @@ func (in *MsSQLList) DeepCopy() *MsSQLList { return out } +// DeepCopyObject is an autogenerated deepcopy function, copying the receiver, creating a new runtime.Object. +func (in *MsSQLList) DeepCopyObject() runtime.Object { + if c := in.DeepCopy(); c != nil { + return c + } + return nil +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *MsSQLSpec) DeepCopyInto(out *MsSQLSpec) { *out = *in diff --git a/vendor/modules.txt b/vendor/modules.txt index 74643fac0..e37d8e6b2 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1026,7 +1026,7 @@ golang.org/x/net/publicsuffix ## explicit; go 1.18 golang.org/x/oauth2 golang.org/x/oauth2/internal -# golang.org/x/sync v0.5.0 +# golang.org/x/sync v0.6.0 ## explicit; go 1.18 golang.org/x/sync/errgroup # golang.org/x/sys v0.17.0 @@ -1052,8 +1052,6 @@ golang.org/x/text/unicode/norm # golang.org/x/time v0.5.0 ## explicit; go 1.18 golang.org/x/time/rate -# golang.org/x/tools v0.18.0 -## explicit; go 1.18 # gomodules.xyz/jsonpatch/v2 v2.4.0 ## explicit; go 1.20 gomodules.xyz/jsonpatch/v2 @@ -1453,9 +1451,16 @@ kmodules.xyz/monitoring-agent-api/api/v1 ## explicit; go 1.21.5 kmodules.xyz/offshoot-api/api/v1 kmodules.xyz/offshoot-api/api/v2 -# kubedb.dev/apimachinery v0.44.0 +# kmodules.xyz/resource-metadata v0.18.2 +## explicit; go 1.22.0 +kmodules.xyz/resource-metadata/apis/node +kmodules.xyz/resource-metadata/apis/node/v1alpha1 +kmodules.xyz/resource-metadata/crds +# kubedb.dev/apimachinery v0.44.1-0.20240318093844-0a541bba243a ## explicit; go 1.22.0 kubedb.dev/apimachinery/apis +kubedb.dev/apimachinery/apis/autoscaling +kubedb.dev/apimachinery/apis/autoscaling/v1alpha1 kubedb.dev/apimachinery/apis/catalog kubedb.dev/apimachinery/apis/catalog/v1alpha1 kubedb.dev/apimachinery/apis/elasticsearch/v1alpha1 @@ -1463,6 +1468,8 @@ kubedb.dev/apimachinery/apis/kafka kubedb.dev/apimachinery/apis/kafka/v1alpha1 kubedb.dev/apimachinery/apis/kubedb kubedb.dev/apimachinery/apis/kubedb/v1alpha2 +kubedb.dev/apimachinery/apis/ops +kubedb.dev/apimachinery/apis/ops/v1alpha1 kubedb.dev/apimachinery/crds kubedb.dev/apimachinery/pkg/validator # kubeops.dev/petset v0.0.5 @@ -1473,9 +1480,6 @@ kubeops.dev/petset/client/clientset/versioned/typed/apps/v1 kubeops.dev/petset/client/listers/apps/v1 kubeops.dev/petset/crds kubeops.dev/petset/pkg/features -# kubedb.dev/mssql v0.0.0-00010101000000-000000000000 => ../mssql -## explicit; go 1.21.7 -kubedb.dev/mssql/api/v1alpha2 # modernc.org/memory v1.5.0 ## explicit; go 1.18 # modernc.org/token v1.1.0