mirror of
https://github.com/vmware-tanzu/velero.git
synced 2026-10-22 06:13:00 +00:00
* Migrate VolumeGroupSnapshot API from v1beta2 to v1 Signed-off-by: Prasad Joshi <prajoshi@redhat.com> * Add changelog Signed-off-by: Prasad Joshi <prajoshi@redhat.com> * Detect VolumeGroupSnapshot API version at runtime Velero hardcoded the VolumeGroupSnapshot (VGS) API version, so VGS backup and restore failed on clusters that serve a different version than Velero expects. For example OCP 5.0 serves only groupsnapshot.storage.k8s.io/v1 and OCP 4.22 serves only v1beta1, while Velero targeted a single version and failed with "no matches for kind" on the others. Detect the served VGS API version at runtime via the discovery client (preferring v1 > v1beta2 > v1beta1) and perform all VGS, VGSClass and VGSContent I/O through the dynamic client, converting to and from the canonical v1 typed structs. The controller-runtime typed client cannot negotiate versions because it sends the GVK of the Go type, so the dynamic client is used at the I/O boundary instead. Owner-reference matching is now version-independent (Kind and UID), since the CSI controller stamps refs with whatever version the cluster serves. This builds on the v1 migration and external-snapshotter client bump from the previous commits. Signed-off-by: Shubham Pampattiwar <spampatt@redhat.com> * Add changelog for VGS runtime version detection Signed-off-by: Shubham Pampattiwar <spampatt@redhat.com> * docs: VGS supports v1/v1beta2/v1beta1 via runtime detection Signed-off-by: Shubham Pampattiwar <spampatt@redhat.com> * Remove superseded changelog for #10600 (covered by #10601) Signed-off-by: Shubham Pampattiwar <spampatt@redhat.com> * Use crClient + unstructured for VGS access instead of a dynamic client Address review feedback: rather than a dedicated VGSClient wrapping dynamic.Interface + discovery.DiscoveryInterface, perform all VolumeGroupSnapshot I/O through the existing controller-runtime client with *unstructured.Unstructured. The object's GVK is stamped to the served version and controller-runtime routes it via its RESTMapper, giving the same multi-version behavior (v1/v1beta2/v1beta1) that the typed client cannot. This removes the extra client plumbing: no constructor signature changes to NewRestoreFinalizerReconciler or server.go, no Factory DynamicClient/DiscoveryClient mock churn, and no separate fake client package. The version is resolved from the client's RESTMapper (preferring v1 > v1beta2 > v1beta1), and the helpers convert to and from the canonical v1 typed structs. Signed-off-by: Shubham Pampattiwar <spampatt@redhat.com> --------- Signed-off-by: Prasad Joshi <prajoshi@redhat.com> Signed-off-by: Shubham Pampattiwar <spampatt@redhat.com> Co-authored-by: Prasad Joshi <prajoshi@redhat.com>
259 lines
8.4 KiB
Go
259 lines
8.4 KiB
Go
/*
|
|
Copyright 2017, 2019 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 client
|
|
|
|
import (
|
|
"os"
|
|
|
|
volumegroupsnapshotv1 "github.com/kubernetes-csi/external-snapshotter/client/v8/apis/volumegroupsnapshot/v1"
|
|
|
|
apiextv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
|
|
apiextv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
|
|
"k8s.io/client-go/discovery"
|
|
k8scheme "k8s.io/client-go/kubernetes/scheme"
|
|
kbclient "sigs.k8s.io/controller-runtime/pkg/client"
|
|
|
|
"github.com/cockroachdb/errors"
|
|
snapshotv1api "github.com/kubernetes-csi/external-snapshotter/client/v8/apis/volumesnapshot/v1"
|
|
"github.com/spf13/pflag"
|
|
"k8s.io/apimachinery/pkg/runtime"
|
|
"k8s.io/client-go/dynamic"
|
|
"k8s.io/client-go/kubernetes"
|
|
"k8s.io/client-go/rest"
|
|
|
|
velerov1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v1"
|
|
velerov2alpha1api "github.com/vmware-tanzu/velero/pkg/apis/velero/v2alpha1"
|
|
)
|
|
|
|
//go:generate mockery --name Factory
|
|
|
|
// Factory knows how to create a VeleroClient and Kubernetes client.
|
|
type Factory interface {
|
|
// BindFlags binds common flags (--kubeconfig, --namespace) to the passed-in FlagSet.
|
|
BindFlags(flags *pflag.FlagSet)
|
|
// KubeClient returns a Kubernetes client. It uses the following priority to specify the cluster
|
|
// configuration: --kubeconfig flag, KUBECONFIG environment variable, in-cluster configuration.
|
|
KubeClient() (kubernetes.Interface, error)
|
|
// DynamicClient returns a Kubernetes dynamic client. It uses the following priority to specify the cluster
|
|
// configuration: --kubeconfig flag, KUBECONFIG environment variable, in-cluster configuration.
|
|
DynamicClient() (dynamic.Interface, error)
|
|
// KubebuilderClient returns a client for the controller runtime framework. It adds Kubernetes and Velero
|
|
// types to its scheme. It uses the following priority to specify the cluster
|
|
// configuration: --kubeconfig flag, KUBECONFIG environment variable, in-cluster configuration.
|
|
KubebuilderClient() (kbclient.Client, error)
|
|
// KubebuilderWatchClient returns a client with watcher for the controller runtime framework.
|
|
// It adds Kubernetes and Velero types to its scheme. It uses the following priority to specify the cluster
|
|
// configuration: --kubeconfig flag, KUBECONFIG environment variable, in-cluster configuration.
|
|
KubebuilderWatchClient() (kbclient.WithWatch, error)
|
|
// DiscoveryClient returns a Kubernetes discovery client. It uses the following priority to specify the cluster
|
|
// configuration: --kubeconfig flag, KUBECONFIG environment variable, in-cluster configuration.
|
|
DiscoveryClient() (discovery.AggregatedDiscoveryInterface, error)
|
|
// SetBasename changes the basename for an already-constructed client.
|
|
// This is useful for generating clients that require a different user-agent string below the root `velero`
|
|
// command, such as the server subcommand.
|
|
SetBasename(string)
|
|
// SetClientQPS sets the Queries Per Second for a client.
|
|
SetClientQPS(float32)
|
|
// SetClientBurst sets the Burst for a client.
|
|
SetClientBurst(int)
|
|
// ClientConfig returns a rest.Config struct used for client-go clients.
|
|
ClientConfig() (*rest.Config, error)
|
|
// Namespace returns the namespace which the Factory will create clients for.
|
|
Namespace() string
|
|
}
|
|
|
|
type factory struct {
|
|
flags *pflag.FlagSet
|
|
kubeconfig string
|
|
kubecontext string
|
|
baseName string
|
|
namespace string
|
|
namespaceMode string
|
|
clientQPS float32
|
|
clientBurst int
|
|
}
|
|
|
|
// NewFactory returns a Factory.
|
|
func NewFactory(baseName string, config VeleroConfig) Factory {
|
|
f := &factory{
|
|
flags: pflag.NewFlagSet("", pflag.ContinueOnError),
|
|
baseName: baseName,
|
|
namespaceMode: config.NamespaceMode(),
|
|
}
|
|
|
|
f.namespace = os.Getenv("VELERO_NAMESPACE")
|
|
if config.Namespace() != "" {
|
|
f.namespace = config.Namespace()
|
|
}
|
|
|
|
// We didn't get the namespace via env var or config file, so use the default.
|
|
// Command line flags will override when BindFlags is called.
|
|
if f.namespace == "" {
|
|
f.namespace = velerov1api.DefaultNamespace
|
|
}
|
|
|
|
f.flags.StringVar(&f.kubeconfig, "kubeconfig", "", "Path to the kubeconfig file to use to talk to the Kubernetes apiserver. If unset, try the environment variable KUBECONFIG, as well as in-cluster configuration")
|
|
f.flags.StringVarP(&f.namespace, "namespace", "n", f.namespace, "The namespace in which Velero should operate")
|
|
f.flags.StringVar(&f.kubecontext, "kubecontext", "", "The context to use to talk to the Kubernetes apiserver. If unset defaults to whatever your current-context is (kubectl config current-context)")
|
|
return f
|
|
}
|
|
|
|
func (f *factory) BindFlags(flags *pflag.FlagSet) {
|
|
flags.AddFlagSet(f.flags)
|
|
}
|
|
|
|
func (f *factory) ClientConfig() (*rest.Config, error) {
|
|
return Config(f.kubeconfig, f.kubecontext, f.baseName, f.clientQPS, f.clientBurst)
|
|
}
|
|
|
|
func (f *factory) KubeClient() (kubernetes.Interface, error) {
|
|
clientConfig, err := f.ClientConfig()
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
kubeClient, err := kubernetes.NewForConfig(clientConfig)
|
|
|
|
if err != nil {
|
|
return nil, errors.WithStack(err)
|
|
}
|
|
return kubeClient, nil
|
|
}
|
|
|
|
func (f *factory) DynamicClient() (dynamic.Interface, error) {
|
|
clientConfig, err := f.ClientConfig()
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
dynamicClient, err := dynamic.NewForConfig(clientConfig)
|
|
if err != nil {
|
|
return nil, errors.WithStack(err)
|
|
}
|
|
return dynamicClient, nil
|
|
}
|
|
|
|
func (f *factory) KubebuilderClient() (kbclient.Client, error) {
|
|
clientConfig, err := f.ClientConfig()
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
scheme := runtime.NewScheme()
|
|
if err := velerov1api.AddToScheme(scheme); err != nil {
|
|
return nil, err
|
|
}
|
|
if err := velerov2alpha1api.AddToScheme(scheme); err != nil {
|
|
return nil, err
|
|
}
|
|
if err := k8scheme.AddToScheme(scheme); err != nil {
|
|
return nil, err
|
|
}
|
|
if err := apiextv1beta1.AddToScheme(scheme); err != nil {
|
|
return nil, err
|
|
}
|
|
if err := apiextv1.AddToScheme(scheme); err != nil {
|
|
return nil, err
|
|
}
|
|
if err := snapshotv1api.AddToScheme(scheme); err != nil {
|
|
return nil, err
|
|
}
|
|
if err := volumegroupsnapshotv1.AddToScheme(scheme); err != nil {
|
|
return nil, err
|
|
}
|
|
kubebuilderClient, err := kbclient.New(clientConfig, kbclient.Options{
|
|
Scheme: scheme,
|
|
})
|
|
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return kubebuilderClient, nil
|
|
}
|
|
|
|
func (f *factory) KubebuilderWatchClient() (kbclient.WithWatch, error) {
|
|
clientConfig, err := f.ClientConfig()
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
scheme := runtime.NewScheme()
|
|
if err := velerov1api.AddToScheme(scheme); err != nil {
|
|
return nil, err
|
|
}
|
|
if err := velerov2alpha1api.AddToScheme(scheme); err != nil {
|
|
return nil, err
|
|
}
|
|
if err := k8scheme.AddToScheme(scheme); err != nil {
|
|
return nil, err
|
|
}
|
|
if err := apiextv1beta1.AddToScheme(scheme); err != nil {
|
|
return nil, err
|
|
}
|
|
if err := apiextv1.AddToScheme(scheme); err != nil {
|
|
return nil, err
|
|
}
|
|
if err := snapshotv1api.AddToScheme(scheme); err != nil {
|
|
return nil, err
|
|
}
|
|
if err := volumegroupsnapshotv1.AddToScheme(scheme); err != nil {
|
|
return nil, err
|
|
}
|
|
kubebuilderWatchClient, err := kbclient.NewWithWatch(clientConfig, kbclient.Options{
|
|
Scheme: scheme,
|
|
})
|
|
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return kubebuilderWatchClient, nil
|
|
}
|
|
|
|
func (f *factory) DiscoveryClient() (discovery.AggregatedDiscoveryInterface, error) {
|
|
clientConfig, err := f.ClientConfig()
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return discovery.NewDiscoveryClientForConfig(clientConfig)
|
|
}
|
|
|
|
func (f *factory) SetBasename(name string) {
|
|
f.baseName = name
|
|
}
|
|
|
|
func (f *factory) SetClientQPS(qps float32) {
|
|
f.clientQPS = qps
|
|
}
|
|
|
|
func (f *factory) SetClientBurst(burst int) {
|
|
f.clientBurst = burst
|
|
}
|
|
|
|
func (f *factory) Namespace() string {
|
|
// In auto mode, the namespace is resolved from the current kubeconfig context on every
|
|
// call, unless the caller explicitly overrode it with --namespace or VELERO_NAMESPACE.
|
|
if f.namespaceMode == NamespaceModeAuto &&
|
|
!f.flags.Changed("namespace") &&
|
|
os.Getenv("VELERO_NAMESPACE") == "" {
|
|
if namespace, err := NamespaceFromKubeContext(f.kubeconfig, f.kubecontext); err == nil && namespace != "" {
|
|
return namespace
|
|
}
|
|
}
|
|
|
|
return f.namespace
|
|
}
|