Merge branch 'release/2.6.11'

educates · Sep 17, 2023 · e2f0abf · e2f0abf
2 parents f0a13b1 + 6514541
commit e2f0abf
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 10 deletions.
diff --git a/client-programs/pkg/cmd/docker_workshop_deploy_cmd.go b/client-programs/pkg/cmd/docker_workshop_deploy_cmd.go
@@ -650,6 +650,7 @@ func generateVendirFilesConfig(workshop *unstructured.Unstructured, name string,
 			vendirConfigString = strings.ReplaceAll(vendirConfigString, "$(image_repository)", repository)
 			vendirConfigString = strings.ReplaceAll(vendirConfigString, "$(workshop_name)", name)
 			vendirConfigString = strings.ReplaceAll(vendirConfigString, "$(workshop_version)", workshopVersion)
+			vendirConfigString = strings.ReplaceAll(vendirConfigString, "$(platform_arch)", runtime.GOARCH)
 
 			vendirConfigs = append(vendirConfigs, vendirConfigString)
 		}

diff --git a/client-programs/pkg/cmd/workshop_publish_cmd.go b/client-programs/pkg/cmd/workshop_publish_cmd.go
@@ -24,8 +24,6 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/serializer"
 	"k8s.io/kubectl/pkg/scheme"
-
-	"github.com/vmware-tanzu-labs/educates-training-platform/client-programs/pkg/registry"
 )
 
 type FilesPublishOptions struct {
@@ -59,14 +57,6 @@ func (o *FilesPublishOptions) Run(args []string) error {
 		return errors.New("workshop directory does not exist or path is not a directory")
 	}
 
-	if o.Repository == "localhost:5001" {
-		err = registry.DeployRegistry()
-
-		if err != nil {
-			return errors.Wrap(err, "failed to deploy registry")
-		}
-	}
-
 	return o.Publish(directory)
 }