Enable logged out byoc with custom ecr without v3key injection

Author: LucilleH

launchpad/publish.go

@@ -114,6 +114,7 @@ type PublishPlan struct {
 
 type PublishOutput struct {
 	Duration        time.Duration
+	Registry        *ImageRegistry
 	publishedImages map[string]string
 }
 
@@ -129,6 +130,10 @@ func (p *PublishImagePlan) remoteImageNameWithLatestTag() string {
 	return fmt.Sprintf("%s:%s", p.remoteImageName, "latest")
 }
 
+func (ir *ImageRegistry) GetHost() registryHost {
+	return ir.host
+}
+
 func (o *PublishOutput) DidPublish() bool {
 	if o == nil {
 		return false
@@ -472,7 +477,10 @@ func (p *Pad) publishDockerImage(
 		published[image.localImage.String()] = image.remoteImageNameWithTag()
 	}
 
-	return &PublishOutput{publishedImages: published}, nil
+	return &PublishOutput{
+		publishedImages: published,
+		Registry:        plan.registry,
+	}, nil
 }
 
 func makePublishPlan(

padcli/command/deploy.go

@@ -63,6 +63,7 @@ func makeDeployOptions(
 		helm.NewImageProvider(
 			buildOutput.Image.String(),
 			publishOutput.PublishedImages(),
+			string(publishOutput.Registry.GetHost()),
 		),
 		jetCfg,
 		cluster,
@@ -83,7 +84,6 @@ func makeDeployOptions(
 	if err := hvc.Compute(ctx); err != nil {
 		return nil, errors.Wrap(err, "failed to compute helm values")
 	}
-
 	appValues, err := cmdOpts.Hooks().PostAppChartValuesCompute(
 		ctx,
 		cmdOpts,
@@ -92,7 +92,6 @@ func makeDeployOptions(
 	if err != nil {
 		return nil, err
 	}
-
 	runtimeValues, err := cmdOpts.Hooks().PostRuntimeChartValuesCompute(
 		ctx,
 		cmdOpts,

padcli/helm/helm.go

@@ -63,6 +63,10 @@ func (hvc *ValueComputer) RuntimeValues() map[string]any {
 	return hvc.runtimeValues
 }
 
+func (hvc *ValueComputer) ImageProvider() *ImageProvider {
+	return hvc.imageProvider
+}
+
 // Compute converts command options to helm values.
 func (hvc *ValueComputer) Compute(ctx context.Context) error {
 	hvc.appValues = map[string]any{}

padcli/helm/images.go

@@ -10,20 +10,28 @@ type ImageProvider struct {
 	// Should include tag if it exists
 	defaultLocalImage string
 
+	imageRegistryHost string
+
 	// For published images, key is local image, value is published image
 	imagePublishMap map[string]string
 }
 
 func NewImageProvider(
 	defaultLocalImage string,
 	imagePublishMap map[string]string,
+	imageRegistryHost string,
 ) *ImageProvider {
 	return &ImageProvider{
 		defaultLocalImage: defaultLocalImage,
 		imagePublishMap:   imagePublishMap,
+		imageRegistryHost: imageRegistryHost,
 	}
 }
 
+func (i *ImageProvider) GetRegistryHost() string {
+	return i.imageRegistryHost
+}
+
 func (i *ImageProvider) get(c provider.Cluster, img string) string {
 	if i == nil {
 		return img