Skip to content

Commit 02ed11c

Browse files
sgajawada-pxsiva-portworx
authored andcommitted
PB-3588: ApplicationBackupSpec NamespaceSelector schema change from a map to the string
Signed-off-by: Santosh Kumar Gajawada <sgajawada@purestorage.com>
1 parent 8e2ffaf commit 02ed11c

30 files changed

Lines changed: 110 additions & 49 deletions

pkg/apis/stork/v1alpha1/applicationbackup.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ type ApplicationBackupSpec struct {
3333
PlatformCredential string `json:"platformCredential"`
3434
RancherProjects map[string]string `json:"rancherProjects"`
3535
Selectors map[string]string `json:"selectors"`
36-
NamespaceSelector map[string]string `json:"namespaceSelector"`
36+
NamespaceSelector string `json:"namespaceSelector"`
3737
PreExecRule string `json:"preExecRule"`
3838
PostExecRule string `json:"postExecRule"`
3939
ReclaimPolicy ApplicationBackupReclaimPolicyType `json:"reclaimPolicy"`

pkg/apis/stork/v1alpha1/zz_generated.deepcopy.go

Lines changed: 11 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/applicationmanager/controllers/applicationbackup.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ func (a *ApplicationBackupController) handle(ctx context.Context, backup *stork_
253253
return nil
254254
}
255255
if labelSelector := backup.Spec.NamespaceSelector; len(labelSelector) != 0 {
256-
namespaces, err := core.Instance().ListNamespaces(labelSelector)
256+
namespaces, err := core.Instance().ListNamespacesV2(labelSelector)
257257
if err != nil {
258258
errMsg := fmt.Sprintf("error listing namespaces with label selectors: %v, error: %v", labelSelector, err)
259259
log.ApplicationBackupLog(backup).Error(errMsg)

pkg/client/clientset/versioned/clientset.go

Lines changed: 31 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/client/clientset/versioned/fake/clientset_generated.go

Lines changed: 4 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/client/clientset/versioned/fake/register.go

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/client/clientset/versioned/scheme/register.go

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/client/clientset/versioned/typed/stork/v1alpha1/fake/fake_applicationbackup.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/client/clientset/versioned/typed/stork/v1alpha1/fake/fake_applicationbackupschedule.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/client/clientset/versioned/typed/stork/v1alpha1/fake/fake_applicationclone.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)