Fix nested images

acorn-io · Jul 1, 2022 · 7c3709e · 7c3709e
1 parent af7282d
commit 7c3709e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/pkg/controller/appdefinition/acorn.go b/pkg/controller/appdefinition/acorn.go
@@ -45,7 +45,7 @@ func toPublishPortBinding(portDef v1.PortDef) v1.PortBinding {
 }
 
 func toAcorn(appInstance *v1.AppInstance, tag name.Reference, pullSecrets *PullSecrets, acornName string, acorn v1.Acorn) *v1.AppInstance {
-	image := resolveTagForAcorn(tag, appInstance.Namespace, acorn.Image)
+	image := resolveTagForAcorn(tag, appInstance.Labels[labels.AcornRootNamespace], acorn.Image)
 
 	// Ensure secret gets copied
 	pullSecrets.ForAcorn(acornName, image)

diff --git a/pkg/controller/appdefinition/deploy.go b/pkg/controller/appdefinition/deploy.go
@@ -45,7 +45,7 @@ func DeploySpec(req router.Request, resp router.Response) (err error) {
 		}
 	}()
 
-	tag, err := pull.GetTag(req.Ctx, req.Client, appInstance.Namespace, appInstance.Spec.Image)
+	tag, err := pull.GetTag(req.Ctx, req.Client, appInstance.Labels[labels.AcornRootNamespace], appInstance.Spec.Image)
 	if err != nil {
 		return err
 	}