Should pass across imageVersions to educates component.

GrahamDumpleton · Sep 18, 2024 · bfd4c96 · bfd4c96
1 parent 7d32622
commit bfd4c96
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 17 deletions.
diff --git a/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/custom/educates.lib.yaml b/carvel-packages/installer/bundle/config/ytt/_ytt_lib/infrastructure/custom/educates.lib.yaml
@@ -182,4 +182,6 @@ imageRegistry:
   host: #@ data.values.imageRegistry.host
 #@ if/end hasattr(data.values, "version") and data.values.version != None:
 version: #@ data.values.version
+#@ if/end hasattr(data.values, "imageVersions") and data.values.imageVersions != None:
+imageVersions: #@ data.values.imageVersions
 #@ end
diff --git a/client-programs/pkg/cmd/admin_platform_config_cmd.go b/client-programs/pkg/cmd/admin_platform_config_cmd.go
@@ -2,7 +2,6 @@ package cmd
 
 import (
 	"fmt"
-	"strings"
 
 	"github.com/spf13/cobra"
 
@@ -58,16 +57,16 @@ func (o *PlatformConfigOptions) Run() error {
 			return err
 		}
 
-		fullConfig.Version = o.Version
+		// fullConfig.Version = o.Version
 
 		// Set image registry host and namespace by splitting the package
 		// repository into host and namespace. That is split on the first '/'.
 
-		imageRepositoryHost := strings.SplitN(o.PackageRepository, "/", 2)[0]
-		imageRepositoryNamespace := strings.SplitN(o.PackageRepository, "/", 2)[1]
+		// imageRepositoryHost := strings.SplitN(o.PackageRepository, "/", 2)[0]
+		// imageRepositoryNamespace := strings.SplitN(o.PackageRepository, "/", 2)[1]
 
-		fullConfig.ImageRegistry.Host = imageRepositoryHost
-		fullConfig.ImageRegistry.Namespace = imageRepositoryNamespace
+		// fullConfig.ImageRegistry.Host = imageRepositoryHost
+		// fullConfig.ImageRegistry.Namespace = imageRepositoryNamespace
 
 		config.PrintConfigToStdout(fullConfig)
 	}

diff --git a/client-programs/pkg/cmd/admin_platform_deploy_cmd.go b/client-programs/pkg/cmd/admin_platform_deploy_cmd.go
@@ -2,7 +2,6 @@ package cmd
 
 import (
 	"fmt"
-	"strings"
 
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
@@ -73,16 +72,16 @@ func (o *PlatformDeployOptions) Run() error {
 		return err
 	}
 
-	fullConfig.Version = o.Version
+	// fullConfig.Version = o.Version
 
 	// Set image registry host and namespace by splitting the package
 	// repository into host and namespace. That is split on the first '/'.
 
-	imageRepositoryHost := strings.SplitN(o.PackageRepository, "/", 2)[0]
-	imageRepositoryNamespace := strings.SplitN(o.PackageRepository, "/", 2)[1]
+	// imageRepositoryHost := strings.SplitN(o.PackageRepository, "/", 2)[0]
+	// imageRepositoryNamespace := strings.SplitN(o.PackageRepository, "/", 2)[1]
 
-	fullConfig.ImageRegistry.Host = imageRepositoryHost
-	fullConfig.ImageRegistry.Namespace = imageRepositoryNamespace
+	// fullConfig.ImageRegistry.Host = imageRepositoryHost
+	// fullConfig.ImageRegistry.Namespace = imageRepositoryNamespace
 
 	if o.DryRun {
 		if err = installer.DryRun(o.Version, o.PackageRepository, fullConfig, o.Verbose, false, o.skipImageResolution); err != nil {

diff --git a/client-programs/pkg/installer/installer.go b/client-programs/pkg/installer/installer.go
@@ -269,12 +269,12 @@ func (inst *Installer) template(tempDir string, inputDir string, fullConfig *con
 
 	kbldFiles := []*files.File{}
 	// TODO: Revisit when this needs to be used
-	if !skipImageResolution {
-		kbldFiles, err = files.NewSortedFilesFromPaths([]string{filepath.Join(inputDir, "kbld/kbld-images.yaml")}, files.SymlinkAllowOpts{})
-		if err != nil {
-			return "", err
-		}
+	// if !skipImageResolution {
+	kbldFiles, err = files.NewSortedFilesFromPaths([]string{filepath.Join(inputDir, "kbld/kbld-images.yaml")}, files.SymlinkAllowOpts{})
+	if err != nil {
+		return "", err
 	}
+	// }
 
 	opts.DataValuesFlags = cmdtpl.DataValuesFlags{
 		FromFiles: []string{"values", "images"},