vmware-tanzu
/
velero
mirror of https://github.com/vmware-tanzu/velero.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Remove legacy label version check, to be added back when version is known 

Signed-off-by: Tiger Kaovilai <tkaovila@redhat.com>
pull/6712/head
Tiger Kaovilai 2023-08-28 11:08:22 -04:00
parent f6e8c208ad
commit c5aad9e488
No known key found for this signature in database
GPG Key ID: F05DADBB55627443
2 changed files with 2 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/discovery/helper.go
View File

@ -312,11 +312,3 @@ func (h *helper) ServerVersion() *version.Info {
defer h.lock.RUnlock() defer h.lock.RUnlock()
return h.serverVersion return h.serverVersion
} }
func ServerVersion(logger logrus.FieldLogger) (*version.Info, error) {
discoveryHelper, err := NewHelper(&discovery.DiscoveryClient{}, logger)
if err != nil {
return nil, err
}
return discoveryHelper.ServerVersion(), nil
}

26
pkg/restore/job_action.go
View File

@ -17,15 +17,12 @@ limitations under the License.
package restore package restore
import ( import (
"strconv"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
batchv1api "k8s.io/api/batch/v1" batchv1api "k8s.io/api/batch/v1"
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"github.com/vmware-tanzu/velero/pkg/discovery"
"github.com/vmware-tanzu/velero/pkg/plugin/velero" "github.com/vmware-tanzu/velero/pkg/plugin/velero"
) )
@ -54,35 +51,12 @@ func (a *JobAction) Execute(input *velero.RestoreItemActionExecuteInput) (*veler
return nil, errors.WithStack(err) return nil, errors.WithStack(err)
} }
// get kube version
serverVersion, err := discovery.ServerVersion(a.logger)
if err != nil {
return nil, errors.WithStack(err)
}
// if kube version < 1.27, use legacy controller-uid label
majorVersion, err := strconv.Atoi(serverVersion.Major)
if err != nil {
return nil, errors.WithStack(err)
}
minorVersion, err := strconv.Atoi(serverVersion.Minor)
if err != nil {
return nil, errors.WithStack(err)
}
deleteLegacyControllerUIDLabel := false
if majorVersion < 1 || (majorVersion == 1 && minorVersion <= 27) {
deleteLegacyControllerUIDLabel = true
}
if job.Spec.Selector != nil { if job.Spec.Selector != nil {
delete(job.Spec.Selector.MatchLabels, controllerUIDLabel) delete(job.Spec.Selector.MatchLabels, controllerUIDLabel)
if deleteLegacyControllerUIDLabel {
delete(job.Spec.Selector.MatchLabels, legacyControllerUIDLabel) delete(job.Spec.Selector.MatchLabels, legacyControllerUIDLabel)
} }
}
delete(job.Spec.Template.ObjectMeta.Labels, controllerUIDLabel) delete(job.Spec.Template.ObjectMeta.Labels, controllerUIDLabel)
if deleteLegacyControllerUIDLabel {
delete(job.Spec.Template.ObjectMeta.Labels, legacyControllerUIDLabel) delete(job.Spec.Template.ObjectMeta.Labels, legacyControllerUIDLabel)
}
res, err := runtime.DefaultUnstructuredConverter.ToUnstructured(job) res, err := runtime.DefaultUnstructuredConverter.ToUnstructured(job)
if err != nil { if err != nil {