Revert "feat(v3): add support for local registry templates" (#2678)

Revert "feat(v3): add support for local registry templates (#2672)"

This reverts commit 129dc03.

Author: sgalsaleh

api/controllers/app/install/controller.go

@@ -47,7 +47,6 @@ type InstallController struct {
 	clusterID                  string
 	airgapBundle               string
 	privateCACertConfigMapName string
-	registrySettings           *types.RegistrySettings
 }
 
 type InstallControllerOption func(*InstallController)
@@ -124,12 +123,6 @@ func WithAirgapBundle(airgapBundle string) InstallControllerOption {
 	}
 }
 
-func WithRegistrySettings(registrySettings *types.RegistrySettings) InstallControllerOption {
-	return func(c *InstallController) {
-		c.registrySettings = registrySettings
-	}
-}
-
 func WithPrivateCACertConfigMapName(configMapName string) InstallControllerOption {
 	return func(c *InstallController) {
 		c.privateCACertConfigMapName = configMapName
@@ -191,21 +184,13 @@ func NewInstallController(opts ...InstallControllerOption) (*InstallController,
 	}
 
 	if controller.appReleaseManager == nil {
-		var appReleaseManagerOpts []appreleasemanager.AppReleaseManagerOption
-		appReleaseManagerOpts = append(appReleaseManagerOpts,
+		appReleaseManager, err := appreleasemanager.NewAppReleaseManager(
+			*controller.releaseData.AppConfig,
 			appreleasemanager.WithLogger(controller.logger),
 			appreleasemanager.WithReleaseData(controller.releaseData),
 			appreleasemanager.WithLicense(license),
 			appreleasemanager.WithPrivateCACertConfigMapName(controller.privateCACertConfigMapName),
 		)
-
-		// Add registry settings if available
-		appReleaseManagerOpts = append(appReleaseManagerOpts, appreleasemanager.WithRegistrySettings(controller.registrySettings))
-
-		appReleaseManager, err := appreleasemanager.NewAppReleaseManager(
-			*controller.releaseData.AppConfig,
-			appReleaseManagerOpts...,
-		)
 		if err != nil {
 			return nil, fmt.Errorf("create app release manager: %w", err)
 		}

api/controllers/linux/install/controller.go

@@ -21,9 +21,7 @@ import (
 	"github.com/replicatedhq/embedded-cluster/pkg/metrics"
 	"github.com/replicatedhq/embedded-cluster/pkg/release"
 	"github.com/replicatedhq/embedded-cluster/pkg/runtimeconfig"
-	kotsv1beta1 "github.com/replicatedhq/kotskinds/apis/kots/v1beta1"
 	"github.com/sirupsen/logrus"
-	"sigs.k8s.io/yaml"
 )
 
 type Controller interface {
@@ -256,8 +254,7 @@ func NewInstallController(opts ...InstallControllerOption) (*InstallController,
 
 	// Initialize the app controller with the state machine first
 	if controller.InstallController == nil {
-		var appControllerOpts []appcontroller.InstallControllerOption
-		appControllerOpts = append(appControllerOpts,
+		appInstallController, err := appcontroller.NewInstallController(
 			appcontroller.WithStateMachine(controller.stateMachine),
 			appcontroller.WithLogger(controller.logger),
 			appcontroller.WithStore(controller.store),
@@ -268,24 +265,6 @@ func NewInstallController(opts ...InstallControllerOption) (*InstallController,
 			appcontroller.WithAirgapBundle(controller.airgapBundle),
 			appcontroller.WithPrivateCACertConfigMapName(adminconsole.PrivateCASConfigMapName), // Linux installations use the ConfigMap
 		)
-
-		// Detect registry settings and pass to app controller
-		var license *kotsv1beta1.License
-		if controller.license != nil {
-			// Parse license from bytes
-			var parsedLicense kotsv1beta1.License
-			if err := yaml.Unmarshal(controller.license, &parsedLicense); err != nil {
-				return nil, fmt.Errorf("failed to parse license data: %w", err)
-			}
-			license = &parsedLicense
-		}
-		registrySettings, err := controller.detectRegistrySettings(license)
-		if err != nil {
-			return nil, fmt.Errorf("failed to detect registry settings: %w", err)
-		}
-		appControllerOpts = append(appControllerOpts, appcontroller.WithRegistrySettings(registrySettings))
-
-		appInstallController, err := appcontroller.NewInstallController(appControllerOpts...)
 		if err != nil {
 			return nil, fmt.Errorf("create app install controller: %w", err)
 		}

api/controllers/linux/install/registry.go

@@ -26,7 +26,6 @@ type appReleaseManager struct {
 	license                    *kotsv1beta1.License
 	logger                     logrus.FieldLogger
 	privateCACertConfigMapName string
-	registrySettings           *types.RegistrySettings
 }
 
 type AppReleaseManagerOption func(*appReleaseManager)
@@ -55,12 +54,6 @@ func WithLicense(license *kotsv1beta1.License) AppReleaseManagerOption {
 	}
 }
 
-func WithRegistrySettings(registrySettings *types.RegistrySettings) AppReleaseManagerOption {
-	return func(m *appReleaseManager) {
-		m.registrySettings = registrySettings
-	}
-}
-
 func WithPrivateCACertConfigMapName(configMapName string) AppReleaseManagerOption {
 	return func(m *appReleaseManager) {
 		m.privateCACertConfigMapName = configMapName
@@ -86,17 +79,12 @@ func NewAppReleaseManager(config kotsv1beta1.Config, opts ...AppReleaseManagerOp
 	}
 
 	if manager.templateEngine == nil {
-		var templateOpts []template.EngineOption
-		templateOpts = append(templateOpts,
+		manager.templateEngine = template.NewEngine(
+			&manager.rawConfig,
 			template.WithLicense(manager.license),
 			template.WithReleaseData(manager.releaseData),
 			template.WithPrivateCACertConfigMapName(manager.privateCACertConfigMapName),
 		)
-
-		// Add registry settings if available
-		templateOpts = append(templateOpts, template.WithRegistrySettings(manager.registrySettings))
-
-		manager.templateEngine = template.NewEngine(&manager.rawConfig, templateOpts...)
 	}
 
 	return manager, nil

api/controllers/linux/install/registry_test.go

@@ -28,9 +28,6 @@ type Engine struct {
 	license     *kotsv1beta1.License
 	releaseData *release.ReleaseData
 
-	// Registry settings for template functions
-	registrySettings *types.RegistrySettings
-
 	// Internal state
 	configValues               types.AppConfigValues
 	prevConfigValues           types.AppConfigValues
@@ -64,12 +61,6 @@ func WithReleaseData(releaseData *release.ReleaseData) EngineOption {
 	}
 }
 
-func WithRegistrySettings(registrySettings *types.RegistrySettings) EngineOption {
-	return func(e *Engine) {
-		e.registrySettings = registrySettings
-	}
-}
-
 func WithPrivateCACertConfigMapName(configMapName string) EngineOption {
 	return func(e *Engine) {
 		e.privateCACertConfigMapName = configMapName

api/internal/managers/app/release/manager.go

@@ -168,13 +168,12 @@ func (e *Engine) getFuncMap() template.FuncMap {
 		"HumanSize":    e.humanSize,
 		"YamlEscape":   e.yamlEscape,
 
-		// Registry template functions
-		"HasLocalRegistry":       e.hasLocalRegistry,
-		"LocalRegistryHost":      e.localRegistryHost,
-		"LocalRegistryNamespace": e.localRegistryNamespace,
-		"LocalRegistryAddress":   e.localRegistryAddress,
-		"LocalImageName":         func() string { return "" }, // TODO: implement later
-		"ImagePullSecretName":    e.imagePullSecretName,
+		// TODO: implement
+		"HasLocalRegistry":       func() bool { return false },
+		"LocalRegistryHost":      func() string { return "" },
+		"LocalRegistryNamespace": func() string { return "" },
+		"LocalImageName":         func() string { return "" },
+		"ImagePullSecretName":    func() string { return "" },
 	}
 }
 
@@ -190,45 +189,3 @@ func (e *Engine) recordDependency(dependency string) {
 		}
 	}
 }
-
-// Registry template functions
-
-// hasLocalRegistry returns true when local registry is available
-func (e *Engine) hasLocalRegistry() bool {
-	if e.registrySettings == nil {
-		return false
-	}
-	return e.registrySettings.HasLocalRegistry
-}
-
-// localRegistryHost returns the registry host with port
-func (e *Engine) localRegistryHost() string {
-	if e.registrySettings == nil {
-		return ""
-	}
-	return e.registrySettings.Host
-}
-
-// localRegistryNamespace returns the namespace for the local registry
-func (e *Engine) localRegistryNamespace() string {
-	if e.registrySettings == nil {
-		return ""
-	}
-	return e.registrySettings.Namespace
-}
-
-// localRegistryAddress returns the full registry address with namespace prefix
-func (e *Engine) localRegistryAddress() string {
-	if e.registrySettings == nil {
-		return ""
-	}
-	return e.registrySettings.Address
-}
-
-// imagePullSecretName returns standardized secret name pattern
-func (e *Engine) imagePullSecretName() string {
-	if e.registrySettings == nil {
-		return ""
-	}
-	return e.registrySettings.ImagePullSecretName
-}