refactor

Signed-off-by: Yaroslav Borbat <yaroslav.borbat@flant.com>

Author: yaroslavborbat

images/virtualization-artifact/Taskfile.yaml

@@ -7,6 +7,9 @@ includes:
   api:
     taskfile: ../../api/Taskfile.dist.yaml
     dir: ../../api
+  config:
+    taskfile: pkg/config/apis/Taskfile.yaml
+    dir: pkg/config/apis
 
 vars:
   BaseNamespace: d8-virtualization

images/virtualization-artifact/cmd/virtualization-controller/app/app.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 app
 
 import (

images/virtualization-artifact/cmd/virtualization-controller/app/controller.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 app
 
 import (
@@ -34,19 +50,48 @@ var controllers = map[string]func(
 	virtualizationClient kubeclient.Client,
 ) error{
 	cvi.ControllerName: func(ctx context.Context, mgr manager.Manager, log *log.Logger, configuration *componentconfig.VirtualizationControllerConfiguration, virtualizationClient kubeclient.Client) error {
-		_, err := cvi.NewController(ctx, mgr, log, configuration.Spec.ImportSettings.ImporterImage, configuration.Spec.ImportSettings.UploaderImage, configuration.Spec.ImportSettings.Requirements, config.ToLegacyDVCR(configuration), configuration.Spec.Namespace)
+		_, err := cvi.NewController(ctx,
+			mgr,
+			log,
+			configuration.Spec.ImportSettings.ImporterImage,
+			configuration.Spec.ImportSettings.UploaderImage,
+			configuration.Spec.ImportSettings.Requirements,
+			config.ToLegacyDVCR(configuration),
+			configuration.Spec.Namespace)
 		return err
 	},
 	vd.ControllerName: func(ctx context.Context, mgr manager.Manager, log *log.Logger, configuration *componentconfig.VirtualizationControllerConfiguration, virtualizationClient kubeclient.Client) error {
-		_, err := vd.NewController(ctx, mgr, log, configuration.Spec.ImportSettings.ImporterImage, configuration.Spec.ImportSettings.UploaderImage, configuration.Spec.ImportSettings.Requirements, config.ToLegacyDVCR(configuration), config.ToLegacyVirtualDiskStorageClassSettings(configuration))
+		_, err := vd.NewController(
+			ctx,
+			mgr,
+			log,
+			configuration.Spec.ImportSettings.ImporterImage,
+			configuration.Spec.ImportSettings.UploaderImage,
+			configuration.Spec.ImportSettings.Requirements,
+			config.ToLegacyDVCR(configuration),
+			config.ToLegacyVirtualDiskStorageClassSettings(configuration))
 		return err
 	},
 	vi.ControllerName: func(ctx context.Context, mgr manager.Manager, log *log.Logger, configuration *componentconfig.VirtualizationControllerConfiguration, virtualizationClient kubeclient.Client) error {
-		_, err := vi.NewController(ctx, mgr, log, configuration.Spec.ImportSettings.ImporterImage, configuration.Spec.ImportSettings.UploaderImage, configuration.Spec.ImportSettings.BounderImage, configuration.Spec.ImportSettings.Requirements, config.ToLegacyDVCR(configuration), config.ToLegacyVirtualImageStorageClassSettings(configuration))
+		_, err := vi.NewController(
+			ctx,
+			mgr,
+			log,
+			configuration.Spec.ImportSettings.ImporterImage,
+			configuration.Spec.ImportSettings.UploaderImage,
+			configuration.Spec.ImportSettings.BounderImage,
+			configuration.Spec.ImportSettings.Requirements,
+			config.ToLegacyDVCR(configuration),
+			config.ToLegacyVirtualImageStorageClassSettings(configuration))
 		return err
 	},
 	vm.ControllerName: func(ctx context.Context, mgr manager.Manager, log *log.Logger, configuration *componentconfig.VirtualizationControllerConfiguration, virtualizationClient kubeclient.Client) error {
-		return vm.SetupController(ctx, mgr, log, config.ToLegacyDVCR(configuration), configuration.Spec.FirmwareImage)
+		return vm.SetupController(
+			ctx,
+			mgr,
+			log,
+			config.ToLegacyDVCR(configuration),
+			configuration.Spec.FirmwareImage)
 	},
 	vm.GCVMMigrationControllerName: func(ctx context.Context, mgr manager.Manager, log *log.Logger, configuration *componentconfig.VirtualizationControllerConfiguration, virtualizationClient kubeclient.Client) error {
 		return vm.SetupGC(mgr, log, configuration.Spec.GarbageCollector.VMIMigration)

images/virtualization-artifact/cmd/virtualization-controller/app/scheme.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 app
 
 import (

images/virtualization-artifact/cmd/virtualization-controller/main.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 main
 
 import (

images/virtualization-artifact/pkg/config/apis/componentconfig/doc.go

@@ -1,2 +1,18 @@
+/*
+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.
+*/
+
 // +k8s:deepcopy-gen=package,register
 package componentconfig

images/virtualization-artifact/pkg/config/apis/componentconfig/generated/openapi/zz_generated.openapi.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 componentconfig
 
 import (

images/virtualization-artifact/pkg/config/apis/componentconfig/register.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 componentconfig
 
 import (
@@ -24,6 +40,7 @@ type VirtualizationControllerConfigurationSpec struct {
 	VirtualDiskStorageClassSettings         VirtualDiskStorageClassSettings
 	ImportSettings                          ImportSettings
 	DVCR                                    DVCR
+	Ingress                                 Ingress
 }
 
 type GarbageCollector struct {
@@ -57,23 +74,16 @@ type ImportSettings struct {
 type DVCR struct {
 	// AuthSecret is a name of the Secret with docker authentication.
 	AuthSecret string
-	// AuthSecretNamespace is a namespace for the AuthSecret.
-	AuthSecretNamespace string
 	// CertsSecret is a name of the TLS Secret with DVCR certificates (only CA cert is used).
 	CertsSecret string
-	// CertsSecretNamespace is a namespace for the CertsSecret.
-	CertsSecretNamespace string
 	// RegistryURL is a registry hostname with optional endpoint.
 	RegistryURL string
 	// InsecureTLS specifies if registry is insecure (trust all certificates). Works for destination only.
-	InsecureTLS string
-	// UploaderIngressSettings are settings for uploading images to the DVCR using ingress.
-	UploaderIngressSettings UploaderIngressSettings
+	InsecureTLS bool
 }
 
-type UploaderIngressSettings struct {
-	Host               string
-	TLSSecret          string
-	TLSSecretNamespace string
-	Class              string
+type Ingress struct {
+	Host      string
+	TLSSecret string
+	Class     string
 }

images/virtualization-artifact/pkg/config/apis/componentconfig/types.go

@@ -0,0 +1,23 @@
+/*
+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 v1alpha1
+
+import "k8s.io/apimachinery/pkg/runtime"
+
+func addDefaultingFuncs(scheme *runtime.Scheme) error {
+	return nil
+}