fix

Signed-off-by: dmitry.lopatin <[email protected]>
deckhouse · Oct 27, 2024 · 893e4d8 · 893e4d8
1 parent 8a9dbb5
commit 893e4d8
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 161 deletions.
diff --git a/images/virtualization-artifact/pkg/controller/vd/internal/inuse.go b/images/virtualization-artifact/pkg/controller/vd/internal/inuse.go
diff --git a/...ternal/validators/iso_source_validator.go → ...nternal/validator/iso_source_validator.go b/...ternal/validators/iso_source_validator.go → ...nternal/validator/iso_source_validator.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package validators
+package validator
 
 import (
 	"context"

diff --git a/...internal/validators/pvc_size_validator.go → .../internal/validator/pvc_size_validator.go b/...internal/validators/pvc_size_validator.go → .../internal/validator/pvc_size_validator.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package validators
+package validator
 
 import (
 	"context"

diff --git a/...rnal/validators/spec_changes_validator.go → ...ernal/validator/spec_changes_validator.go b/...rnal/validators/spec_changes_validator.go → ...ernal/validator/spec_changes_validator.go
@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package validators
+package validator
 
 import (
 	"context"

diff --git a/images/virtualization-artifact/pkg/controller/vd/vd_controller.go b/images/virtualization-artifact/pkg/controller/vd/vd_controller.go
@@ -82,7 +82,6 @@ func NewController(
 		internal.NewDeletionHandler(sources),
 		internal.NewAttacheeHandler(mgr.GetClient()),
 		internal.NewStatsHandler(stat, importer, uploader),
-		internal.NewInUseHandler(mgr.GetClient()),
 	)
 
 	vdController, err := controller.New(ControllerName, mgr, controller.Options{

diff --git a/images/virtualization-artifact/pkg/controller/vd/vd_webhook.go b/images/virtualization-artifact/pkg/controller/vd/vd_webhook.go
@@ -25,7 +25,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
 
-	"github.com/deckhouse/virtualization-controller/pkg/controller/vd/internal/validators"
+	"github.com/deckhouse/virtualization-controller/pkg/controller/vd/internal/validator"
 	"github.com/deckhouse/virtualization-controller/pkg/logger"
 	virtv2 "github.com/deckhouse/virtualization/api/core/v1alpha2"
 )
@@ -43,9 +43,9 @@ type Validator struct {
 func NewValidator(client client.Client, logger *slog.Logger) *Validator {
 	return &Validator{
 		validators: []VirtualDiskValidator{
-			validators.NewPVCSizeValidator(client),
-			validators.NewSpecChangesValidator(),
-			validators.NewISOSourceValidator(client),
+			validator.NewPVCSizeValidator(client),
+			validator.NewSpecChangesValidator(),
+			validator.NewISOSourceValidator(client),
 		},
 		logger: logger.With("webhook", "validator"),
 	}