Merge pull request #1572 from ibuildthecloud/main

Change container name to match app public name

Author: ibuildthecloud

integration/log/log_test.go

@@ -196,5 +196,5 @@ func TestSidecarContainerLog(t *testing.T) {
 
 	sort.Strings(lines)
 	assert.Equal(t, "line 1-3\nline 1-4", strings.Join(lines, "\n"))
-	assert.Len(t, strings.Split(replicas[1].Name, "."), 3)
+	assert.Len(t, strings.Split(replicas[1].Name, ":"), 2)
 }

pkg/buildclient/filesyncclient.go

@@ -6,6 +6,7 @@ import (
 	"io"
 	"os"
 	"path/filepath"
+	"strings"
 
 	"github.com/moby/buildkit/session/filesync"
 	"github.com/sirupsen/logrus"
@@ -125,7 +126,11 @@ func prepareSyncedDirs(localDirs map[string]string, dirNames []string, followPat
 					}
 					f := filepath.Join(d, followPath)
 					if _, err := os.Stat(f); os.IsNotExist(err) {
-						err := os.MkdirAll(f, 0755)
+						if strings.Contains(f, "*") || strings.Contains(f, "?") {
+							err = nil
+						} else {
+							err = os.MkdirAll(f, 0755)
+						}
 						if err != nil {
 							return nil, err
 						}

pkg/controller/appdefinition/acorn.go

@@ -37,6 +37,7 @@ func toAcorns(appInstance *v1.AppInstance, tag name.Reference, pullSecrets *Pull
 			Labels:              service.Labels,
 			Annotations:         service.Annotations,
 			Image:               service.Image,
+			Build:               service.Build,
 			DeployArgs:          service.ServiceArgs,
 			Environment:         service.Environment,
 			Secrets:             service.Secrets,
@@ -72,6 +73,11 @@ func toAcorn(appInstance *v1.AppInstance, tag name.Reference, pullSecrets *PullS
 		image = strings.TrimPrefix(acorn.Image, "sha256:")
 	}
 
+	originalImage := acorn.Image
+	if acorn.Build != nil && acorn.Build.OriginalImage != "" {
+		originalImage = acorn.Build.OriginalImage
+	}
+
 	// Ensure secret gets copied
 	pullSecrets.ForAcorn(acornName, image)
 
@@ -83,10 +89,13 @@ func toAcorn(appInstance *v1.AppInstance, tag name.Reference, pullSecrets *PullS
 
 	acornInstance := &v1.AppInstance{
 		ObjectMeta: metav1.ObjectMeta{
-			Name:        name2.SafeHashConcatName(appInstance.Name, acornName),
-			Namespace:   appInstance.Namespace,
-			Labels:      labelMap,
-			Annotations: appInstanceScoped(acornName, appInstance.Status.AppSpec.Annotations, appInstance.Spec.Annotations, acorn.Annotations),
+			Name:      name2.SafeHashConcatName(appInstance.Name, acornName),
+			Namespace: appInstance.Namespace,
+			Labels:    labelMap,
+			Annotations: labels.Merge(appInstanceScoped(acornName, appInstance.Status.AppSpec.Annotations, appInstance.Spec.Annotations, acorn.Annotations),
+				map[string]string{
+					labels.AcornOriginalImage: originalImage,
+				}),
 		},
 		Spec: v1.AppInstanceSpec{
 			Region:      appInstance.GetRegion(),

pkg/controller/appdefinition/deploy.go

@@ -16,6 +16,7 @@ import (
 	"github.com/acorn-io/acorn/pkg/labels"
 	"github.com/acorn-io/acorn/pkg/pdb"
 	"github.com/acorn-io/acorn/pkg/ports"
+	"github.com/acorn-io/acorn/pkg/publicname"
 	"github.com/acorn-io/acorn/pkg/secrets"
 	"github.com/acorn-io/acorn/pkg/system"
 	"github.com/acorn-io/acorn/pkg/volume"
@@ -594,7 +595,7 @@ func toDeployment(req router.Request, appInstance *v1.AppInstance, tag name.Refe
 		return nil, err
 	}
 
-	podLabels := containerLabels(appInstance, container, name)
+	podLabels := containerLabels(appInstance, container, name, labels.AcornAppPublicName, publicname.Get(appInstance))
 	deploymentLabels := containerLabels(appInstance, container, name)
 	matchLabels := selectorMatchLabels(appInstance, name)
 

pkg/controller/appdefinition/endpoints.go

@@ -7,6 +7,7 @@ import (
 	"strings"
 
 	v1 "github.com/acorn-io/acorn/pkg/apis/internal.acorn.io/v1"
+	"github.com/acorn-io/acorn/pkg/controller/appstatus"
 	"github.com/acorn-io/acorn/pkg/labels"
 	"github.com/acorn-io/acorn/pkg/publish"
 	"github.com/acorn-io/baaah/pkg/router"
@@ -139,7 +140,7 @@ func AppEndpointsStatus(req router.Request, _ router.Response) error {
 
 	eps := append(ingressEndpoints, serviceEndpoints...)
 
-	ingressTLSHosts, err := IngressTLSHosts(req.Ctx, req.Client, app)
+	ingressTLSHosts, err := appstatus.IngressTLSHosts(req.Ctx, req.Client, app)
 	if err != nil {
 		return err
 	}

pkg/controller/appdefinition/jobs.go

@@ -5,6 +5,7 @@ import (
 
 	v1 "github.com/acorn-io/acorn/pkg/apis/internal.acorn.io/v1"
 	"github.com/acorn-io/acorn/pkg/labels"
+	"github.com/acorn-io/acorn/pkg/publicname"
 	"github.com/acorn-io/acorn/pkg/secrets"
 	"github.com/acorn-io/baaah/pkg/router"
 	"github.com/acorn-io/baaah/pkg/typed"
@@ -89,6 +90,7 @@ func toJob(req router.Request, appInstance *v1.AppInstance, pullSecrets *PullSec
 			ObjectMeta: metav1.ObjectMeta{
 				Labels: jobLabels(appInstance, container, name,
 					labels.AcornManaged, "true",
+					labels.AcornAppPublicName, publicname.Get(appInstance),
 					labels.AcornJobName, name,
 					labels.AcornContainerName, ""),
 				Annotations: labels.Merge(podAnnotations(appInstance, name, container), baseAnnotations),

pkg/controller/appdefinition/router.go

@@ -7,8 +7,10 @@ import (
 	"strings"
 
 	v1 "github.com/acorn-io/acorn/pkg/apis/internal.acorn.io/v1"
+	"github.com/acorn-io/acorn/pkg/labels"
 	"github.com/acorn-io/acorn/pkg/pdb"
 	"github.com/acorn-io/acorn/pkg/ports"
+	"github.com/acorn-io/acorn/pkg/publicname"
 	"github.com/acorn-io/acorn/pkg/system"
 	"github.com/acorn-io/acorn/pkg/tolerations"
 	"github.com/acorn-io/baaah/pkg/router"
@@ -48,7 +50,7 @@ func toRouter(appInstance *v1.AppInstance, routerName string, router v1.Router)
 
 	conf, confName := toNginxConf(routerName, router)
 
-	podLabels := routerLabels(appInstance, router, routerName)
+	podLabels := routerLabels(appInstance, router, routerName, labels.AcornAppPublicName, publicname.Get(appInstance))
 	deploymentLabels := routerLabels(appInstance, router, routerName)
 	matchLabels := routerSelectorMatchLabels(appInstance, routerName)
 

pkg/controller/appdefinition/testdata/acorn/labels/expected.yaml.d/appinstance.yaml

@@ -22,6 +22,7 @@ metadata:
     "global2a": "value"
     "allacornsa": "value"
     "override2": "outervalue"
+    acorn.io/original-image: foo
 spec:
   # The labels and annotations in this spec should be a combination of the "inner" acorn's definition and the outer
   # appInstance's scoped label and annotations.

pkg/controller/appdefinition/testdata/computeclass/all-set-overwrite-computeclass/expected.yaml.d/deployment.yaml

@@ -20,6 +20,7 @@ spec:
       labels:
         "acorn.io/app-namespace": "app-namespace"
         "acorn.io/app-name": "app-name"
+        acorn.io/app-public-name: "app-name"
         "acorn.io/container-name": "oneimage"
         "acorn.io/managed": "true"
       annotations:

pkg/controller/appdefinition/testdata/computeclass/all-set/expected.yaml.d/deployment.yaml

@@ -20,6 +20,7 @@ spec:
       labels:
         "acorn.io/app-namespace": "app-namespace"
         "acorn.io/app-name": "app-name"
+        "acorn.io/app-public-name": "app-name"
         "acorn.io/container-name": "oneimage"
         "acorn.io/managed": "true"
       annotations: