Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revendor #5

Merged
merged 1 commit into from
Nov 14, 2023
Merged

Revendor #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ require (
k8s.io/utils v0.0.0-20220823124924-e9cbc92d1a73
kmodules.xyz/client-go v0.25.39
kmodules.xyz/offshoot-api v0.25.5-0.20231004063620-dff8fb030d57
kubestash.dev/apimachinery v0.2.0-rc.0.0.20231108063428-1f77f295ab66
kubestash.dev/apimachinery v0.2.0-rc.0.0.20231114115833-0b99d5ce666e
sigs.k8s.io/controller-runtime v0.13.1
)

Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1068,8 +1068,8 @@ kmodules.xyz/offshoot-api v0.25.5-0.20231004063620-dff8fb030d57 h1:4ld/ujZum5JX6
kmodules.xyz/offshoot-api v0.25.5-0.20231004063620-dff8fb030d57/go.mod h1:PUk4EuJFhhyQykCflHj7EgXcljGIqs9vi0IN0RpxtY4=
kmodules.xyz/prober v0.25.0 h1:R5uRLHJEvEtEoogj+vaTAob0Btph6+PX5IlS6hPh8PA=
kmodules.xyz/prober v0.25.0/go.mod h1:z4RTnjaajNQa/vPltsiOnO3xI716I/ziD2ac2Exm+1M=
kubestash.dev/apimachinery v0.2.0-rc.0.0.20231108063428-1f77f295ab66 h1:74EzeYcuF3Kt/I1LpdxrR+sBB8Lgw2VvvuPk9DJjC4I=
kubestash.dev/apimachinery v0.2.0-rc.0.0.20231108063428-1f77f295ab66/go.mod h1:zs0n13jnropI1rlNlFp0eWywKwa44YefeS4/JZo2QGY=
kubestash.dev/apimachinery v0.2.0-rc.0.0.20231114115833-0b99d5ce666e h1:Ya9b9/Z9E9kuB2zUyR4XWierZ9je5WdGuO2D4hN6D1Y=
kubestash.dev/apimachinery v0.2.0-rc.0.0.20231114115833-0b99d5ce666e/go.mod h1:vlT+qYeOTh5GjzdKw9qhJlXxS+PvvVZivm+l7y+OUIs=
rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
Expand Down
2 changes: 1 addition & 1 deletion pkg/clone_pvc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@ func (opt *storageOption) newBackupConfig() *coreapi.BackupConfiguration {
Backends: []coreapi.BackendReference{
{
Name: opt.storage.Name,
StorageRef: kmapi.ObjectReference{
StorageRef: &kmapi.ObjectReference{
Name: opt.storage.Name,
Namespace: opt.storage.Namespace,
},
Expand Down
2 changes: 1 addition & 1 deletion vendor/kubestash.dev/apimachinery/apis/core/v1alpha1/backupblueprint_webhook.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ func (r *BackupBlueprint) validateBackendsAgainstUsagePolicy(ctx context.Context
return nil
}

func (r *BackupBlueprint) getBackupStorage(ctx context.Context, c client.Client, ref kmapi.ObjectReference) (*storageapi.BackupStorage, error) {
func (r *BackupBlueprint) getBackupStorage(ctx context.Context, c client.Client, ref *kmapi.ObjectReference) (*storageapi.BackupStorage, error) {
bs := &storageapi.BackupStorage{
ObjectMeta: v1.ObjectMeta{
Name: ref.Name,
Expand Down
2 changes: 1 addition & 1 deletion vendor/kubestash.dev/apimachinery/apis/core/v1alpha1/backupconfiguration_helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ func (b *BackupConfiguration) backendsReady() bool {
func (b *BackupConfiguration) GetStorageRef(backend string) *kmapi.ObjectReference {
for _, b := range b.Spec.Backends {
if b.Name == backend {
return &b.StorageRef
return b.StorageRef
}
}
return nil
Expand Down
2 changes: 1 addition & 1 deletion vendor/kubestash.dev/apimachinery/apis/core/v1alpha1/backupconfiguration_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ type BackendReference struct {
// StorageRef refers to the CR that holds the information of a storage.
// You can refer to the BackupStorage CR of a different namespace as long as it is allowed
// by the `usagePolicy` of the BackupStorage.`
StorageRef kmapi.ObjectReference `json:"storageRef,omitempty"`
StorageRef *kmapi.ObjectReference `json:"storageRef,omitempty"`

// RetentionPolicy refers to a RetentionPolicy CRs which defines how to cleanup the old Snapshots.
// This field is optional. If you don't provide this field, Stash will use the default RetentionPolicy for
Expand Down
Loading
Loading