++ linters

Signed-off-by: Ivan Mikheykin <[email protected]>

Author: diafour

.dmtlint.yaml

@@ -47,19 +47,19 @@ linters-settings:
         - cdi-sa
         - kubevirt-internal-virtualization-controller
         - kubevirt-internal-virtualization-handler
-  module:
-    exclude-rules:
-      license:
-        files:
-          - images/hooks/cmd/virtualization-module-hooks/register-ee.go
-          - images/hooks/pkg/hooks/tls-certificates-audit/hook.go
-        directories:
-          - test/
-          - api/client/generated
-          - hack/
-          - images/
-          - tools/
-  images:
-    # CDI patches are soon to be phased out by moving them to 3p repo
-    patches:
-      disable: true
+#  module:
+#    exclude-rules:
+#      license:
+#        files:
+#          - images/hooks/cmd/virtualization-module-hooks/register-ee.go
+#          - images/hooks/pkg/hooks/tls-certificates-audit/hook.go
+#        directories:
+#          - test/
+#          - api/client/generated
+#          - hack/
+#          - images/
+#          - tools/
+#  images:
+#    # CDI patches are soon to be phased out by moving them to 3p repo
+#    patches:
+#      disable: true

images/dvcr-artifact/cmd/dvcr-cleaner/cmd/kubernetes/termination_log.go

@@ -1,3 +1,19 @@
+/*
+Copyright 2025 Flant JSC
+
+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 kubernetes
 
 import (

images/dvcr-artifact/cmd/dvcr-cleaner/cmd/storage/stats.go

@@ -1,3 +1,19 @@
+/*
+Copyright 2025 Flant JSC
+
+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 storage
 
 type FSInfo struct {

images/dvcr-artifact/go.mod

@@ -17,7 +17,10 @@ require (
 	github.com/prometheus/client_golang v1.19.0
 	github.com/prometheus/client_model v0.6.0
 	github.com/spf13/cobra v1.8.1
+	github.com/spf13/pflag v1.0.5
 	golang.org/x/sync v0.14.0
+	golang.org/x/sys v0.33.0
+	k8s.io/apimachinery v0.30.2
 	k8s.io/klog/v2 v2.120.1
 	kubevirt.io/containerized-data-importer v0.0.0-00010101000000-000000000000
 	kubevirt.io/containerized-data-importer-api v1.60.3
@@ -64,9 +67,11 @@ require (
 	github.com/googleapis/enterprise-certificate-proxy v0.3.2 // indirect
 	github.com/googleapis/gax-go/v2 v2.12.0 // indirect
 	github.com/gorilla/mux v1.8.1 // indirect
+	github.com/gorilla/websocket v1.5.0 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-cleanhttp v0.5.2
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
+	github.com/imdario/mergo v0.3.16 // indirect
 	github.com/jmespath/go-jmespath v0.4.0 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
@@ -95,7 +100,6 @@ require (
 	github.com/prometheus/common v0.51.1 // indirect
 	github.com/prometheus/procfs v0.15.1 // indirect
 	github.com/sirupsen/logrus v1.9.3 // indirect
-	github.com/spf13/pflag v1.0.5 // indirect
 	github.com/syndtr/gocapability v0.0.0-20200815063812-42c35b437635 // indirect
 	github.com/ulikunitz/xz v0.5.15 // indirect
 	github.com/vbatts/tar-split v0.11.5 // indirect
@@ -110,7 +114,6 @@ require (
 	golang.org/x/exp v0.0.0-20240613232115-7f521ea00fb8 // indirect
 	golang.org/x/net v0.26.0 // indirect
 	golang.org/x/oauth2 v0.27.0 // indirect
-	golang.org/x/sys v0.33.0 // indirect
 	golang.org/x/term v0.32.0 // indirect
 	golang.org/x/text v0.25.0 // indirect
 	golang.org/x/time v0.5.0 // indirect
@@ -125,7 +128,6 @@ require (
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	k8s.io/api v0.30.2 // indirect
 	k8s.io/apiextensions-apiserver v0.30.2 // indirect
-	k8s.io/apimachinery v0.30.2 // indirect
 	k8s.io/apiserver v0.30.2 // indirect
 	k8s.io/client-go v8.0.0+incompatible // indirect
 	k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect

images/dvcr-artifact/go.sum

@@ -203,6 +203,8 @@ github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB7
 github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY=
 github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ=
 github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
+github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
+github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=
 github.com/hashicorp/errwrap v1.1.0 h1:OxrOeh75EUXMY8TBjag2fzXGZ40LB6IKw45YeGUDY2I=
 github.com/hashicorp/errwrap v1.1.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4=

images/virtualization-artifact/pkg/controller/dvcr-maintenance/dvcr_maintenance_controller.go

@@ -27,6 +27,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/manager"
 
 	"github.com/deckhouse/deckhouse/pkg/log"
+	"github.com/deckhouse/virtualization-controller/pkg/controller/dvcr-maintenance/internal"
 	"github.com/deckhouse/virtualization-controller/pkg/controller/gc"
 	"github.com/deckhouse/virtualization-controller/pkg/dvcr"
 	"github.com/deckhouse/virtualization-controller/pkg/logger"
@@ -68,8 +69,8 @@ func NewController(
 		return nil, err
 	}
 
-	// Not an elegant solution, but it is easier to setup cron watch here.
-	cronSource, err := gc.NewCronSource(dvcr.CleanupSchedule, gc.NewSingleObjectLister(ns, "dvcr"), log)
+	// Not an elegant solution, but it is easier to setup cron watch here, than in internal/watcher package.
+	cronSource, err := gc.NewCronSource(dvcr.AutoCleanupSchedule, gc.NewSingleObjectLister(ns, "dvcr"), log)
 	if err != nil {
 		return nil, fmt.Errorf("setup DVCR cleanup cron source: %w", err)
 	}

images/virtualization-artifact/pkg/controller/dvcr-maintenance/dvcr_maintenance_reconciler.go

@@ -77,7 +77,9 @@ func (r *Reconciler) Reconcile(ctx context.Context, req reconcile.Request) (reco
 func (r *Reconciler) SetupController(_ context.Context, mgr manager.Manager, ctr controller.Controller) error {
 	for _, w := range []Watcher{
 		watcher.NewDVCRDeploymentWatcher(mgr.GetClient()),
-		watcher.NewCronWatcher(),
+		// watcher.NewVirtualImageWatcher(mgr.GetClient()),
+		// watcher.NewVirtualDiskWatcher(mgr.GetClient()),
+		// watcher.NewClusterVirtualImageWatcher(mgr.GetClient()),
 	} {
 		err := w.Watch(mgr, ctr)
 		if err != nil {

images/virtualization-artifact/pkg/controller/dvcr-maintenance/internal/watcher/cron.go

@@ -17,7 +17,7 @@ data:
 {{- if eq (include "dvcr.isMaintenance" . ) "true" }}
       maintenance:
         readonly: true
-{{- else }}
+{{- end }}
     http:
       addr: :5000
       headers: