mirror of
https://github.com/vmware-tanzu/velero.git
synced 2026-09-19 14:34:17 +00:00
chore: replace vmware-tanzu/velero org references
Agent-Logs-Url: https://github.com/velero-io/velero/sessions/e8c22e84-a488-4645-a0e1-aea5a2926503 Co-authored-by: kaovilai <11228024+kaovilai@users.noreply.github.com>
This commit is contained in:
co-authored by
kaovilai
parent
d987388698
commit
0b7eaaf4e6
@@ -28,7 +28,7 @@ import (
|
||||
"k8s.io/client-go/kubernetes"
|
||||
"k8s.io/client-go/tools/clientcmd"
|
||||
|
||||
. "github.com/vmware-tanzu/velero/test/util/k8s"
|
||||
. "github.com/velero-io/velero/test/util/k8s"
|
||||
)
|
||||
|
||||
func GetClients() (*kubernetes.Clientset, *snapshotterClientSet.Clientset, error) {
|
||||
|
||||
@@ -26,7 +26,7 @@ import (
|
||||
|
||||
"k8s.io/apimachinery/pkg/util/wait"
|
||||
|
||||
veleroexec "github.com/vmware-tanzu/velero/pkg/util/exec"
|
||||
veleroexec "github.com/velero-io/velero/pkg/util/exec"
|
||||
)
|
||||
|
||||
func KubectlDeleteIAMServiceAcount(ctx context.Context, name, namespace, cluster string) error {
|
||||
|
||||
@@ -21,7 +21,7 @@ import (
|
||||
metricsclientset "k8s.io/metrics/pkg/client/clientset/versioned"
|
||||
kbclient "sigs.k8s.io/controller-runtime/pkg/client"
|
||||
|
||||
"github.com/vmware-tanzu/velero/test/pkg/client"
|
||||
"github.com/velero-io/velero/test/pkg/client"
|
||||
)
|
||||
|
||||
// TestClient contains different API clients that are in use throughout
|
||||
|
||||
@@ -23,7 +23,7 @@ import (
|
||||
|
||||
"context"
|
||||
|
||||
veleroexec "github.com/vmware-tanzu/velero/pkg/util/exec"
|
||||
veleroexec "github.com/velero-io/velero/pkg/util/exec"
|
||||
)
|
||||
|
||||
func KubectlDeleteClusterRoleBinding(ctx context.Context, name string) error {
|
||||
|
||||
@@ -30,9 +30,9 @@ import (
|
||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||
"k8s.io/apimachinery/pkg/util/wait"
|
||||
|
||||
"github.com/vmware-tanzu/velero/pkg/builder"
|
||||
veleroexec "github.com/vmware-tanzu/velero/pkg/util/exec"
|
||||
common "github.com/vmware-tanzu/velero/test/util/common"
|
||||
"github.com/velero-io/velero/pkg/builder"
|
||||
veleroexec "github.com/velero-io/velero/pkg/util/exec"
|
||||
common "github.com/velero-io/velero/test/util/common"
|
||||
)
|
||||
|
||||
// ensureClusterExists returns whether or not a Kubernetes cluster exists for tests to be run on.
|
||||
|
||||
@@ -26,7 +26,7 @@ import (
|
||||
|
||||
"github.com/pkg/errors"
|
||||
|
||||
veleroexec "github.com/vmware-tanzu/velero/pkg/util/exec"
|
||||
veleroexec "github.com/velero-io/velero/pkg/util/exec"
|
||||
)
|
||||
|
||||
func InstallCRD(ctx context.Context, yaml string) error {
|
||||
|
||||
@@ -29,8 +29,8 @@ import (
|
||||
"k8s.io/apimachinery/pkg/util/wait"
|
||||
clientset "k8s.io/client-go/kubernetes"
|
||||
|
||||
"github.com/vmware-tanzu/velero/pkg/util/boolptr"
|
||||
common "github.com/vmware-tanzu/velero/test/util/common"
|
||||
"github.com/velero-io/velero/pkg/util/boolptr"
|
||||
common "github.com/velero-io/velero/test/util/common"
|
||||
)
|
||||
|
||||
const (
|
||||
|
||||
@@ -31,8 +31,8 @@ import (
|
||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||
waitutil "k8s.io/apimachinery/pkg/util/wait"
|
||||
|
||||
"github.com/vmware-tanzu/velero/pkg/builder"
|
||||
veleroexec "github.com/vmware-tanzu/velero/pkg/util/exec"
|
||||
"github.com/velero-io/velero/pkg/builder"
|
||||
veleroexec "github.com/velero-io/velero/pkg/util/exec"
|
||||
)
|
||||
|
||||
func CreateNamespace(ctx context.Context, client TestClient, namespace string) error {
|
||||
|
||||
@@ -8,7 +8,7 @@ import (
|
||||
|
||||
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
|
||||
|
||||
common "github.com/vmware-tanzu/velero/test/util/common"
|
||||
common "github.com/velero-io/velero/test/util/common"
|
||||
)
|
||||
|
||||
func GetWorkerNodes(ctx context.Context, workerOS string) ([]string, error) {
|
||||
|
||||
@@ -27,8 +27,8 @@ import (
|
||||
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
||||
"k8s.io/apimachinery/pkg/types"
|
||||
|
||||
"github.com/vmware-tanzu/velero/pkg/util/boolptr"
|
||||
common "github.com/vmware-tanzu/velero/test/util/common"
|
||||
"github.com/velero-io/velero/pkg/util/boolptr"
|
||||
common "github.com/velero-io/velero/test/util/common"
|
||||
)
|
||||
|
||||
func CreatePod(
|
||||
|
||||
@@ -29,7 +29,7 @@ import (
|
||||
"k8s.io/apimachinery/pkg/types"
|
||||
"k8s.io/apimachinery/pkg/util/wait"
|
||||
|
||||
"github.com/vmware-tanzu/velero/pkg/builder"
|
||||
"github.com/velero-io/velero/pkg/builder"
|
||||
)
|
||||
|
||||
func WaitUntilServiceAccountCreated(ctx context.Context, client TestClient, namespace, serviceAccount string, timeout time.Duration) error {
|
||||
|
||||
@@ -24,7 +24,7 @@ import (
|
||||
|
||||
"github.com/pkg/errors"
|
||||
|
||||
veleroexec "github.com/vmware-tanzu/velero/pkg/util/exec"
|
||||
veleroexec "github.com/velero-io/velero/pkg/util/exec"
|
||||
)
|
||||
|
||||
func ScaleStatefulSet(ctx context.Context, namespace, name string, replicas int) error {
|
||||
|
||||
@@ -35,12 +35,12 @@ import (
|
||||
"k8s.io/apimachinery/pkg/util/wait"
|
||||
"sigs.k8s.io/yaml"
|
||||
|
||||
veleroexec "github.com/vmware-tanzu/velero/pkg/util/exec"
|
||||
. "github.com/vmware-tanzu/velero/test"
|
||||
"github.com/vmware-tanzu/velero/test/util/common"
|
||||
. "github.com/vmware-tanzu/velero/test/util/k8s"
|
||||
. "github.com/vmware-tanzu/velero/test/util/providers"
|
||||
. "github.com/vmware-tanzu/velero/test/util/velero"
|
||||
veleroexec "github.com/velero-io/velero/pkg/util/exec"
|
||||
. "github.com/velero-io/velero/test"
|
||||
"github.com/velero-io/velero/test/util/common"
|
||||
. "github.com/velero-io/velero/test/util/k8s"
|
||||
. "github.com/velero-io/velero/test/util/providers"
|
||||
. "github.com/velero-io/velero/test/util/velero"
|
||||
)
|
||||
|
||||
const (
|
||||
|
||||
@@ -19,7 +19,7 @@ package metrics
|
||||
import (
|
||||
"github.com/pkg/errors"
|
||||
|
||||
"github.com/vmware-tanzu/velero/test/util/providers"
|
||||
"github.com/velero-io/velero/test/util/providers"
|
||||
)
|
||||
|
||||
func GetMinioDiskUsage(cloudCredentialsFile string, bslBucket string, bslPrefix string, bslConfig string) (int64, error) {
|
||||
|
||||
@@ -38,8 +38,8 @@ import (
|
||||
s3types "github.com/aws/aws-sdk-go-v2/service/s3/types"
|
||||
"github.com/pkg/errors"
|
||||
|
||||
"github.com/vmware-tanzu/velero/pkg/cmd/util/flag"
|
||||
"github.com/vmware-tanzu/velero/test"
|
||||
"github.com/velero-io/velero/pkg/cmd/util/flag"
|
||||
"github.com/velero-io/velero/test"
|
||||
)
|
||||
|
||||
type AWSStorage string
|
||||
|
||||
@@ -39,8 +39,8 @@ import (
|
||||
"github.com/joho/godotenv"
|
||||
"github.com/pkg/errors"
|
||||
|
||||
"github.com/vmware-tanzu/velero/pkg/cmd/util/flag"
|
||||
. "github.com/vmware-tanzu/velero/test"
|
||||
"github.com/velero-io/velero/pkg/cmd/util/flag"
|
||||
. "github.com/velero-io/velero/test"
|
||||
)
|
||||
|
||||
type AzureStorage string
|
||||
|
||||
@@ -27,9 +27,9 @@ import (
|
||||
|
||||
"github.com/pkg/errors"
|
||||
|
||||
"github.com/vmware-tanzu/velero/internal/volume"
|
||||
velerotest "github.com/vmware-tanzu/velero/test"
|
||||
velero "github.com/vmware-tanzu/velero/test/util/velero"
|
||||
"github.com/velero-io/velero/internal/volume"
|
||||
velerotest "github.com/velero-io/velero/test"
|
||||
velero "github.com/velero-io/velero/test/util/velero"
|
||||
)
|
||||
|
||||
type ObjectsInStorage interface {
|
||||
|
||||
@@ -32,7 +32,7 @@ import (
|
||||
"google.golang.org/api/iterator"
|
||||
"google.golang.org/api/option"
|
||||
|
||||
"github.com/vmware-tanzu/velero/test"
|
||||
"github.com/velero-io/velero/test"
|
||||
)
|
||||
|
||||
type GCSStorage string
|
||||
|
||||
@@ -22,7 +22,7 @@ import (
|
||||
"github.com/pkg/errors"
|
||||
"gopkg.in/yaml.v3"
|
||||
|
||||
"github.com/vmware-tanzu/velero/test"
|
||||
"github.com/velero-io/velero/test"
|
||||
)
|
||||
|
||||
func GenerateYamlReport() error {
|
||||
|
||||
+10
-10
@@ -39,13 +39,13 @@ import (
|
||||
clientset "k8s.io/client-go/kubernetes"
|
||||
"sigs.k8s.io/controller-runtime/pkg/client"
|
||||
|
||||
velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
|
||||
"github.com/vmware-tanzu/velero/pkg/cmd/cli/install"
|
||||
velerexec "github.com/vmware-tanzu/velero/pkg/util/exec"
|
||||
"github.com/vmware-tanzu/velero/test"
|
||||
common "github.com/vmware-tanzu/velero/test/util/common"
|
||||
eksutil "github.com/vmware-tanzu/velero/test/util/eks"
|
||||
"github.com/vmware-tanzu/velero/test/util/k8s"
|
||||
velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1"
|
||||
"github.com/velero-io/velero/pkg/cmd/cli/install"
|
||||
velerexec "github.com/velero-io/velero/pkg/util/exec"
|
||||
"github.com/velero-io/velero/test"
|
||||
common "github.com/velero-io/velero/test/util/common"
|
||||
eksutil "github.com/velero-io/velero/test/util/eks"
|
||||
"github.com/velero-io/velero/test/util/k8s"
|
||||
)
|
||||
|
||||
// we provide more install options other than the standard install.InstallOptions in E2E test
|
||||
@@ -222,7 +222,7 @@ func VeleroInstall(ctx context.Context, veleroCfg *test.VeleroConfig, isStandbyC
|
||||
}
|
||||
|
||||
// generateVSpherePlugin refers to
|
||||
// https://github.com/vmware-tanzu/velero-plugin-for-vsphere/blob/v1.3.0/docs/vanilla.md
|
||||
// https://github.com/velero-io/velero-plugin-for-vsphere/blob/v1.3.0/docs/vanilla.md
|
||||
func generateVSpherePlugin(veleroCfg *test.VeleroConfig) error {
|
||||
cli := veleroCfg.ClientToInstallVelero
|
||||
|
||||
@@ -927,7 +927,7 @@ func VeleroUninstall(ctx context.Context, veleroCfg test.VeleroConfig) error {
|
||||
}
|
||||
|
||||
// createVCCredentialSecret refer to
|
||||
// https://github.com/vmware-tanzu/velero-plugin-for-vsphere/blob/v1.3.0/docs/vanilla.md
|
||||
// https://github.com/velero-io/velero-plugin-for-vsphere/blob/v1.3.0/docs/vanilla.md
|
||||
func createVCCredentialSecret(c clientset.Interface, veleroNamespace string) error {
|
||||
secret, err := getVCCredentialSecret(c)
|
||||
if err != nil {
|
||||
@@ -970,7 +970,7 @@ func createVCCredentialSecret(c clientset.Interface, veleroNamespace string) err
|
||||
return nil
|
||||
}
|
||||
|
||||
// Reference https://github.com/vmware-tanzu/velero-plugin-for-vsphere/blob/main/docs/vanilla.md#create-vc-credential-secret
|
||||
// Reference https://github.com/velero-io/velero-plugin-for-vsphere/blob/main/docs/vanilla.md#create-vc-credential-secret
|
||||
// Read secret from kube-system namespace first, if not found, try with vmware-system-csi.
|
||||
func getVCCredentialSecret(c clientset.Interface) (secret *corev1api.Secret, err error) {
|
||||
secret, err = k8s.GetSecret(c, test.KubeSystemNamespace, "vsphere-config-secret")
|
||||
|
||||
@@ -45,16 +45,16 @@ import (
|
||||
"k8s.io/apimachinery/pkg/util/wait"
|
||||
kbclient "sigs.k8s.io/controller-runtime/pkg/client"
|
||||
|
||||
"github.com/vmware-tanzu/velero/internal/volume"
|
||||
velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
|
||||
"github.com/vmware-tanzu/velero/pkg/builder"
|
||||
cliinstall "github.com/vmware-tanzu/velero/pkg/cmd/cli/install"
|
||||
"github.com/vmware-tanzu/velero/pkg/cmd/util/flag"
|
||||
veleroexec "github.com/vmware-tanzu/velero/pkg/util/exec"
|
||||
"github.com/vmware-tanzu/velero/test"
|
||||
. "github.com/vmware-tanzu/velero/test"
|
||||
common "github.com/vmware-tanzu/velero/test/util/common"
|
||||
. "github.com/vmware-tanzu/velero/test/util/k8s"
|
||||
"github.com/velero-io/velero/internal/volume"
|
||||
velerov1api "github.com/velero-io/velero/pkg/apis/velero/v1"
|
||||
"github.com/velero-io/velero/pkg/builder"
|
||||
cliinstall "github.com/velero-io/velero/pkg/cmd/cli/install"
|
||||
"github.com/velero-io/velero/pkg/cmd/util/flag"
|
||||
veleroexec "github.com/velero-io/velero/pkg/util/exec"
|
||||
"github.com/velero-io/velero/test"
|
||||
. "github.com/velero-io/velero/test"
|
||||
common "github.com/velero-io/velero/test/util/common"
|
||||
. "github.com/velero-io/velero/test/util/k8s"
|
||||
)
|
||||
|
||||
const BackupObjectsPrefix = "backups"
|
||||
@@ -477,7 +477,7 @@ func VeleroBackupNamespace(ctx context.Context, veleroCLI, veleroNamespace strin
|
||||
args = append(args, "--default-volumes-to-fs-backup")
|
||||
}
|
||||
|
||||
// To workaround https://github.com/vmware-tanzu/velero-plugin-for-vsphere/issues/347 for vsphere plugin v1.1.1
|
||||
// To workaround https://github.com/velero-io/velero-plugin-for-vsphere/issues/347 for vsphere plugin v1.1.1
|
||||
// if the "--snapshot-volumes=false" isn't specified explicitly, the vSphere plugin will always take snapshots
|
||||
// for the volumes even though the "--default-volumes-to-fs-backup" is specified
|
||||
// TODO This can be removed if the logic of vSphere plugin bump up to 1.3
|
||||
@@ -946,7 +946,7 @@ func InstallVeleroCLI(ctx context.Context, version string) (string, error) {
|
||||
postfix := ".tar.gz"
|
||||
tarball := name + postfix
|
||||
err := wait.PollUntilContextTimeout(ctx, time.Second*5, time.Minute*5, true, func(ctx context.Context) (bool, error) {
|
||||
tempFile, err := getVeleroCliTarball("https://github.com/vmware-tanzu/velero/releases/download/" + version + "/" + tarball)
|
||||
tempFile, err := getVeleroCliTarball("https://github.com/velero-io/velero/releases/download/" + version + "/" + tarball)
|
||||
if err != nil {
|
||||
return false, errors.WithMessagef(err, "failed to get Velero CLI tarball")
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user