Add EnableAdditionalECRAuth to Gitpod config

Author: csweichel

components/image-builder-api/go/config/config.go

@@ -45,7 +45,7 @@ type Configuration struct {
 	// EnableAdditionalECRAuth adds additional ECR auth using IRSA.
 	// This will attempt to add ECR auth for any ECR repo a user is
 	// trying to access.
-	EnableAdditionalECRAuth bool
+	EnableAdditionalECRAuth bool `json:"enableAdditionalECRAuth"`
 }
 
 type TLS struct {

install/installer/pkg/components/image-builder-mk3/configmap.go

@@ -55,6 +55,7 @@ func configmap(ctx *common.RenderContext) ([]runtime.Object, error) {
 		BaseImageRepository:      fmt.Sprintf("%s/base-images", registryName),
 		BuilderImage:             ctx.ImageName(ctx.Config.Repository, BuilderImage, ctx.VersionManifest.Components.ImageBuilderMk3.BuilderImage.Version),
 		WorkspaceImageRepository: fmt.Sprintf("%s/workspace-images", registryName),
+		EnableAdditionalECRAuth:  ctx.Config.ContainerRegistry.EnableAdditionalECRAuth,
 	}
 
 	workspaceImage := ctx.Config.Workspace.WorkspaceImage

install/installer/pkg/config/v1/config.go

@@ -258,10 +258,12 @@ const (
 )
 
 type ContainerRegistry struct {
-	InCluster                 *bool                      `json:"inCluster,omitempty" validate:"required"`
-	External                  *ContainerRegistryExternal `json:"external,omitempty" validate:"required_if=InCluster false"`
-	S3Storage                 *S3Storage                 `json:"s3storage,omitempty"`
-	PrivateBaseImageAllowList []string                   `json:"privateBaseImageAllowList"`
+	InCluster *bool                      `json:"inCluster,omitempty" validate:"required"`
+	External  *ContainerRegistryExternal `json:"external,omitempty" validate:"required_if=InCluster false"`
+	S3Storage *S3Storage                 `json:"s3storage,omitempty"`
+
+	PrivateBaseImageAllowList []string `json:"privateBaseImageAllowList"`
+	EnableAdditionalECRAuth   bool     `json:"enableAdditionalECRAuth"`
 }
 
 type ContainerRegistryExternal struct {