diff --git a/go.mod b/go.mod index 609af5d6..35d5aa88 100644 --- a/go.mod +++ b/go.mod @@ -21,7 +21,7 @@ require ( k8s.io/utils v0.0.0-20230726121419-3b25d923346b kmodules.xyz/client-go v0.29.9 kmodules.xyz/offshoot-api v0.29.0 - kubestash.dev/apimachinery v0.6.0 + kubestash.dev/apimachinery v0.7.0 sigs.k8s.io/controller-runtime v0.17.0 ) diff --git a/go.sum b/go.sum index 899c1972..65ef5dff 100644 --- a/go.sum +++ b/go.sum @@ -628,8 +628,8 @@ kmodules.xyz/offshoot-api v0.29.0 h1:GHLhxxT9jU1N8+FvOCCeJNyU5g0duYS46UGrs6AHNLY kmodules.xyz/offshoot-api v0.29.0/go.mod h1:5NxhBblXoDHWStx9HCDJR2KFTwYjEZ7i1Id3jelIunw= kmodules.xyz/prober v0.29.0 h1:Ex7m4F9rH7uWNNJlLgP63ROOM+nUATJkC2L5OQ7nwMg= kmodules.xyz/prober v0.29.0/go.mod h1:UtK+HKyI1lFLEKX+HFLyOCVju6TO93zv3kwGpzqmKOo= -kubestash.dev/apimachinery v0.6.0 h1:oKeY1PLLu8QfxTgOt7dFTgFx50x2OrEhbbyxu2rIGDg= -kubestash.dev/apimachinery v0.6.0/go.mod h1:ydCufCUC0IRLNKnnQZyvB7/afo3mwaHXL3Hbt4Plw9k= +kubestash.dev/apimachinery v0.7.0 h1:j0SbDAIAUmxDHEuEt81sPqVf6mbTnozhkvYCvP7VjIs= +kubestash.dev/apimachinery v0.7.0/go.mod h1:ydCufCUC0IRLNKnnQZyvB7/afo3mwaHXL3Hbt4Plw9k= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo= sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0= diff --git a/vendor/kubestash.dev/apimachinery/apis/addons/v1alpha1/zz_generated.deepcopy.go b/vendor/kubestash.dev/apimachinery/apis/addons/v1alpha1/zz_generated.deepcopy.go index 9c81f70b..970e34a2 100644 --- a/vendor/kubestash.dev/apimachinery/apis/addons/v1alpha1/zz_generated.deepcopy.go +++ b/vendor/kubestash.dev/apimachinery/apis/addons/v1alpha1/zz_generated.deepcopy.go @@ -1,4 +1,5 @@ //go:build !ignore_autogenerated +// +build !ignore_autogenerated /* Copyright AppsCode Inc. and Contributors diff --git a/vendor/kubestash.dev/apimachinery/apis/config/v1alpha1/zz_generated.deepcopy.go b/vendor/kubestash.dev/apimachinery/apis/config/v1alpha1/zz_generated.deepcopy.go index 3ef4a956..cb7105df 100644 --- a/vendor/kubestash.dev/apimachinery/apis/config/v1alpha1/zz_generated.deepcopy.go +++ b/vendor/kubestash.dev/apimachinery/apis/config/v1alpha1/zz_generated.deepcopy.go @@ -1,4 +1,5 @@ //go:build !ignore_autogenerated +// +build !ignore_autogenerated /* Copyright AppsCode Inc. and Contributors diff --git a/vendor/kubestash.dev/apimachinery/apis/core/v1alpha1/restoresession_helpers.go b/vendor/kubestash.dev/apimachinery/apis/core/v1alpha1/restoresession_helpers.go index 3ef22787..df970cf4 100644 --- a/vendor/kubestash.dev/apimachinery/apis/core/v1alpha1/restoresession_helpers.go +++ b/vendor/kubestash.dev/apimachinery/apis/core/v1alpha1/restoresession_helpers.go @@ -174,3 +174,10 @@ func (rs *RestoreSession) checkFailureInComponents() (bool, string) { return false, "" } + +func (rs *RestoreSession) GetDataSourceNamespace() string { + if rs.Spec.DataSource.Namespace == "" { + return rs.Namespace + } + return rs.Spec.DataSource.Namespace +} diff --git a/vendor/kubestash.dev/apimachinery/apis/core/v1alpha1/restoresession_types.go b/vendor/kubestash.dev/apimachinery/apis/core/v1alpha1/restoresession_types.go index 2c1914a8..635be51f 100644 --- a/vendor/kubestash.dev/apimachinery/apis/core/v1alpha1/restoresession_types.go +++ b/vendor/kubestash.dev/apimachinery/apis/core/v1alpha1/restoresession_types.go @@ -127,6 +127,9 @@ type KubeDBManifestOptions struct { // RestoreDataSource specifies the information about the data that will be restored type RestoreDataSource struct { + // Namespace specifies the namespace of the DataSource (i.e. Repository, Snapshot). + Namespace string `json:"namespace,omitempty"` + // Repository points to the Repository name from which the data will be restored Repository string `json:"repository,omitempty"` diff --git a/vendor/kubestash.dev/apimachinery/apis/core/v1alpha1/zz_generated.deepcopy.go b/vendor/kubestash.dev/apimachinery/apis/core/v1alpha1/zz_generated.deepcopy.go index 0cddc5b0..979cada8 100644 --- a/vendor/kubestash.dev/apimachinery/apis/core/v1alpha1/zz_generated.deepcopy.go +++ b/vendor/kubestash.dev/apimachinery/apis/core/v1alpha1/zz_generated.deepcopy.go @@ -1,4 +1,5 @@ //go:build !ignore_autogenerated +// +build !ignore_autogenerated /* Copyright AppsCode Inc. and Contributors diff --git a/vendor/kubestash.dev/apimachinery/apis/storage/v1alpha1/zz_generated.deepcopy.go b/vendor/kubestash.dev/apimachinery/apis/storage/v1alpha1/zz_generated.deepcopy.go index 37597074..4e97b1c9 100644 --- a/vendor/kubestash.dev/apimachinery/apis/storage/v1alpha1/zz_generated.deepcopy.go +++ b/vendor/kubestash.dev/apimachinery/apis/storage/v1alpha1/zz_generated.deepcopy.go @@ -1,4 +1,5 @@ //go:build !ignore_autogenerated +// +build !ignore_autogenerated /* Copyright AppsCode Inc. and Contributors diff --git a/vendor/kubestash.dev/apimachinery/apis/zz_generated.deepcopy.go b/vendor/kubestash.dev/apimachinery/apis/zz_generated.deepcopy.go index 40d4e350..6ee74efd 100644 --- a/vendor/kubestash.dev/apimachinery/apis/zz_generated.deepcopy.go +++ b/vendor/kubestash.dev/apimachinery/apis/zz_generated.deepcopy.go @@ -1,4 +1,5 @@ //go:build !ignore_autogenerated +// +build !ignore_autogenerated /* Copyright AppsCode Inc. and Contributors diff --git a/vendor/kubestash.dev/apimachinery/crds/core.kubestash.com_restoresessions.yaml b/vendor/kubestash.dev/apimachinery/crds/core.kubestash.com_restoresessions.yaml index 6706b5c3..c84f076b 100644 --- a/vendor/kubestash.dev/apimachinery/crds/core.kubestash.com_restoresessions.yaml +++ b/vendor/kubestash.dev/apimachinery/crds/core.kubestash.com_restoresessions.yaml @@ -12585,6 +12585,10 @@ spec: required: - name type: object + namespace: + description: Namespace specifies the namespace of the DataSource + (i.e. Repository, Snapshot). + type: string pitr: description: PITR stands for Point-In-Time Recovery. You can provide a target time instead of specifying a particular Snapshot. Stash diff --git a/vendor/modules.txt b/vendor/modules.txt index 3f7079fa..3918c934 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -829,7 +829,7 @@ kmodules.xyz/offshoot-api/api/v1 # kmodules.xyz/prober v0.29.0 ## explicit; go 1.21.5 kmodules.xyz/prober/api/v1 -# kubestash.dev/apimachinery v0.6.0 +# kubestash.dev/apimachinery v0.7.0 ## explicit; go 1.21.5 kubestash.dev/apimachinery/apis kubestash.dev/apimachinery/apis/addons/v1alpha1