change func name and repository description

Signed-off-by: Ming <mqiu@vmware.com>
This commit is contained in:
Ming
2022-05-09 13:52:43 +08:00
parent 752b28166f
commit ef7e5a8388
6 changed files with 5 additions and 7 deletions

View File

@@ -23,9 +23,6 @@ spec:
name: v1
schema:
openAPIV3Schema:
description: TODO(2.0) After converting all resources to use the runtime-controller
client, the genclient and k8s:deepcopy markers will no longer be needed
and should be removed.
properties:
apiVersion:
description: 'APIVersion defines the versioned schema of this representation

File diff suppressed because one or more lines are too long

View File

@@ -73,6 +73,7 @@ type ResticRepositoryStatus struct {
// +kubebuilder:storageversion
// +kubebuilder:subresource:status
// +kubebuilder:printcolumn:name="Age",type="date",JSONPath=".metadata.creationTimestamp"
type ResticRepository struct {
metav1.TypeMeta `json:",inline"`

View File

@@ -792,7 +792,7 @@ func (s *server) runControllers(defaultVolumeSnapshotLocations map[string]string
s.logger.Fatal(err, "unable to create controller", "controller", controller.Schedule)
}
if err := controller.NewResticRepoConciler(s.namespace, s.logger, s.mgr.GetClient(), s.config.defaultResticMaintenanceFrequency, s.resticManager).SetupWithManager(s.mgr); err != nil {
if err := controller.NewResticRepoReconciler(s.namespace, s.logger, s.mgr.GetClient(), s.config.defaultResticMaintenanceFrequency, s.resticManager).SetupWithManager(s.mgr); err != nil {
s.logger.Fatal(err, "unable to create controller", "controller", controller.ResticRepo)
}

View File

@@ -49,7 +49,7 @@ type ResticRepoReconciler struct {
repositoryManager restic.RepositoryManager
}
func NewResticRepoConciler(namespace string, logger logrus.FieldLogger, client client.Client,
func NewResticRepoReconciler(namespace string, logger logrus.FieldLogger, client client.Client,
defaultMaintenanceFrequency time.Duration, repositoryManager restic.RepositoryManager) *ResticRepoReconciler {
c := &ResticRepoReconciler{
client,

View File

@@ -36,7 +36,7 @@ func mockResticRepoReconciler(t *testing.T, rr *velerov1api.ResticRepository, mo
if mockOn != "" {
mgr.On(mockOn, arg).Return(ret)
}
return NewResticRepoConciler(
return NewResticRepoReconciler(
velerov1api.DefaultNamespace,
velerotest.NewLogger(),
velerotest.NewFakeControllerRuntimeClient(t),