mirror of
https://github.com/vmware-tanzu/velero.git
synced 2026-09-13 11:34:54 +00:00
Max Freedom PollardandGitHub
4c007c0af4
Run the E2E test on kind / setup-test-matrix (push) Failing after 4s
e2e-test-kind.yaml / extract (push) Failing after 6s
Run the E2E test on kind / get-go-version (push) Failing after 7s
Run the E2E test on kind / build (push) Skipped
Run the E2E test on kind / run-e2e-test (push) Skipped
push.yml / extract (push) Failing after 6s
Main CI / get-go-version (push) Failing after 8s
Main CI / Build (push) Skipped
Scorecard supply-chain security / Scorecard analysis (push) Skipped
* Scope schedule and repo CLI list calls to the Velero namespace velero schedule get, velero schedule describe, velero schedule pause/unpause and velero repo get built a ctrlclient.ListOptions with a LabelSelector but no Namespace, so the list ran across every namespace in the cluster. Their single-name paths in the same functions already scope to f.Namespace(), and every sibling command (backup get, restore get, backup describe, restore describe, snapshot-location get, schedule delete) passes Namespace too, so the omission was an oversight rather than intent. The read commands print another installation's Schedules and BackupRepositories. runPause is worse: velero schedule pause --all and velero schedule unpause --all fetch Schedules from every namespace and then write Spec.Paused on each, so pausing one installation's schedules pauses every other installation's schedules as well. Add Namespace: f.Namespace() to the four List calls: pkg/cmd/cli/schedule/get.go:61 pkg/cmd/cli/schedule/describe.go:59 pkg/cmd/cli/schedule/pause.go:114 pkg/cmd/cli/repo/get.go:61 Neither pkg/cmd/cli/schedule nor pkg/cmd/cli/repo had any tests, so the regression tests are new files. Each seeds a fake client with one object in the Velero namespace and one in another-velero, and asserts the second is neither listed, described, nor paused. Signed-off-by: Max Freedom Pollard <272618364+MaxFreedomPollard@users.noreply.github.com> * Add changelog for PR 10482 Signed-off-by: Max Freedom Pollard <272618364+MaxFreedomPollard@users.noreply.github.com> --------- Signed-off-by: Max Freedom Pollard <272618364+MaxFreedomPollard@users.noreply.github.com>
77 lines
2.3 KiB
Go
77 lines
2.3 KiB
Go
/*
|
|
Copyright 2020 the Velero contributors.
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
you may not use this file except in compliance with the License.
|
|
You may obtain a copy of the License at
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
See the License for the specific language governing permissions and
|
|
limitations under the License.
|
|
*/
|
|
|
|
package repo
|
|
|
|
import (
|
|
"context"
|
|
|
|
"github.com/spf13/cobra"
|
|
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
|
"k8s.io/apimachinery/pkg/labels"
|
|
ctrlclient "sigs.k8s.io/controller-runtime/pkg/client"
|
|
|
|
api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
|
|
"github.com/vmware-tanzu/velero/pkg/client"
|
|
"github.com/vmware-tanzu/velero/pkg/cmd"
|
|
"github.com/vmware-tanzu/velero/pkg/cmd/cli"
|
|
"github.com/vmware-tanzu/velero/pkg/cmd/util/output"
|
|
)
|
|
|
|
func NewGetCommand(f client.Factory, use string) *cobra.Command {
|
|
var listOptions metav1.ListOptions
|
|
|
|
c := &cobra.Command{
|
|
Use: use,
|
|
Short: "Get repositories",
|
|
Run: func(c *cobra.Command, args []string) {
|
|
err := output.ValidateFlags(c)
|
|
cmd.CheckError(err)
|
|
|
|
crClient, err := f.KubebuilderClient()
|
|
cmd.CheckError(err)
|
|
|
|
repos := new(api.BackupRepositoryList)
|
|
if len(args) > 0 {
|
|
for _, name := range args {
|
|
repo := new(api.BackupRepository)
|
|
err := crClient.Get(context.TODO(), ctrlclient.ObjectKey{Namespace: f.Namespace(), Name: name}, repo)
|
|
cmd.CheckError(err)
|
|
repos.Items = append(repos.Items, *repo)
|
|
}
|
|
} else {
|
|
selector := labels.NewSelector()
|
|
if listOptions.LabelSelector != "" {
|
|
selector, err = labels.Parse(listOptions.LabelSelector)
|
|
cmd.CheckError(err)
|
|
}
|
|
err = crClient.List(context.TODO(), repos, &ctrlclient.ListOptions{LabelSelector: selector, Namespace: f.Namespace()})
|
|
cmd.CheckError(err)
|
|
}
|
|
|
|
_, err = output.PrintWithFormat(c, repos)
|
|
cmd.CheckError(err)
|
|
},
|
|
}
|
|
|
|
c.ValidArgsFunction = cli.CompleteBackupRepositoryNames(f)
|
|
c.Flags().StringVarP(&listOptions.LabelSelector, "selector", "l", listOptions.LabelSelector, "Only show items matching this label selector.")
|
|
|
|
output.BindFlags(c.Flags())
|
|
|
|
return c
|
|
}
|