From 1efd533d0dc53ed6a63447750677d844e4ae4918 Mon Sep 17 00:00:00 2001 From: yanggang Date: Thu, 19 Oct 2023 13:59:42 +0100 Subject: [PATCH] Fix wrong logs in markDataDownloadsCancel() and add missiong license file. Signed-off-by: yanggang --- pkg/builder/delete_backup_request_builder.go | 16 ++++++++++++++++ pkg/builder/item_operation_builder.go | 16 ++++++++++++++++ pkg/builder/node_selector_builder.go | 16 ++++++++++++++++ pkg/builder/pod_volume_restore_builder.go | 16 ++++++++++++++++ pkg/cmd/server/server.go | 4 ++-- pkg/plugin/framework/common/plugin_kinds.go | 2 +- 6 files changed, 67 insertions(+), 3 deletions(-) diff --git a/pkg/builder/delete_backup_request_builder.go b/pkg/builder/delete_backup_request_builder.go index 4788795a3..c0dfdbdbf 100644 --- a/pkg/builder/delete_backup_request_builder.go +++ b/pkg/builder/delete_backup_request_builder.go @@ -1,3 +1,19 @@ +/* +Copyright 2023 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 builder import ( diff --git a/pkg/builder/item_operation_builder.go b/pkg/builder/item_operation_builder.go index 8ca9d7506..210752b82 100644 --- a/pkg/builder/item_operation_builder.go +++ b/pkg/builder/item_operation_builder.go @@ -1,3 +1,19 @@ +/* +Copyright 2023 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 builder import ( diff --git a/pkg/builder/node_selector_builder.go b/pkg/builder/node_selector_builder.go index 11ce306b5..558be1657 100644 --- a/pkg/builder/node_selector_builder.go +++ b/pkg/builder/node_selector_builder.go @@ -1,3 +1,19 @@ +/* +Copyright 2023 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 builder import corev1api "k8s.io/api/core/v1" diff --git a/pkg/builder/pod_volume_restore_builder.go b/pkg/builder/pod_volume_restore_builder.go index c131a0384..3d4da94d6 100644 --- a/pkg/builder/pod_volume_restore_builder.go +++ b/pkg/builder/pod_volume_restore_builder.go @@ -1,3 +1,19 @@ +/* +Copyright 2023 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 builder import ( diff --git a/pkg/cmd/server/server.go b/pkg/cmd/server/server.go index bde964aad..8c2d982e9 100644 --- a/pkg/cmd/server/server.go +++ b/pkg/cmd/server/server.go @@ -239,7 +239,7 @@ func NewCommand(f client.Factory) *cobra.Command { command.Flags().DurationVar(&config.resourceTimeout, "resource-timeout", config.resourceTimeout, "How long to wait for resource processes which are not covered by other specific timeout parameters. Default is 10 minutes.") command.Flags().IntVar(&config.maxConcurrentK8SConnections, "max-concurrent-k8s-connections", config.maxConcurrentK8SConnections, "Max concurrent connections number that Velero can create with kube-apiserver. Default is 30.") command.Flags().BoolVar(&config.defaultSnapshotMoveData, "default-snapshot-move-data", config.defaultSnapshotMoveData, "Move data by default for all snapshots supporting data movement.") - command.Flags().BoolVar(&config.disableInformerCache, "disable-informer-cache", config.disableInformerCache, "Disable informer cache for Get calls on restore. WIth this enabled, it will speed up restore in cases where there are backup resources which already exist in the cluster, but for very large clusters this will increase velero memory usage. Default is false (don't disable).") + command.Flags().BoolVar(&config.disableInformerCache, "disable-informer-cache", config.disableInformerCache, "Disable informer cache for Get calls on restore. With this enabled, it will speed up restore in cases where there are backup resources which already exist in the cluster, but for very large clusters this will increase velero memory usage. Default is false (don't disable).") return command } @@ -1151,7 +1151,7 @@ func markDataDownloadsCancel(ctx context.Context, client ctrlclient.Client, rest }) if err != nil { - log.WithError(errors.WithStack(err)).Errorf("failed to mark dataupload %q cancel", dd.GetName()) + log.WithError(errors.WithStack(err)).Errorf("failed to mark datadownload %q cancel", dd.GetName()) continue } log.WithField("datadownload", dd.GetName()).Warn(dd.Status.Message) diff --git a/pkg/plugin/framework/common/plugin_kinds.go b/pkg/plugin/framework/common/plugin_kinds.go index 5cb06b930..83cbcef31 100644 --- a/pkg/plugin/framework/common/plugin_kinds.go +++ b/pkg/plugin/framework/common/plugin_kinds.go @@ -41,7 +41,7 @@ const ( // PluginKindRestoreItemAction represents a restore item action plugin. PluginKindRestoreItemAction PluginKind = "RestoreItemAction" - // PluginKindRestoreItemAction represents a v2 restore item action plugin. + // PluginKindRestoreItemActionV2 represents a v2 restore item action plugin. PluginKindRestoreItemActionV2 PluginKind = "RestoreItemActionV2" // PluginKindDeleteItemAction represents a delete item action plugin.