From a1fbe422a36aafda1d8f293b7a164c08f746bcf2 Mon Sep 17 00:00:00 2001 From: Darren Shepherd Date: Mon, 14 Aug 2023 16:44:19 -0700 Subject: [PATCH] Add account id and project name as labels on pods Signed-off-by: Darren Shepherd --- pkg/controller/appdefinition/deploy.go | 40 ++++++++++++++++--- pkg/controller/appdefinition/jobs.go | 15 ++++--- .../expected.golden | 4 ++ .../computeclass/all-set/expected.golden | 4 ++ .../computeclass/container/expected.golden | 4 ++ .../different-computeclass/expected.golden | 8 ++++ .../testdata/computeclass/job/expected.golden | 3 ++ .../expected.golden | 4 ++ .../two-containers/expected.golden | 8 ++++ .../expected.golden | 4 ++ .../testdata/depends-ready/expected.golden | 8 ++++ .../testdata/depends/expected.golden | 8 ++++ .../testdata/deployspec/basic/expected.golden | 8 ++++ .../filter-user-labels/expected.golden | 7 ++++ .../deployspec/labels/expected.golden | 7 ++++ .../deployspec/metrics/expected.golden | 4 ++ .../deployspec/no-user-labels/expected.golden | 7 ++++ .../testdata/deployspec/scale/expected.golden | 8 ++++ .../testdata/deployspec/stop/expected.golden | 8 ++++ .../testdata/files-bug/expected.golden | 4 ++ .../testdata/files/expected.golden | 4 ++ .../testdata/globalenv/expected.golden | 4 ++ .../testdata/ingress/basic/expected.golden | 8 ++++ .../ingress/clusterdomainport/expected.golden | 4 ++ .../testdata/ingress/labels/expected.golden | 4 ++ .../ingress/letsencrypt/expected.golden | 8 ++++ .../ingress/prefix/prefix-1/expected.golden | 4 ++ .../ingress/prefix/prefix-2/expected.golden | 4 ++ .../testdata/interpolation/expected.golden | 4 ++ .../testdata/job/basic/expected.golden | 3 ++ .../job/event-jobs-create-app/expected.golden | 3 ++ .../job/event-jobs-delete-app/expected.golden | 3 ++ .../job/event-jobs-start-app/expected.golden | 3 ++ .../job/event-jobs-stop-app/expected.golden | 3 ++ .../expected.golden | 6 +++ .../job/event-jobs-update-app/expected.golden | 3 ++ .../expected.golden | 3 ++ .../testdata/job/labels/expected.golden | 3 ++ .../memory/all-set-overwrite/expected.golden | 4 ++ .../testdata/memory/all-set/expected.golden | 4 ++ .../testdata/memory/container/expected.golden | 4 ++ .../testdata/memory/job/expected.golden | 3 ++ .../expected.golden | 4 ++ .../testdata/memory/sidecar/expected.golden | 4 ++ .../memory/two-containers/expected.golden | 8 ++++ .../with-acornfile-memory/expected.golden | 4 ++ .../testdata/permissions/both/expected.golden | 15 +++++++ .../bothwithnopermissions/expected.golden | 7 ++++ .../permissions/container/expected.golden | 8 ++++ .../containerwithnamespace/expected.golden | 12 ++++++ .../differentpermissions/expected.golden | 16 ++++++++ .../testdata/permissions/job/expected.golden | 7 ++++ .../multiplecontainers/expected.golden | 16 ++++++++ .../permissions/multiplejobs/expected.golden | 14 +++++++ .../testdata/probes/expected.golden | 8 ++++ .../pullsecrets/custom/expected.golden | 8 ++++ .../pullsecrets/default/expected.golden | 8 ++++ .../testdata/secret/expected.golden | 4 ++ .../testdata/service/alias/expected.golden | 12 ++++++ .../testdata/service/basic/expected.golden | 8 ++++ .../testdata/template/expected.golden | 4 ++ .../expected.golden | 4 ++ .../configure-but-no-bind/expected.golden | 4 ++ .../volumes/contextdir/expected.golden | 4 ++ .../testdata/volumes/defaults/expected.golden | 4 ++ .../testdata/volumes/empty/expected.golden | 4 ++ .../volumes/ephemeral-bound/expected.golden | 4 ++ .../volumes/ephemeral/expected.golden | 4 ++ .../volumes/inactive-class/expected.golden | 4 ++ .../volumes/named-bound/expected.golden | 4 ++ .../testdata/volumes/named/expected.golden | 4 ++ .../volumes/no-default-class/expected.golden | 4 ++ .../volumes/reuse-existing/expected.golden | 4 ++ pkg/secrets/interpolation.go | 26 +++++++----- 74 files changed, 472 insertions(+), 21 deletions(-) diff --git a/pkg/controller/appdefinition/deploy.go b/pkg/controller/appdefinition/deploy.go index ec5c70764..06a31b01e 100644 --- a/pkg/controller/appdefinition/deploy.go +++ b/pkg/controller/appdefinition/deploy.go @@ -450,14 +450,36 @@ func routerAnnotations(appInstance *v1.AppInstance, router v1.Router, name strin return labels.GatherScoped(name, v1.LabelTypeRouter, appInstance.Status.AppSpec.Annotations, router.Annotations, appInstance.Spec.Annotations) } -func jobLabels(appInstance *v1.AppInstance, container v1.Container, name string, kv ...string) map[string]string { +func jobLabels(appInstance *v1.AppInstance, container v1.Container, name string, interpolator *secrets.Interpolator, kv ...string) (map[string]string, error) { labelMap := labels.GatherScoped(name, v1.LabelTypeJob, appInstance.Status.AppSpec.Labels, container.Labels, appInstance.Spec.Labels) - return mergeConLabels(labelMap, appInstance, name, kv...) + return addInterpolationLabels(mergeConLabels(labelMap, appInstance, name, kv...), interpolator) } -func containerLabels(appInstance *v1.AppInstance, container v1.Container, name string, kv ...string) map[string]string { +func addInterpolationLabels(result map[string]string, interpolator *secrets.Interpolator) (map[string]string, error) { + if interpolator != nil { + accountID, err := interpolator.GetAccountID() + if err != nil { + return nil, err + } + if accountID != "" { + result[labels.AcornAccountID] = accountID + } + + projectName, err := interpolator.GetProjectName() + if err != nil { + return nil, err + } + if projectName != "" { + result[labels.AcornProjectName] = projectName + } + } + return result, nil +} + +func containerLabels(appInstance *v1.AppInstance, container v1.Container, name string, interpolator *secrets.Interpolator, kv ...string) (map[string]string, error) { labelMap := labels.GatherScoped(name, v1.LabelTypeContainer, appInstance.Status.AppSpec.Labels, container.Labels, appInstance.Spec.Labels) - return mergeConLabels(labelMap, appInstance, name, append([]string{labels.AcornAppPublicName, publicname.Get(appInstance)}, kv...)...) + result := mergeConLabels(labelMap, appInstance, name, append([]string{labels.AcornAppPublicName, publicname.Get(appInstance)}, kv...)...) + return addInterpolationLabels(result, interpolator) } func routerLabels(appInstance *v1.AppInstance, router v1.Router, name string, kv ...string) map[string]string { @@ -630,8 +652,14 @@ func toDeployment(req router.Request, appInstance *v1.AppInstance, tag name.Refe return nil, err } - podLabels := containerLabels(appInstance, container, name) - deploymentLabels := containerLabels(appInstance, container, name) + podLabels, err := containerLabels(appInstance, container, name, interpolator) + if err != nil { + return nil, err + } + deploymentLabels, err := containerLabels(appInstance, container, name, interpolator) + if err != nil { + return nil, err + } matchLabels := selectorMatchLabels(appInstance, name) deploymentAnnotations := containerAnnotations(appInstance, container, name) diff --git a/pkg/controller/appdefinition/jobs.go b/pkg/controller/appdefinition/jobs.go index d14f2c889..080486e31 100644 --- a/pkg/controller/appdefinition/jobs.go +++ b/pkg/controller/appdefinition/jobs.go @@ -137,14 +137,19 @@ func toJob(req router.Request, appInstance *v1.AppInstance, pullSecrets *PullSec baseAnnotations[labels.AcornAppGeneration] = strconv.FormatInt(appInstance.Generation, 10) } + podLabels, err := jobLabels(appInstance, container, name, interpolator, + labels.AcornManaged, "true", + labels.AcornAppPublicName, publicname.Get(appInstance), + labels.AcornJobName, name, + labels.AcornContainerName, "") + if err != nil { + return nil, err + } + jobSpec := batchv1.JobSpec{ Template: corev1.PodTemplateSpec{ ObjectMeta: metav1.ObjectMeta{ - Labels: jobLabels(appInstance, container, name, - labels.AcornManaged, "true", - labels.AcornAppPublicName, publicname.Get(appInstance), - labels.AcornJobName, name, - labels.AcornContainerName, ""), + Labels: podLabels, Annotations: labels.Merge(podAnnotations(appInstance, container), baseAnnotations), }, Spec: corev1.PodSpec{ diff --git a/pkg/controller/appdefinition/testdata/computeclass/all-set-overwrite-computeclass/expected.golden b/pkg/controller/appdefinition/testdata/computeclass/all-set-overwrite-computeclass/expected.golden index 5c6e9fca0..78ba9a0df 100644 --- a/pkg/controller/appdefinition/testdata/computeclass/all-set-overwrite-computeclass/expected.golden +++ b/pkg/controller/appdefinition/testdata/computeclass/all-set-overwrite-computeclass/expected.golden @@ -8,6 +8,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace @@ -22,6 +23,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace spec: @@ -43,6 +45,7 @@ spec: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace spec: affinity: nodeAffinity: @@ -101,6 +104,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace spec: diff --git a/pkg/controller/appdefinition/testdata/computeclass/all-set/expected.golden b/pkg/controller/appdefinition/testdata/computeclass/all-set/expected.golden index 55038f1d8..667fb9ffd 100644 --- a/pkg/controller/appdefinition/testdata/computeclass/all-set/expected.golden +++ b/pkg/controller/appdefinition/testdata/computeclass/all-set/expected.golden @@ -8,6 +8,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace @@ -22,6 +23,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace spec: @@ -43,6 +45,7 @@ spec: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace spec: affinity: nodeAffinity: @@ -101,6 +104,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace spec: diff --git a/pkg/controller/appdefinition/testdata/computeclass/container/expected.golden b/pkg/controller/appdefinition/testdata/computeclass/container/expected.golden index 177a21540..0be32b9cc 100644 --- a/pkg/controller/appdefinition/testdata/computeclass/container/expected.golden +++ b/pkg/controller/appdefinition/testdata/computeclass/container/expected.golden @@ -8,6 +8,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace @@ -22,6 +23,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace spec: @@ -43,6 +45,7 @@ spec: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace spec: affinity: nodeAffinity: @@ -101,6 +104,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace spec: diff --git a/pkg/controller/appdefinition/testdata/computeclass/different-computeclass/expected.golden b/pkg/controller/appdefinition/testdata/computeclass/different-computeclass/expected.golden index 596d0d55e..b3355f46c 100644 --- a/pkg/controller/appdefinition/testdata/computeclass/different-computeclass/expected.golden +++ b/pkg/controller/appdefinition/testdata/computeclass/different-computeclass/expected.golden @@ -8,6 +8,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace @@ -22,6 +23,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace spec: @@ -43,6 +45,7 @@ spec: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace spec: affinity: nodeAffinity: @@ -87,6 +90,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace spec: @@ -114,6 +118,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: twoimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: twoimage namespace: app-created-namespace @@ -128,6 +133,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: twoimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: twoimage namespace: app-created-namespace spec: @@ -149,6 +155,7 @@ spec: acorn.io/app-public-name: app-name acorn.io/container-name: twoimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace spec: affinity: nodeAffinity: @@ -193,6 +200,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: twoimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: twoimage namespace: app-created-namespace spec: diff --git a/pkg/controller/appdefinition/testdata/computeclass/job/expected.golden b/pkg/controller/appdefinition/testdata/computeclass/job/expected.golden index e57d973fb..c32af3b64 100644 --- a/pkg/controller/appdefinition/testdata/computeclass/job/expected.golden +++ b/pkg/controller/appdefinition/testdata/computeclass/job/expected.golden @@ -10,6 +10,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/job-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace @@ -28,6 +29,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/job-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace spec: @@ -43,6 +45,7 @@ spec: acorn.io/app-public-name: app-name acorn.io/job-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace spec: affinity: nodeAffinity: diff --git a/pkg/controller/appdefinition/testdata/computeclass/overwrite-acornfile-computeclass/expected.golden b/pkg/controller/appdefinition/testdata/computeclass/overwrite-acornfile-computeclass/expected.golden index 53938b400..231b95090 100644 --- a/pkg/controller/appdefinition/testdata/computeclass/overwrite-acornfile-computeclass/expected.golden +++ b/pkg/controller/appdefinition/testdata/computeclass/overwrite-acornfile-computeclass/expected.golden @@ -8,6 +8,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace @@ -22,6 +23,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace spec: @@ -43,6 +45,7 @@ spec: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace spec: affinity: nodeAffinity: @@ -101,6 +104,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace spec: diff --git a/pkg/controller/appdefinition/testdata/computeclass/two-containers/expected.golden b/pkg/controller/appdefinition/testdata/computeclass/two-containers/expected.golden index 7395dab39..57c8e42c0 100644 --- a/pkg/controller/appdefinition/testdata/computeclass/two-containers/expected.golden +++ b/pkg/controller/appdefinition/testdata/computeclass/two-containers/expected.golden @@ -8,6 +8,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace @@ -22,6 +23,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace spec: @@ -43,6 +45,7 @@ spec: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace spec: affinity: nodeAffinity: @@ -87,6 +90,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace spec: @@ -114,6 +118,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: twoimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: twoimage namespace: app-created-namespace @@ -128,6 +133,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: twoimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: twoimage namespace: app-created-namespace spec: @@ -149,6 +155,7 @@ spec: acorn.io/app-public-name: app-name acorn.io/container-name: twoimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace spec: containers: - image: image-name @@ -179,6 +186,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: twoimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: twoimage namespace: app-created-namespace spec: diff --git a/pkg/controller/appdefinition/testdata/computeclass/with-acornfile-computeclass/expected.golden b/pkg/controller/appdefinition/testdata/computeclass/with-acornfile-computeclass/expected.golden index 62a8ddbc1..686b975a1 100644 --- a/pkg/controller/appdefinition/testdata/computeclass/with-acornfile-computeclass/expected.golden +++ b/pkg/controller/appdefinition/testdata/computeclass/with-acornfile-computeclass/expected.golden @@ -8,6 +8,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace @@ -22,6 +23,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace spec: @@ -43,6 +45,7 @@ spec: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace spec: affinity: nodeAffinity: @@ -101,6 +104,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace spec: diff --git a/pkg/controller/appdefinition/testdata/depends-ready/expected.golden b/pkg/controller/appdefinition/testdata/depends-ready/expected.golden index 9eb1ac445..0b6ce84c9 100644 --- a/pkg/controller/appdefinition/testdata/depends-ready/expected.golden +++ b/pkg/controller/appdefinition/testdata/depends-ready/expected.golden @@ -8,6 +8,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: container-name acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: container-name namespace: app-created-namespace @@ -22,6 +23,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: container-name acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: container-name namespace: app-created-namespace spec: @@ -43,6 +45,7 @@ spec: acorn.io/app-public-name: app-name acorn.io/container-name: container-name acorn.io/managed: "true" + acorn.io/project-name: app-namespace spec: containers: - image: image-name @@ -67,6 +70,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: container-name acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: container-name namespace: app-created-namespace spec: @@ -94,6 +98,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: web acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: web namespace: app-created-namespace @@ -108,6 +113,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: web acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: web namespace: app-created-namespace spec: @@ -129,6 +135,7 @@ spec: acorn.io/app-public-name: app-name acorn.io/container-name: web acorn.io/managed: "true" + acorn.io/project-name: app-namespace spec: containers: - image: image-name @@ -153,6 +160,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: web acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: web namespace: app-created-namespace spec: diff --git a/pkg/controller/appdefinition/testdata/depends/expected.golden b/pkg/controller/appdefinition/testdata/depends/expected.golden index e6c0e6e13..e50490780 100644 --- a/pkg/controller/appdefinition/testdata/depends/expected.golden +++ b/pkg/controller/appdefinition/testdata/depends/expected.golden @@ -8,6 +8,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: container-name acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: container-name namespace: app-created-namespace @@ -22,6 +23,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: container-name acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: container-name namespace: app-created-namespace spec: @@ -43,6 +45,7 @@ spec: acorn.io/app-public-name: app-name acorn.io/container-name: container-name acorn.io/managed: "true" + acorn.io/project-name: app-namespace spec: containers: - image: image-name @@ -67,6 +70,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: container-name acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: container-name namespace: app-created-namespace spec: @@ -97,6 +101,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: web acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: web namespace: app-created-namespace @@ -114,6 +119,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: web acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: web namespace: app-created-namespace spec: @@ -135,6 +141,7 @@ spec: acorn.io/app-public-name: app-name acorn.io/container-name: web acorn.io/managed: "true" + acorn.io/project-name: app-namespace spec: containers: - image: image-name @@ -162,6 +169,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: web acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: web namespace: app-created-namespace spec: diff --git a/pkg/controller/appdefinition/testdata/deployspec/basic/expected.golden b/pkg/controller/appdefinition/testdata/deployspec/basic/expected.golden index c65adaf38..4ed89c700 100644 --- a/pkg/controller/appdefinition/testdata/deployspec/basic/expected.golden +++ b/pkg/controller/appdefinition/testdata/deployspec/basic/expected.golden @@ -8,6 +8,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: buildimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: buildimage namespace: app-created-namespace @@ -22,6 +23,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: buildimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: buildimage namespace: app-created-namespace spec: @@ -43,6 +45,7 @@ spec: acorn.io/app-public-name: app-name acorn.io/container-name: buildimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace spec: containers: - image: sha256:build-image @@ -67,6 +70,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: buildimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: buildimage namespace: app-created-namespace spec: @@ -94,6 +98,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace @@ -108,6 +113,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace spec: @@ -129,6 +135,7 @@ spec: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace spec: containers: - image: image-name @@ -168,6 +175,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace spec: diff --git a/pkg/controller/appdefinition/testdata/deployspec/filter-user-labels/expected.golden b/pkg/controller/appdefinition/testdata/deployspec/filter-user-labels/expected.golden index a2a956273..57c4f6b7f 100644 --- a/pkg/controller/appdefinition/testdata/deployspec/filter-user-labels/expected.golden +++ b/pkg/controller/appdefinition/testdata/deployspec/filter-user-labels/expected.golden @@ -14,6 +14,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: container-name acorn.io/managed: "true" + acorn.io/project-name: app-namespace allowed-global.io: test-global allowed.io: test-allowed-app-spec-label permit-container.io: test-permit-container-label @@ -39,6 +40,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: container-name acorn.io/managed: "true" + acorn.io/project-name: app-namespace allowed-global.io: test-global allowed.io: test-allowed-app-spec-label permit-container.io: test-permit-container-label @@ -72,6 +74,7 @@ spec: acorn.io/app-public-name: app-name acorn.io/container-name: container-name acorn.io/managed: "true" + acorn.io/project-name: app-namespace allowed-global.io: test-global allowed.io: test-allowed-app-spec-label permit-container.io: test-permit-container-label @@ -114,6 +117,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: container-name acorn.io/managed: "true" + acorn.io/project-name: app-namespace allowed-global.io: test-global allowed.io: test-allowed-app-spec-label permit-container.io: test-permit-container-label @@ -152,6 +156,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/job-name: job-name acorn.io/managed: "true" + acorn.io/project-name: app-namespace allowed-global.io: test-global allowed-job.io: test-allowed-job-label allowed.io: test-allowed-app-spec-label @@ -178,6 +183,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/job-name: job-name acorn.io/managed: "true" + acorn.io/project-name: app-namespace allowed-global.io: test-global allowed-job.io: test-allowed-job-label allowed.io: test-allowed-app-spec-label @@ -201,6 +207,7 @@ spec: acorn.io/app-public-name: app-name acorn.io/job-name: job-name acorn.io/managed: "true" + acorn.io/project-name: app-namespace allowed-global.io: test-global allowed-job.io: test-allowed-job-label allowed.io: test-allowed-app-spec-label diff --git a/pkg/controller/appdefinition/testdata/deployspec/labels/expected.golden b/pkg/controller/appdefinition/testdata/deployspec/labels/expected.golden index a43c1a252..646e17bfd 100644 --- a/pkg/controller/appdefinition/testdata/deployspec/labels/expected.golden +++ b/pkg/controller/appdefinition/testdata/deployspec/labels/expected.golden @@ -14,6 +14,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: container-name acorn.io/managed: "true" + acorn.io/project-name: app-namespace appSpecLabel: test-app-spec-label container-scoped-label: test-container containerLabel: test-container-label @@ -39,6 +40,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: container-name acorn.io/managed: "true" + acorn.io/project-name: app-namespace appSpecLabel: test-app-spec-label container-scoped-label: test-container containerLabel: test-container-label @@ -72,6 +74,7 @@ spec: acorn.io/app-public-name: app-name acorn.io/container-name: container-name acorn.io/managed: "true" + acorn.io/project-name: app-namespace appSpecLabel: test-app-spec-label container-scoped-label: test-container containerLabel: test-container-label @@ -114,6 +117,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: container-name acorn.io/managed: "true" + acorn.io/project-name: app-namespace appSpecLabel: test-app-spec-label container-scoped-label: test-container containerLabel: test-container-label @@ -151,6 +155,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/job-name: job-name acorn.io/managed: "true" + acorn.io/project-name: app-namespace appSpecLabel: test-app-spec-label global-scoped-label: test-global jobLabel: test-job-label @@ -175,6 +180,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/job-name: job-name acorn.io/managed: "true" + acorn.io/project-name: app-namespace appSpecLabel: test-app-spec-label global-scoped-label: test-global jobLabel: test-job-label @@ -196,6 +202,7 @@ spec: acorn.io/app-public-name: app-name acorn.io/job-name: job-name acorn.io/managed: "true" + acorn.io/project-name: app-namespace appSpecLabel: test-app-spec-label global-scoped-label: test-global jobLabel: test-job-label diff --git a/pkg/controller/appdefinition/testdata/deployspec/metrics/expected.golden b/pkg/controller/appdefinition/testdata/deployspec/metrics/expected.golden index 0c687011d..bafb36e8b 100644 --- a/pkg/controller/appdefinition/testdata/deployspec/metrics/expected.golden +++ b/pkg/controller/appdefinition/testdata/deployspec/metrics/expected.golden @@ -8,6 +8,7 @@ metadata: acorn.io/app-public-name: app-with-metrics acorn.io/container-name: nginx acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: nginx namespace: app-created-namespace @@ -22,6 +23,7 @@ metadata: acorn.io/app-public-name: app-with-metrics acorn.io/container-name: nginx acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: nginx namespace: app-created-namespace spec: @@ -46,6 +48,7 @@ spec: acorn.io/app-public-name: app-with-metrics acorn.io/container-name: nginx acorn.io/managed: "true" + acorn.io/project-name: app-namespace spec: containers: - image: foo @@ -76,6 +79,7 @@ metadata: acorn.io/app-public-name: app-with-metrics acorn.io/container-name: nginx acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: nginx namespace: app-created-namespace spec: diff --git a/pkg/controller/appdefinition/testdata/deployspec/no-user-labels/expected.golden b/pkg/controller/appdefinition/testdata/deployspec/no-user-labels/expected.golden index 4cb156c95..c193ce060 100644 --- a/pkg/controller/appdefinition/testdata/deployspec/no-user-labels/expected.golden +++ b/pkg/controller/appdefinition/testdata/deployspec/no-user-labels/expected.golden @@ -8,6 +8,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: container-name acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: container-name namespace: app-created-namespace @@ -22,6 +23,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: container-name acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: container-name namespace: app-created-namespace spec: @@ -45,6 +47,7 @@ spec: acorn.io/app-public-name: app-name acorn.io/container-name: container-name acorn.io/managed: "true" + acorn.io/project-name: app-namespace spec: containers: - image: image-name @@ -76,6 +79,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: container-name acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: container-name namespace: app-created-namespace spec: @@ -105,6 +109,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/job-name: job-name acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: job-name namespace: app-created-namespace @@ -123,6 +128,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/job-name: job-name acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: job-name namespace: app-created-namespace spec: @@ -138,6 +144,7 @@ spec: acorn.io/app-public-name: app-name acorn.io/job-name: job-name acorn.io/managed: "true" + acorn.io/project-name: app-namespace spec: containers: - env: diff --git a/pkg/controller/appdefinition/testdata/deployspec/scale/expected.golden b/pkg/controller/appdefinition/testdata/deployspec/scale/expected.golden index c37697aac..7476d68bc 100644 --- a/pkg/controller/appdefinition/testdata/deployspec/scale/expected.golden +++ b/pkg/controller/appdefinition/testdata/deployspec/scale/expected.golden @@ -8,6 +8,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: buildimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: buildimage namespace: app-created-namespace @@ -22,6 +23,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: buildimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: buildimage namespace: app-created-namespace spec: @@ -44,6 +46,7 @@ spec: acorn.io/app-public-name: app-name acorn.io/container-name: buildimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace spec: containers: - image: sha256:build-image @@ -67,6 +70,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: buildimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: buildimage namespace: app-created-namespace spec: @@ -94,6 +98,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace @@ -108,6 +113,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace spec: @@ -130,6 +136,7 @@ spec: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace spec: containers: - image: image-name @@ -153,6 +160,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace spec: diff --git a/pkg/controller/appdefinition/testdata/deployspec/stop/expected.golden b/pkg/controller/appdefinition/testdata/deployspec/stop/expected.golden index a7ba42e0c..0e8208f01 100644 --- a/pkg/controller/appdefinition/testdata/deployspec/stop/expected.golden +++ b/pkg/controller/appdefinition/testdata/deployspec/stop/expected.golden @@ -8,6 +8,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: buildimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: buildimage namespace: app-created-namespace @@ -22,6 +23,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: buildimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: buildimage namespace: app-created-namespace spec: @@ -44,6 +46,7 @@ spec: acorn.io/app-public-name: app-name acorn.io/container-name: buildimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace spec: containers: - image: sha256:build-image @@ -68,6 +71,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: buildimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: buildimage namespace: app-created-namespace spec: @@ -95,6 +99,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace @@ -109,6 +114,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace spec: @@ -131,6 +137,7 @@ spec: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace spec: containers: - image: image-name @@ -155,6 +162,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace spec: diff --git a/pkg/controller/appdefinition/testdata/files-bug/expected.golden b/pkg/controller/appdefinition/testdata/files-bug/expected.golden index cb1bc0881..efb8e8c93 100644 --- a/pkg/controller/appdefinition/testdata/files-bug/expected.golden +++ b/pkg/controller/appdefinition/testdata/files-bug/expected.golden @@ -8,6 +8,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace @@ -22,6 +23,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace spec: @@ -43,6 +45,7 @@ spec: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace spec: containers: - image: image-name @@ -85,6 +88,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace spec: diff --git a/pkg/controller/appdefinition/testdata/files/expected.golden b/pkg/controller/appdefinition/testdata/files/expected.golden index 0f9a91777..a968878c4 100644 --- a/pkg/controller/appdefinition/testdata/files/expected.golden +++ b/pkg/controller/appdefinition/testdata/files/expected.golden @@ -8,6 +8,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace @@ -22,6 +23,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace spec: @@ -43,6 +45,7 @@ spec: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace spec: containers: - image: image-name @@ -98,6 +101,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace spec: diff --git a/pkg/controller/appdefinition/testdata/globalenv/expected.golden b/pkg/controller/appdefinition/testdata/globalenv/expected.golden index 23461645c..759187e22 100644 --- a/pkg/controller/appdefinition/testdata/globalenv/expected.golden +++ b/pkg/controller/appdefinition/testdata/globalenv/expected.golden @@ -8,6 +8,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: container-name acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: container-name namespace: app-created-namespace @@ -22,6 +23,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: container-name acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: container-name namespace: app-created-namespace spec: @@ -43,6 +45,7 @@ spec: acorn.io/app-public-name: app-name acorn.io/container-name: container-name acorn.io/managed: "true" + acorn.io/project-name: app-namespace spec: containers: - env: @@ -72,6 +75,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: container-name acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: container-name namespace: app-created-namespace spec: diff --git a/pkg/controller/appdefinition/testdata/ingress/basic/expected.golden b/pkg/controller/appdefinition/testdata/ingress/basic/expected.golden index 04e198dc1..68a0ec9b0 100644 --- a/pkg/controller/appdefinition/testdata/ingress/basic/expected.golden +++ b/pkg/controller/appdefinition/testdata/ingress/basic/expected.golden @@ -8,6 +8,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: buildimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: buildimage namespace: app-created-namespace @@ -22,6 +23,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: buildimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: buildimage namespace: app-created-namespace spec: @@ -43,6 +45,7 @@ spec: acorn.io/app-public-name: app-name acorn.io/container-name: buildimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace spec: containers: - image: sha256:build-image @@ -75,6 +78,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: buildimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: buildimage namespace: app-created-namespace spec: @@ -102,6 +106,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace @@ -116,6 +121,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace spec: @@ -137,6 +143,7 @@ spec: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace spec: containers: - image: image-name @@ -176,6 +183,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace spec: diff --git a/pkg/controller/appdefinition/testdata/ingress/clusterdomainport/expected.golden b/pkg/controller/appdefinition/testdata/ingress/clusterdomainport/expected.golden index 7aada9659..a78f68b93 100644 --- a/pkg/controller/appdefinition/testdata/ingress/clusterdomainport/expected.golden +++ b/pkg/controller/appdefinition/testdata/ingress/clusterdomainport/expected.golden @@ -8,6 +8,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace @@ -22,6 +23,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace spec: @@ -43,6 +45,7 @@ spec: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace spec: containers: - image: image-name @@ -73,6 +76,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace spec: diff --git a/pkg/controller/appdefinition/testdata/ingress/labels/expected.golden b/pkg/controller/appdefinition/testdata/ingress/labels/expected.golden index cd7bab428..d31716723 100644 --- a/pkg/controller/appdefinition/testdata/ingress/labels/expected.golden +++ b/pkg/controller/appdefinition/testdata/ingress/labels/expected.golden @@ -14,6 +14,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: con1 acorn.io/managed: "true" + acorn.io/project-name: app-namespace allconsl1: value conl1: value conl3: value @@ -39,6 +40,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: con1 acorn.io/managed: "true" + acorn.io/project-name: app-namespace allconsl1: value conl1: value conl3: value @@ -70,6 +72,7 @@ spec: acorn.io/app-public-name: app-name acorn.io/container-name: con1 acorn.io/managed: "true" + acorn.io/project-name: app-namespace allconsl1: value conl1: value conl3: value @@ -111,6 +114,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: con1 acorn.io/managed: "true" + acorn.io/project-name: app-namespace allconsl1: value conl1: value conl3: value diff --git a/pkg/controller/appdefinition/testdata/ingress/letsencrypt/expected.golden b/pkg/controller/appdefinition/testdata/ingress/letsencrypt/expected.golden index 93d21bfa7..c032ef542 100644 --- a/pkg/controller/appdefinition/testdata/ingress/letsencrypt/expected.golden +++ b/pkg/controller/appdefinition/testdata/ingress/letsencrypt/expected.golden @@ -8,6 +8,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: app1 acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: app1 namespace: app-created-namespace @@ -22,6 +23,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: app1 acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: app1 namespace: app-created-namespace spec: @@ -43,6 +45,7 @@ spec: acorn.io/app-public-name: app-name acorn.io/container-name: app1 acorn.io/managed: "true" + acorn.io/project-name: app-namespace spec: containers: - image: image-name @@ -73,6 +76,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: app1 acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: app1 namespace: app-created-namespace spec: @@ -100,6 +104,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: app2 acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: app2 namespace: app-created-namespace @@ -114,6 +119,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: app2 acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: app2 namespace: app-created-namespace spec: @@ -135,6 +141,7 @@ spec: acorn.io/app-public-name: app-name acorn.io/container-name: app2 acorn.io/managed: "true" + acorn.io/project-name: app-namespace spec: containers: - image: image-name @@ -165,6 +172,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: app2 acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: app2 namespace: app-created-namespace spec: diff --git a/pkg/controller/appdefinition/testdata/ingress/prefix/prefix-1/expected.golden b/pkg/controller/appdefinition/testdata/ingress/prefix/prefix-1/expected.golden index a4e7caac1..553d41788 100644 --- a/pkg/controller/appdefinition/testdata/ingress/prefix/prefix-1/expected.golden +++ b/pkg/controller/appdefinition/testdata/ingress/prefix/prefix-1/expected.golden @@ -14,6 +14,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: con1 acorn.io/managed: "true" + acorn.io/project-name: app-namespace allconsl1: value conl1: value conl3: value @@ -39,6 +40,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: con1 acorn.io/managed: "true" + acorn.io/project-name: app-namespace allconsl1: value conl1: value conl3: value @@ -70,6 +72,7 @@ spec: acorn.io/app-public-name: app-name acorn.io/container-name: con1 acorn.io/managed: "true" + acorn.io/project-name: app-namespace allconsl1: value conl1: value conl3: value @@ -111,6 +114,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: con1 acorn.io/managed: "true" + acorn.io/project-name: app-namespace allconsl1: value conl1: value conl3: value diff --git a/pkg/controller/appdefinition/testdata/ingress/prefix/prefix-2/expected.golden b/pkg/controller/appdefinition/testdata/ingress/prefix/prefix-2/expected.golden index cc4f2bed5..605f3f9fc 100644 --- a/pkg/controller/appdefinition/testdata/ingress/prefix/prefix-2/expected.golden +++ b/pkg/controller/appdefinition/testdata/ingress/prefix/prefix-2/expected.golden @@ -14,6 +14,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: con1 acorn.io/managed: "true" + acorn.io/project-name: app-namespace allconsl1: value conl1: value conl3: value @@ -39,6 +40,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: con1 acorn.io/managed: "true" + acorn.io/project-name: app-namespace allconsl1: value conl1: value conl3: value @@ -70,6 +72,7 @@ spec: acorn.io/app-public-name: app-name acorn.io/container-name: con1 acorn.io/managed: "true" + acorn.io/project-name: app-namespace allconsl1: value conl1: value conl3: value @@ -111,6 +114,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: con1 acorn.io/managed: "true" + acorn.io/project-name: app-namespace allconsl1: value conl1: value conl3: value diff --git a/pkg/controller/appdefinition/testdata/interpolation/expected.golden b/pkg/controller/appdefinition/testdata/interpolation/expected.golden index 62184a822..5f680e55e 100644 --- a/pkg/controller/appdefinition/testdata/interpolation/expected.golden +++ b/pkg/controller/appdefinition/testdata/interpolation/expected.golden @@ -8,6 +8,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace @@ -22,6 +23,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace spec: @@ -45,6 +47,7 @@ spec: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace spec: containers: - env: @@ -85,6 +88,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace spec: diff --git a/pkg/controller/appdefinition/testdata/job/basic/expected.golden b/pkg/controller/appdefinition/testdata/job/basic/expected.golden index f20053a7d..efb325758 100644 --- a/pkg/controller/appdefinition/testdata/job/basic/expected.golden +++ b/pkg/controller/appdefinition/testdata/job/basic/expected.golden @@ -10,6 +10,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/job-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace @@ -28,6 +29,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/job-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace spec: @@ -43,6 +45,7 @@ spec: acorn.io/app-public-name: app-name acorn.io/job-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace spec: containers: - env: diff --git a/pkg/controller/appdefinition/testdata/job/event-jobs-create-app/expected.golden b/pkg/controller/appdefinition/testdata/job/event-jobs-create-app/expected.golden index 13ee81546..d19afb875 100644 --- a/pkg/controller/appdefinition/testdata/job/event-jobs-create-app/expected.golden +++ b/pkg/controller/appdefinition/testdata/job/event-jobs-create-app/expected.golden @@ -10,6 +10,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/job-name: create-only acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: create-only namespace: app-created-namespace @@ -28,6 +29,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/job-name: create-only acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: create-only namespace: app-created-namespace spec: @@ -44,6 +46,7 @@ spec: acorn.io/app-public-name: app-name acorn.io/job-name: create-only acorn.io/managed: "true" + acorn.io/project-name: app-namespace spec: containers: - env: diff --git a/pkg/controller/appdefinition/testdata/job/event-jobs-delete-app/expected.golden b/pkg/controller/appdefinition/testdata/job/event-jobs-delete-app/expected.golden index 687bf73fe..782866d96 100644 --- a/pkg/controller/appdefinition/testdata/job/event-jobs-delete-app/expected.golden +++ b/pkg/controller/appdefinition/testdata/job/event-jobs-delete-app/expected.golden @@ -10,6 +10,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/job-name: delete-only acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: delete-only namespace: app-created-namespace @@ -28,6 +29,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/job-name: delete-only acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: delete-only namespace: app-created-namespace spec: @@ -44,6 +46,7 @@ spec: acorn.io/app-public-name: app-name acorn.io/job-name: delete-only acorn.io/managed: "true" + acorn.io/project-name: app-namespace spec: containers: - env: diff --git a/pkg/controller/appdefinition/testdata/job/event-jobs-start-app/expected.golden b/pkg/controller/appdefinition/testdata/job/event-jobs-start-app/expected.golden index 8f8c34daf..e14554748 100644 --- a/pkg/controller/appdefinition/testdata/job/event-jobs-start-app/expected.golden +++ b/pkg/controller/appdefinition/testdata/job/event-jobs-start-app/expected.golden @@ -10,6 +10,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/job-name: update-only acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: update-only namespace: app-created-namespace @@ -28,6 +29,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/job-name: update-only acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: update-only namespace: app-created-namespace spec: @@ -44,6 +46,7 @@ spec: acorn.io/app-public-name: app-name acorn.io/job-name: update-only acorn.io/managed: "true" + acorn.io/project-name: app-namespace spec: containers: - env: diff --git a/pkg/controller/appdefinition/testdata/job/event-jobs-stop-app/expected.golden b/pkg/controller/appdefinition/testdata/job/event-jobs-stop-app/expected.golden index 794cc6f73..34f0b489f 100644 --- a/pkg/controller/appdefinition/testdata/job/event-jobs-stop-app/expected.golden +++ b/pkg/controller/appdefinition/testdata/job/event-jobs-stop-app/expected.golden @@ -10,6 +10,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/job-name: stop-only acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: stop-only namespace: app-created-namespace @@ -28,6 +29,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/job-name: stop-only acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: stop-only namespace: app-created-namespace spec: @@ -44,6 +46,7 @@ spec: acorn.io/app-public-name: app-name acorn.io/job-name: stop-only acorn.io/managed: "true" + acorn.io/project-name: app-namespace spec: containers: - env: diff --git a/pkg/controller/appdefinition/testdata/job/event-jobs-update-app-with-create/expected.golden b/pkg/controller/appdefinition/testdata/job/event-jobs-update-app-with-create/expected.golden index ee1c133a9..a39a757b7 100644 --- a/pkg/controller/appdefinition/testdata/job/event-jobs-update-app-with-create/expected.golden +++ b/pkg/controller/appdefinition/testdata/job/event-jobs-update-app-with-create/expected.golden @@ -10,6 +10,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/job-name: create-only acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: create-only namespace: app-created-namespace @@ -28,6 +29,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/job-name: create-only acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: create-only namespace: app-created-namespace spec: @@ -44,6 +46,7 @@ spec: acorn.io/app-public-name: app-name acorn.io/job-name: create-only acorn.io/managed: "true" + acorn.io/project-name: app-namespace spec: containers: - env: @@ -93,6 +96,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/job-name: update-only acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: update-only namespace: app-created-namespace @@ -111,6 +115,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/job-name: update-only acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: update-only namespace: app-created-namespace spec: @@ -127,6 +132,7 @@ spec: acorn.io/app-public-name: app-name acorn.io/job-name: update-only acorn.io/managed: "true" + acorn.io/project-name: app-namespace spec: containers: - env: diff --git a/pkg/controller/appdefinition/testdata/job/event-jobs-update-app/expected.golden b/pkg/controller/appdefinition/testdata/job/event-jobs-update-app/expected.golden index 79bc0eb98..17d0d173d 100644 --- a/pkg/controller/appdefinition/testdata/job/event-jobs-update-app/expected.golden +++ b/pkg/controller/appdefinition/testdata/job/event-jobs-update-app/expected.golden @@ -10,6 +10,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/job-name: update-only acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: update-only namespace: app-created-namespace @@ -28,6 +29,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/job-name: update-only acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: update-only namespace: app-created-namespace spec: @@ -44,6 +46,7 @@ spec: acorn.io/app-public-name: app-name acorn.io/job-name: update-only acorn.io/managed: "true" + acorn.io/project-name: app-namespace spec: containers: - env: diff --git a/pkg/controller/appdefinition/testdata/job/event-jobs-update-create-job/expected.golden b/pkg/controller/appdefinition/testdata/job/event-jobs-update-create-job/expected.golden index ad56d37b6..6fdfbb92a 100644 --- a/pkg/controller/appdefinition/testdata/job/event-jobs-update-create-job/expected.golden +++ b/pkg/controller/appdefinition/testdata/job/event-jobs-update-create-job/expected.golden @@ -10,6 +10,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/job-name: job acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: job namespace: app-created-namespace @@ -28,6 +29,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/job-name: job acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: job namespace: app-created-namespace spec: @@ -44,6 +46,7 @@ spec: acorn.io/app-public-name: app-name acorn.io/job-name: job acorn.io/managed: "true" + acorn.io/project-name: app-namespace spec: containers: - env: diff --git a/pkg/controller/appdefinition/testdata/job/labels/expected.golden b/pkg/controller/appdefinition/testdata/job/labels/expected.golden index cac7b25c3..232cc63d9 100644 --- a/pkg/controller/appdefinition/testdata/job/labels/expected.golden +++ b/pkg/controller/appdefinition/testdata/job/labels/expected.golden @@ -15,6 +15,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/job-name: job1 acorn.io/managed: "true" + acorn.io/project-name: app-namespace alljobs: value global: value global2: value @@ -43,6 +44,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/job-name: job1 acorn.io/managed: "true" + acorn.io/project-name: app-namespace alljobs: value global: value global2: value @@ -68,6 +70,7 @@ spec: acorn.io/app-public-name: app-name acorn.io/job-name: job1 acorn.io/managed: "true" + acorn.io/project-name: app-namespace alljobs: value global: value global2: value diff --git a/pkg/controller/appdefinition/testdata/memory/all-set-overwrite/expected.golden b/pkg/controller/appdefinition/testdata/memory/all-set-overwrite/expected.golden index d9be29c33..47badaf45 100644 --- a/pkg/controller/appdefinition/testdata/memory/all-set-overwrite/expected.golden +++ b/pkg/controller/appdefinition/testdata/memory/all-set-overwrite/expected.golden @@ -8,6 +8,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace @@ -22,6 +23,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace spec: @@ -43,6 +45,7 @@ spec: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace spec: containers: - image: image-name @@ -90,6 +93,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace spec: diff --git a/pkg/controller/appdefinition/testdata/memory/all-set/expected.golden b/pkg/controller/appdefinition/testdata/memory/all-set/expected.golden index 2113baf14..a09f5cb04 100644 --- a/pkg/controller/appdefinition/testdata/memory/all-set/expected.golden +++ b/pkg/controller/appdefinition/testdata/memory/all-set/expected.golden @@ -8,6 +8,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace @@ -22,6 +23,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace spec: @@ -43,6 +45,7 @@ spec: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace spec: containers: - image: image-name @@ -90,6 +93,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace spec: diff --git a/pkg/controller/appdefinition/testdata/memory/container/expected.golden b/pkg/controller/appdefinition/testdata/memory/container/expected.golden index 8fd39e1a0..9980e04ba 100644 --- a/pkg/controller/appdefinition/testdata/memory/container/expected.golden +++ b/pkg/controller/appdefinition/testdata/memory/container/expected.golden @@ -8,6 +8,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace @@ -22,6 +23,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace spec: @@ -43,6 +45,7 @@ spec: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace spec: containers: - image: image-name @@ -86,6 +89,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace spec: diff --git a/pkg/controller/appdefinition/testdata/memory/job/expected.golden b/pkg/controller/appdefinition/testdata/memory/job/expected.golden index 9b1288ec6..f975812f0 100644 --- a/pkg/controller/appdefinition/testdata/memory/job/expected.golden +++ b/pkg/controller/appdefinition/testdata/memory/job/expected.golden @@ -10,6 +10,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/job-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace @@ -28,6 +29,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/job-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace spec: @@ -43,6 +45,7 @@ spec: acorn.io/app-public-name: app-name acorn.io/job-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace spec: containers: - env: diff --git a/pkg/controller/appdefinition/testdata/memory/overwrite-acornfile-memory/expected.golden b/pkg/controller/appdefinition/testdata/memory/overwrite-acornfile-memory/expected.golden index b339a03cc..2e803c632 100644 --- a/pkg/controller/appdefinition/testdata/memory/overwrite-acornfile-memory/expected.golden +++ b/pkg/controller/appdefinition/testdata/memory/overwrite-acornfile-memory/expected.golden @@ -8,6 +8,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace @@ -22,6 +23,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace spec: @@ -43,6 +45,7 @@ spec: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace spec: containers: - image: image-name @@ -86,6 +89,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace spec: diff --git a/pkg/controller/appdefinition/testdata/memory/sidecar/expected.golden b/pkg/controller/appdefinition/testdata/memory/sidecar/expected.golden index 75737069b..73912323d 100644 --- a/pkg/controller/appdefinition/testdata/memory/sidecar/expected.golden +++ b/pkg/controller/appdefinition/testdata/memory/sidecar/expected.golden @@ -8,6 +8,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace @@ -22,6 +23,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace spec: @@ -43,6 +45,7 @@ spec: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace spec: containers: - image: image-name @@ -86,6 +89,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace spec: diff --git a/pkg/controller/appdefinition/testdata/memory/two-containers/expected.golden b/pkg/controller/appdefinition/testdata/memory/two-containers/expected.golden index feaff64ef..b7e761e8e 100644 --- a/pkg/controller/appdefinition/testdata/memory/two-containers/expected.golden +++ b/pkg/controller/appdefinition/testdata/memory/two-containers/expected.golden @@ -8,6 +8,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace @@ -22,6 +23,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace spec: @@ -43,6 +45,7 @@ spec: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace spec: containers: - image: image-name @@ -77,6 +80,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace spec: @@ -104,6 +108,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: twoimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: twoimage namespace: app-created-namespace @@ -118,6 +123,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: twoimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: twoimage namespace: app-created-namespace spec: @@ -139,6 +145,7 @@ spec: acorn.io/app-public-name: app-name acorn.io/container-name: twoimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace spec: containers: - image: image-name @@ -169,6 +176,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: twoimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: twoimage namespace: app-created-namespace spec: diff --git a/pkg/controller/appdefinition/testdata/memory/with-acornfile-memory/expected.golden b/pkg/controller/appdefinition/testdata/memory/with-acornfile-memory/expected.golden index 76c5692b3..86d649316 100644 --- a/pkg/controller/appdefinition/testdata/memory/with-acornfile-memory/expected.golden +++ b/pkg/controller/appdefinition/testdata/memory/with-acornfile-memory/expected.golden @@ -8,6 +8,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace @@ -22,6 +23,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace spec: @@ -43,6 +45,7 @@ spec: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace spec: containers: - image: image-name @@ -86,6 +89,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace spec: diff --git a/pkg/controller/appdefinition/testdata/permissions/both/expected.golden b/pkg/controller/appdefinition/testdata/permissions/both/expected.golden index 0ae507a65..c040535ec 100644 --- a/pkg/controller/appdefinition/testdata/permissions/both/expected.golden +++ b/pkg/controller/appdefinition/testdata/permissions/both/expected.golden @@ -8,6 +8,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: twoimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: twoimage-app-name-app-namespace-1234567890ab rules: - apiGroups: @@ -28,6 +29,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: twoimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: twoimage-app-name-app-namespace-1234567890ab roleRef: apiGroup: rbac.authorization.k8s.io @@ -49,6 +51,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: twoimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: twoimage-app-name-app-namespace-1234567890ab-app-namespace namespace: app-namespace rules: @@ -70,6 +73,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: twoimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: twoimage-app-name-app-namespace-1234567890ab-app-namespace namespace: app-namespace roleRef: @@ -94,6 +98,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: twoimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: twoimage namespace: app-created-namespace @@ -108,6 +113,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: twoimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: twoimage namespace: app-created-namespace spec: @@ -129,6 +135,7 @@ spec: acorn.io/app-public-name: app-name acorn.io/container-name: twoimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace spec: containers: - image: image-name @@ -168,6 +175,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: twoimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: twoimage namespace: app-created-namespace spec: @@ -197,6 +205,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/job-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage-app-name-app-namespace-1234567890ab rules: - apiGroups: @@ -219,6 +228,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/job-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage-app-name-app-namespace-1234567890ab roleRef: apiGroup: rbac.authorization.k8s.io @@ -242,6 +252,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/job-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage-app-name-app-namespace-1234567890ab-app-namespace namespace: app-namespace rules: @@ -265,6 +276,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/job-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage-app-name-app-namespace-1234567890ab-app-namespace namespace: app-namespace roleRef: @@ -290,6 +302,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/job-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace @@ -308,6 +321,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/job-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace spec: @@ -323,6 +337,7 @@ spec: acorn.io/app-public-name: app-name acorn.io/job-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace spec: containers: - env: diff --git a/pkg/controller/appdefinition/testdata/permissions/bothwithnopermissions/expected.golden b/pkg/controller/appdefinition/testdata/permissions/bothwithnopermissions/expected.golden index 0b83c5ab6..7c1885449 100644 --- a/pkg/controller/appdefinition/testdata/permissions/bothwithnopermissions/expected.golden +++ b/pkg/controller/appdefinition/testdata/permissions/bothwithnopermissions/expected.golden @@ -8,6 +8,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: twoimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: twoimage namespace: app-created-namespace @@ -22,6 +23,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: twoimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: twoimage namespace: app-created-namespace spec: @@ -43,6 +45,7 @@ spec: acorn.io/app-public-name: app-name acorn.io/container-name: twoimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace spec: containers: - image: image-name @@ -82,6 +85,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: twoimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: twoimage namespace: app-created-namespace spec: @@ -111,6 +115,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/job-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace @@ -129,6 +134,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/job-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace spec: @@ -144,6 +150,7 @@ spec: acorn.io/app-public-name: app-name acorn.io/job-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace spec: containers: - env: diff --git a/pkg/controller/appdefinition/testdata/permissions/container/expected.golden b/pkg/controller/appdefinition/testdata/permissions/container/expected.golden index ca4f729fd..f39a43894 100644 --- a/pkg/controller/appdefinition/testdata/permissions/container/expected.golden +++ b/pkg/controller/appdefinition/testdata/permissions/container/expected.golden @@ -8,6 +8,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage-app-name-app-namespace-1234567890ab rules: - apiGroups: @@ -28,6 +29,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage-app-name-app-namespace-1234567890ab roleRef: apiGroup: rbac.authorization.k8s.io @@ -49,6 +51,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage-app-name-app-namespace-1234567890ab-app-namespace namespace: app-namespace rules: @@ -70,6 +73,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage-app-name-app-namespace-1234567890ab-app-namespace namespace: app-namespace roleRef: @@ -94,6 +98,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace @@ -108,6 +113,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace spec: @@ -129,6 +135,7 @@ spec: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace spec: containers: - image: image-name @@ -168,6 +175,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace spec: diff --git a/pkg/controller/appdefinition/testdata/permissions/containerwithnamespace/expected.golden b/pkg/controller/appdefinition/testdata/permissions/containerwithnamespace/expected.golden index d30a22388..3f8bac66a 100644 --- a/pkg/controller/appdefinition/testdata/permissions/containerwithnamespace/expected.golden +++ b/pkg/controller/appdefinition/testdata/permissions/containerwithnamespace/expected.golden @@ -8,6 +8,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage-app-name-app-namespace-1234567890ab rules: - apiGroups: @@ -28,6 +29,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage-app-name-app-namespace-1234567890ab roleRef: apiGroup: rbac.authorization.k8s.io @@ -49,6 +51,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage-app-name-app-namespace-1234567890ab-app-namespace namespace: app-namespace rules: @@ -70,6 +73,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage-app-name-app-namespace-1234567890ab-app-namespace namespace: app-namespace roleRef: @@ -92,6 +96,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage-app-name-app-namespace-1234567890ab-ns1 namespace: ns1 rules: @@ -113,6 +118,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage-app-name-app-namespace-1234567890ab-ns1 namespace: ns1 roleRef: @@ -135,6 +141,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage-app-name-app-namespace-1234567890ab-ns2 namespace: ns2 rules: @@ -156,6 +163,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage-app-name-app-namespace-1234567890ab-ns2 namespace: ns2 roleRef: @@ -180,6 +188,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace @@ -194,6 +203,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace spec: @@ -215,6 +225,7 @@ spec: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace spec: containers: - image: image-name @@ -254,6 +265,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace spec: diff --git a/pkg/controller/appdefinition/testdata/permissions/differentpermissions/expected.golden b/pkg/controller/appdefinition/testdata/permissions/differentpermissions/expected.golden index d4110dae1..9af1b2dfd 100644 --- a/pkg/controller/appdefinition/testdata/permissions/differentpermissions/expected.golden +++ b/pkg/controller/appdefinition/testdata/permissions/differentpermissions/expected.golden @@ -8,6 +8,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage-app-name-app-namespace-1234567890ab rules: - apiGroups: @@ -28,6 +29,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage-app-name-app-namespace-1234567890ab roleRef: apiGroup: rbac.authorization.k8s.io @@ -49,6 +51,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage-app-name-app-namespace-1234567890ab-app-namespace namespace: app-namespace rules: @@ -70,6 +73,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage-app-name-app-namespace-1234567890ab-app-namespace namespace: app-namespace roleRef: @@ -94,6 +98,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace @@ -108,6 +113,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace spec: @@ -129,6 +135,7 @@ spec: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace spec: containers: - image: image-name @@ -168,6 +175,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace spec: @@ -195,6 +203,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: twoimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: twoimage-app-name-app-namespace-1234567890ab rules: - apiGroups: @@ -215,6 +224,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: twoimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: twoimage-app-name-app-namespace-1234567890ab roleRef: apiGroup: rbac.authorization.k8s.io @@ -236,6 +246,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: twoimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: twoimage-app-name-app-namespace-1234567890ab-app-namespace namespace: app-namespace rules: @@ -257,6 +268,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: twoimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: twoimage-app-name-app-namespace-1234567890ab-app-namespace namespace: app-namespace roleRef: @@ -281,6 +293,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: twoimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: twoimage namespace: app-created-namespace @@ -295,6 +308,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: twoimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: twoimage namespace: app-created-namespace spec: @@ -316,6 +330,7 @@ spec: acorn.io/app-public-name: app-name acorn.io/container-name: twoimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace spec: containers: - image: image-name @@ -355,6 +370,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: twoimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: twoimage namespace: app-created-namespace spec: diff --git a/pkg/controller/appdefinition/testdata/permissions/job/expected.golden b/pkg/controller/appdefinition/testdata/permissions/job/expected.golden index 476db1104..eab559099 100644 --- a/pkg/controller/appdefinition/testdata/permissions/job/expected.golden +++ b/pkg/controller/appdefinition/testdata/permissions/job/expected.golden @@ -10,6 +10,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/job-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage-app-name-app-namespace-1234567890ab rules: - apiGroups: @@ -32,6 +33,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/job-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage-app-name-app-namespace-1234567890ab roleRef: apiGroup: rbac.authorization.k8s.io @@ -55,6 +57,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/job-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage-app-name-app-namespace-1234567890ab-app-namespace namespace: app-namespace rules: @@ -78,6 +81,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/job-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage-app-name-app-namespace-1234567890ab-app-namespace namespace: app-namespace roleRef: @@ -103,6 +107,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/job-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace @@ -121,6 +126,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/job-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace spec: @@ -136,6 +142,7 @@ spec: acorn.io/app-public-name: app-name acorn.io/job-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace spec: containers: - env: diff --git a/pkg/controller/appdefinition/testdata/permissions/multiplecontainers/expected.golden b/pkg/controller/appdefinition/testdata/permissions/multiplecontainers/expected.golden index 57c59d704..a90e8a0a1 100644 --- a/pkg/controller/appdefinition/testdata/permissions/multiplecontainers/expected.golden +++ b/pkg/controller/appdefinition/testdata/permissions/multiplecontainers/expected.golden @@ -8,6 +8,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage-app-name-app-namespace-1234567890ab rules: - apiGroups: @@ -28,6 +29,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage-app-name-app-namespace-1234567890ab roleRef: apiGroup: rbac.authorization.k8s.io @@ -49,6 +51,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage-app-name-app-namespace-1234567890ab-app-namespace namespace: app-namespace rules: @@ -70,6 +73,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage-app-name-app-namespace-1234567890ab-app-namespace namespace: app-namespace roleRef: @@ -94,6 +98,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace @@ -108,6 +113,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace spec: @@ -129,6 +135,7 @@ spec: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace spec: containers: - image: image-name @@ -168,6 +175,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace spec: @@ -195,6 +203,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: twoimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: twoimage-app-name-app-namespace-1234567890ab rules: - apiGroups: @@ -215,6 +224,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: twoimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: twoimage-app-name-app-namespace-1234567890ab roleRef: apiGroup: rbac.authorization.k8s.io @@ -236,6 +246,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: twoimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: twoimage-app-name-app-namespace-1234567890ab-app-namespace namespace: app-namespace rules: @@ -257,6 +268,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: twoimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: twoimage-app-name-app-namespace-1234567890ab-app-namespace namespace: app-namespace roleRef: @@ -281,6 +293,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: twoimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: twoimage namespace: app-created-namespace @@ -295,6 +308,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: twoimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: twoimage namespace: app-created-namespace spec: @@ -316,6 +330,7 @@ spec: acorn.io/app-public-name: app-name acorn.io/container-name: twoimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace spec: containers: - image: image-name @@ -355,6 +370,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: twoimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: twoimage namespace: app-created-namespace spec: diff --git a/pkg/controller/appdefinition/testdata/permissions/multiplejobs/expected.golden b/pkg/controller/appdefinition/testdata/permissions/multiplejobs/expected.golden index 893d9ae9a..b3775ea21 100644 --- a/pkg/controller/appdefinition/testdata/permissions/multiplejobs/expected.golden +++ b/pkg/controller/appdefinition/testdata/permissions/multiplejobs/expected.golden @@ -10,6 +10,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/job-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage-app-name-app-namespace-1234567890ab rules: - apiGroups: @@ -32,6 +33,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/job-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage-app-name-app-namespace-1234567890ab roleRef: apiGroup: rbac.authorization.k8s.io @@ -55,6 +57,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/job-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage-app-name-app-namespace-1234567890ab-app-namespace namespace: app-namespace rules: @@ -78,6 +81,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/job-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage-app-name-app-namespace-1234567890ab-app-namespace namespace: app-namespace roleRef: @@ -103,6 +107,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/job-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace @@ -121,6 +126,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/job-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace spec: @@ -136,6 +142,7 @@ spec: acorn.io/app-public-name: app-name acorn.io/job-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace spec: containers: - env: @@ -206,6 +213,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/job-name: twoimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: twoimage-app-name-app-namespace-1234567890ab rules: - apiGroups: @@ -228,6 +236,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/job-name: twoimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: twoimage-app-name-app-namespace-1234567890ab roleRef: apiGroup: rbac.authorization.k8s.io @@ -251,6 +260,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/job-name: twoimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: twoimage-app-name-app-namespace-1234567890ab-app-namespace namespace: app-namespace rules: @@ -274,6 +284,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/job-name: twoimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: twoimage-app-name-app-namespace-1234567890ab-app-namespace namespace: app-namespace roleRef: @@ -299,6 +310,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/job-name: twoimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: twoimage namespace: app-created-namespace @@ -317,6 +329,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/job-name: twoimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: twoimage namespace: app-created-namespace spec: @@ -332,6 +345,7 @@ spec: acorn.io/app-public-name: app-name acorn.io/job-name: twoimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace spec: containers: - env: diff --git a/pkg/controller/appdefinition/testdata/probes/expected.golden b/pkg/controller/appdefinition/testdata/probes/expected.golden index ea1eb54a5..2cf2580b4 100644 --- a/pkg/controller/appdefinition/testdata/probes/expected.golden +++ b/pkg/controller/appdefinition/testdata/probes/expected.golden @@ -8,6 +8,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: nodefault acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: nodefault namespace: app-created-namespace @@ -22,6 +23,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: nodefault acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: nodefault namespace: app-created-namespace spec: @@ -43,6 +45,7 @@ spec: acorn.io/app-public-name: app-name acorn.io/container-name: nodefault acorn.io/managed: "true" + acorn.io/project-name: app-namespace spec: containers: - image: image-name @@ -70,6 +73,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: nodefault acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: nodefault namespace: app-created-namespace spec: @@ -97,6 +101,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace @@ -111,6 +116,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace spec: @@ -132,6 +138,7 @@ spec: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace spec: containers: - image: image-name @@ -180,6 +187,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace spec: diff --git a/pkg/controller/appdefinition/testdata/pullsecrets/custom/expected.golden b/pkg/controller/appdefinition/testdata/pullsecrets/custom/expected.golden index 4c97a587f..cd417aeff 100644 --- a/pkg/controller/appdefinition/testdata/pullsecrets/custom/expected.golden +++ b/pkg/controller/appdefinition/testdata/pullsecrets/custom/expected.golden @@ -8,6 +8,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: buildimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: buildimage namespace: app-created-namespace @@ -22,6 +23,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: buildimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: buildimage namespace: app-created-namespace spec: @@ -43,6 +45,7 @@ spec: acorn.io/app-public-name: app-name acorn.io/container-name: buildimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace spec: containers: - image: foo.io/test@sha256:21a3deaa0d32a8057914f36584b5288d2e5ecc984380bc0118285c70fa8c9300 @@ -67,6 +70,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: buildimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: buildimage namespace: app-created-namespace spec: @@ -94,6 +98,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace @@ -108,6 +113,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace spec: @@ -129,6 +135,7 @@ spec: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace spec: containers: - image: foo.io/test@sha256:21a3deaa0d32a8057914f36584b5288d2e5ecc984380bc0118285c70fa8c9300 @@ -156,6 +163,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace spec: diff --git a/pkg/controller/appdefinition/testdata/pullsecrets/default/expected.golden b/pkg/controller/appdefinition/testdata/pullsecrets/default/expected.golden index a6c0c40de..18ad49667 100644 --- a/pkg/controller/appdefinition/testdata/pullsecrets/default/expected.golden +++ b/pkg/controller/appdefinition/testdata/pullsecrets/default/expected.golden @@ -8,6 +8,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: buildimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: buildimage namespace: app-created-namespace @@ -22,6 +23,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: buildimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: buildimage namespace: app-created-namespace spec: @@ -43,6 +45,7 @@ spec: acorn.io/app-public-name: app-name acorn.io/container-name: buildimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace spec: containers: - image: index.docker.io/library/test@sha256:21a3deaa0d32a8057914f36584b5288d2e5ecc984380bc0118285c70fa8c9300 @@ -67,6 +70,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: buildimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: buildimage namespace: app-created-namespace spec: @@ -94,6 +98,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace @@ -108,6 +113,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace spec: @@ -129,6 +135,7 @@ spec: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace spec: containers: - image: index.docker.io/library/test@sha256:21a3deaa0d32a8057914f36584b5288d2e5ecc984380bc0118285c70fa8c9300 @@ -156,6 +163,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace spec: diff --git a/pkg/controller/appdefinition/testdata/secret/expected.golden b/pkg/controller/appdefinition/testdata/secret/expected.golden index 33e5d3ccd..775447a31 100644 --- a/pkg/controller/appdefinition/testdata/secret/expected.golden +++ b/pkg/controller/appdefinition/testdata/secret/expected.golden @@ -12,6 +12,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace @@ -30,6 +31,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace spec: @@ -54,6 +56,7 @@ spec: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace spec: containers: - env: @@ -124,6 +127,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace spec: diff --git a/pkg/controller/appdefinition/testdata/service/alias/expected.golden b/pkg/controller/appdefinition/testdata/service/alias/expected.golden index b3f5114a8..37e03859d 100644 --- a/pkg/controller/appdefinition/testdata/service/alias/expected.golden +++ b/pkg/controller/appdefinition/testdata/service/alias/expected.golden @@ -11,6 +11,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: con1 acorn.io/managed: "true" + acorn.io/project-name: app-namespace both: con1val con1key: value name: con1 @@ -30,6 +31,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: con1 acorn.io/managed: "true" + acorn.io/project-name: app-namespace both: con1val con1key: value name: con1 @@ -55,6 +57,7 @@ spec: acorn.io/app-public-name: app-name acorn.io/container-name: con1 acorn.io/managed: "true" + acorn.io/project-name: app-namespace both: con1val con1key: value spec: @@ -92,6 +95,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: con1 acorn.io/managed: "true" + acorn.io/project-name: app-namespace both: con1val con1key: value name: con1 @@ -124,6 +128,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: con2 acorn.io/managed: "true" + acorn.io/project-name: app-namespace both: con2val con2key: value name: con2 @@ -143,6 +148,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: con2 acorn.io/managed: "true" + acorn.io/project-name: app-namespace both: con2val con2key: value name: con2 @@ -168,6 +174,7 @@ spec: acorn.io/app-public-name: app-name acorn.io/container-name: con2 acorn.io/managed: "true" + acorn.io/project-name: app-namespace both: con2val con2key: value spec: @@ -205,6 +212,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: con2 acorn.io/managed: "true" + acorn.io/project-name: app-namespace both: con2val con2key: value name: con2 @@ -234,6 +242,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: con3 acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: con3 namespace: app-created-namespace @@ -248,6 +257,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: con3 acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: con3 namespace: app-created-namespace spec: @@ -269,6 +279,7 @@ spec: acorn.io/app-public-name: app-name acorn.io/container-name: con3 acorn.io/managed: "true" + acorn.io/project-name: app-namespace spec: containers: - image: foo @@ -296,6 +307,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: con3 acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: con3 namespace: app-created-namespace spec: diff --git a/pkg/controller/appdefinition/testdata/service/basic/expected.golden b/pkg/controller/appdefinition/testdata/service/basic/expected.golden index 5f7274fbf..2ff9c3226 100644 --- a/pkg/controller/appdefinition/testdata/service/basic/expected.golden +++ b/pkg/controller/appdefinition/testdata/service/basic/expected.golden @@ -8,6 +8,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: buildimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: buildimage namespace: app-created-namespace @@ -22,6 +23,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: buildimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: buildimage namespace: app-created-namespace spec: @@ -43,6 +45,7 @@ spec: acorn.io/app-public-name: app-name acorn.io/container-name: buildimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace spec: containers: - image: sha256:build-image @@ -75,6 +78,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: buildimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: buildimage namespace: app-created-namespace spec: @@ -102,6 +106,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace @@ -116,6 +121,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace spec: @@ -137,6 +143,7 @@ spec: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace spec: containers: - image: image-name @@ -176,6 +183,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: oneimage acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: oneimage namespace: app-created-namespace spec: diff --git a/pkg/controller/appdefinition/testdata/template/expected.golden b/pkg/controller/appdefinition/testdata/template/expected.golden index 203a389ff..0a0a9fd1a 100644 --- a/pkg/controller/appdefinition/testdata/template/expected.golden +++ b/pkg/controller/appdefinition/testdata/template/expected.golden @@ -8,6 +8,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: container-name acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: container-name namespace: app-created-namespace @@ -22,6 +23,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: container-name acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: container-name namespace: app-created-namespace spec: @@ -43,6 +45,7 @@ spec: acorn.io/app-public-name: app-name acorn.io/container-name: container-name acorn.io/managed: "true" + acorn.io/project-name: app-namespace spec: containers: - image: image-name @@ -67,6 +70,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: container-name acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: container-name namespace: app-created-namespace spec: diff --git a/pkg/controller/appdefinition/testdata/volumes/cluster-default-with-bind-combos/expected.golden b/pkg/controller/appdefinition/testdata/volumes/cluster-default-with-bind-combos/expected.golden index c5ecc5e3b..f5be53d25 100644 --- a/pkg/controller/appdefinition/testdata/volumes/cluster-default-with-bind-combos/expected.golden +++ b/pkg/controller/appdefinition/testdata/volumes/cluster-default-with-bind-combos/expected.golden @@ -8,6 +8,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: container-name acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: container-name namespace: app-created-namespace @@ -22,6 +23,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: container-name acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: container-name namespace: app-created-namespace spec: @@ -45,6 +47,7 @@ spec: acorn.io/app-public-name: app-name acorn.io/container-name: container-name acorn.io/managed: "true" + acorn.io/project-name: app-namespace spec: containers: - image: image-name @@ -81,6 +84,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: container-name acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: container-name namespace: app-created-namespace spec: diff --git a/pkg/controller/appdefinition/testdata/volumes/configure-but-no-bind/expected.golden b/pkg/controller/appdefinition/testdata/volumes/configure-but-no-bind/expected.golden index 9acbdb399..504c6ab32 100644 --- a/pkg/controller/appdefinition/testdata/volumes/configure-but-no-bind/expected.golden +++ b/pkg/controller/appdefinition/testdata/volumes/configure-but-no-bind/expected.golden @@ -8,6 +8,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: container-name acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: container-name namespace: app-created-namespace @@ -22,6 +23,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: container-name acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: container-name namespace: app-created-namespace spec: @@ -45,6 +47,7 @@ spec: acorn.io/app-public-name: app-name acorn.io/container-name: container-name acorn.io/managed: "true" + acorn.io/project-name: app-namespace spec: containers: - image: image-name @@ -76,6 +79,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: container-name acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: container-name namespace: app-created-namespace spec: diff --git a/pkg/controller/appdefinition/testdata/volumes/contextdir/expected.golden b/pkg/controller/appdefinition/testdata/volumes/contextdir/expected.golden index 25ff274b6..71207cecf 100644 --- a/pkg/controller/appdefinition/testdata/volumes/contextdir/expected.golden +++ b/pkg/controller/appdefinition/testdata/volumes/contextdir/expected.golden @@ -8,6 +8,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: container-name acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: container-name namespace: app-created-namespace @@ -22,6 +23,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: container-name acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: container-name namespace: app-created-namespace spec: @@ -44,6 +46,7 @@ spec: acorn.io/app-public-name: app-name acorn.io/container-name: container-name acorn.io/managed: "true" + acorn.io/project-name: app-namespace spec: containers: - image: image-name @@ -68,6 +71,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: container-name acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: container-name namespace: app-created-namespace spec: diff --git a/pkg/controller/appdefinition/testdata/volumes/defaults/expected.golden b/pkg/controller/appdefinition/testdata/volumes/defaults/expected.golden index 7e18cd209..067c97de8 100644 --- a/pkg/controller/appdefinition/testdata/volumes/defaults/expected.golden +++ b/pkg/controller/appdefinition/testdata/volumes/defaults/expected.golden @@ -8,6 +8,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: container-name acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: container-name namespace: app-created-namespace @@ -22,6 +23,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: container-name acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: container-name namespace: app-created-namespace spec: @@ -45,6 +47,7 @@ spec: acorn.io/app-public-name: app-name acorn.io/container-name: container-name acorn.io/managed: "true" + acorn.io/project-name: app-namespace spec: containers: - image: image-name @@ -76,6 +79,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: container-name acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: container-name namespace: app-created-namespace spec: diff --git a/pkg/controller/appdefinition/testdata/volumes/empty/expected.golden b/pkg/controller/appdefinition/testdata/volumes/empty/expected.golden index 68d7a4abc..6896fd5b4 100644 --- a/pkg/controller/appdefinition/testdata/volumes/empty/expected.golden +++ b/pkg/controller/appdefinition/testdata/volumes/empty/expected.golden @@ -8,6 +8,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: container-name acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: container-name namespace: app-created-namespace @@ -22,6 +23,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: container-name acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: container-name namespace: app-created-namespace spec: @@ -45,6 +47,7 @@ spec: acorn.io/app-public-name: app-name acorn.io/container-name: container-name acorn.io/managed: "true" + acorn.io/project-name: app-namespace spec: containers: - image: image-name @@ -76,6 +79,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: container-name acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: container-name namespace: app-created-namespace spec: diff --git a/pkg/controller/appdefinition/testdata/volumes/ephemeral-bound/expected.golden b/pkg/controller/appdefinition/testdata/volumes/ephemeral-bound/expected.golden index ed9ceb7d2..2eedf9306 100644 --- a/pkg/controller/appdefinition/testdata/volumes/ephemeral-bound/expected.golden +++ b/pkg/controller/appdefinition/testdata/volumes/ephemeral-bound/expected.golden @@ -8,6 +8,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: container-name acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: container-name namespace: app-created-namespace @@ -22,6 +23,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: container-name acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: container-name namespace: app-created-namespace spec: @@ -43,6 +45,7 @@ spec: acorn.io/app-public-name: app-name acorn.io/container-name: container-name acorn.io/managed: "true" + acorn.io/project-name: app-namespace spec: containers: - image: image-name @@ -74,6 +77,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: container-name acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: container-name namespace: app-created-namespace spec: diff --git a/pkg/controller/appdefinition/testdata/volumes/ephemeral/expected.golden b/pkg/controller/appdefinition/testdata/volumes/ephemeral/expected.golden index 633a1e566..64ed9cc98 100644 --- a/pkg/controller/appdefinition/testdata/volumes/ephemeral/expected.golden +++ b/pkg/controller/appdefinition/testdata/volumes/ephemeral/expected.golden @@ -8,6 +8,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: container-name acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: container-name namespace: app-created-namespace @@ -22,6 +23,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: container-name acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: container-name namespace: app-created-namespace spec: @@ -43,6 +45,7 @@ spec: acorn.io/app-public-name: app-name acorn.io/container-name: container-name acorn.io/managed: "true" + acorn.io/project-name: app-namespace spec: containers: - image: image-name @@ -74,6 +77,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: container-name acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: container-name namespace: app-created-namespace spec: diff --git a/pkg/controller/appdefinition/testdata/volumes/inactive-class/expected.golden b/pkg/controller/appdefinition/testdata/volumes/inactive-class/expected.golden index 7e18cd209..067c97de8 100644 --- a/pkg/controller/appdefinition/testdata/volumes/inactive-class/expected.golden +++ b/pkg/controller/appdefinition/testdata/volumes/inactive-class/expected.golden @@ -8,6 +8,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: container-name acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: container-name namespace: app-created-namespace @@ -22,6 +23,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: container-name acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: container-name namespace: app-created-namespace spec: @@ -45,6 +47,7 @@ spec: acorn.io/app-public-name: app-name acorn.io/container-name: container-name acorn.io/managed: "true" + acorn.io/project-name: app-namespace spec: containers: - image: image-name @@ -76,6 +79,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: container-name acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: container-name namespace: app-created-namespace spec: diff --git a/pkg/controller/appdefinition/testdata/volumes/named-bound/expected.golden b/pkg/controller/appdefinition/testdata/volumes/named-bound/expected.golden index 4cc582968..3b38c198a 100644 --- a/pkg/controller/appdefinition/testdata/volumes/named-bound/expected.golden +++ b/pkg/controller/appdefinition/testdata/volumes/named-bound/expected.golden @@ -8,6 +8,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: container-name acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: container-name namespace: app-created-namespace @@ -22,6 +23,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: container-name acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: container-name namespace: app-created-namespace spec: @@ -45,6 +47,7 @@ spec: acorn.io/app-public-name: app-name acorn.io/container-name: container-name acorn.io/managed: "true" + acorn.io/project-name: app-namespace spec: containers: - image: image-name @@ -76,6 +79,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: container-name acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: container-name namespace: app-created-namespace spec: diff --git a/pkg/controller/appdefinition/testdata/volumes/named/expected.golden b/pkg/controller/appdefinition/testdata/volumes/named/expected.golden index 65a2c73d8..ac8c3c610 100644 --- a/pkg/controller/appdefinition/testdata/volumes/named/expected.golden +++ b/pkg/controller/appdefinition/testdata/volumes/named/expected.golden @@ -8,6 +8,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: container-name acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: container-name namespace: app-created-namespace @@ -22,6 +23,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: container-name acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: container-name namespace: app-created-namespace spec: @@ -45,6 +47,7 @@ spec: acorn.io/app-public-name: app-name acorn.io/container-name: container-name acorn.io/managed: "true" + acorn.io/project-name: app-namespace spec: containers: - image: image-name @@ -76,6 +79,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: container-name acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: container-name namespace: app-created-namespace spec: diff --git a/pkg/controller/appdefinition/testdata/volumes/no-default-class/expected.golden b/pkg/controller/appdefinition/testdata/volumes/no-default-class/expected.golden index 68d7a4abc..6896fd5b4 100644 --- a/pkg/controller/appdefinition/testdata/volumes/no-default-class/expected.golden +++ b/pkg/controller/appdefinition/testdata/volumes/no-default-class/expected.golden @@ -8,6 +8,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: container-name acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: container-name namespace: app-created-namespace @@ -22,6 +23,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: container-name acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: container-name namespace: app-created-namespace spec: @@ -45,6 +47,7 @@ spec: acorn.io/app-public-name: app-name acorn.io/container-name: container-name acorn.io/managed: "true" + acorn.io/project-name: app-namespace spec: containers: - image: image-name @@ -76,6 +79,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: container-name acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: container-name namespace: app-created-namespace spec: diff --git a/pkg/controller/appdefinition/testdata/volumes/reuse-existing/expected.golden b/pkg/controller/appdefinition/testdata/volumes/reuse-existing/expected.golden index a85bd165d..46a9cf61b 100644 --- a/pkg/controller/appdefinition/testdata/volumes/reuse-existing/expected.golden +++ b/pkg/controller/appdefinition/testdata/volumes/reuse-existing/expected.golden @@ -8,6 +8,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: container-name acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: container-name namespace: app-created-namespace @@ -22,6 +23,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: container-name acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: container-name namespace: app-created-namespace spec: @@ -45,6 +47,7 @@ spec: acorn.io/app-public-name: app-name acorn.io/container-name: container-name acorn.io/managed: "true" + acorn.io/project-name: app-namespace spec: containers: - image: image-name @@ -76,6 +79,7 @@ metadata: acorn.io/app-public-name: app-name acorn.io/container-name: container-name acorn.io/managed: "true" + acorn.io/project-name: app-namespace name: container-name namespace: app-created-namespace spec: diff --git a/pkg/secrets/interpolation.go b/pkg/secrets/interpolation.go index 076fe1eec..70cd4bf02 100644 --- a/pkg/secrets/interpolation.go +++ b/pkg/secrets/interpolation.go @@ -178,12 +178,12 @@ func (i *Interpolator) ToVolumeMount(filename string, file v1.File) corev1.Volum } func (i *Interpolator) getExternalID() (string, error) { - accountID, err := i.getAccountID() + accountID, err := i.GetAccountID() if err != nil { return "", err } - projectName, err := i.getProjectName() + projectName, err := i.GetProjectName() if err != nil { return "", err } @@ -192,25 +192,31 @@ func (i *Interpolator) getExternalID() (string, error) { return externalid.ExternalID(accountID, projectName, appName), nil } -func (i *Interpolator) getAccountID() (string, error) { +func (i *Interpolator) GetAccountID() (string, error) { ns := &corev1.Namespace{} - if err := i.client.Get(i.ctx, router.Key("", i.app.Namespace), ns); err != nil { + // Not found check is to make unit tests easier + if err := i.client.Get(i.ctx, router.Key("", i.app.Namespace), ns); err != nil && !apierrors.IsNotFound(err) { return "", err } name := ns.Labels[labels.AcornAccountID] if name == "" { ns := &corev1.Namespace{} - if err := i.client.Get(i.ctx, router.Key("", "kube-system"), ns); err != nil { + // Not found check is to make unit tests easier + if err := i.client.Get(i.ctx, router.Key("", "kube-system"), ns); err != nil && !apierrors.IsNotFound(err) { return "", err } - return "runtime-" + string(ns.UID[:8]), nil + if ns.UID != "" { + return "runtime-" + string(ns.UID[:8]), nil + } + return "", nil } return name, nil } -func (i *Interpolator) getProjectName() (string, error) { +func (i *Interpolator) GetProjectName() (string, error) { ns := &corev1.Namespace{} - if err := i.client.Get(i.ctx, router.Key("", i.app.Namespace), ns); err != nil { + // Not found check is to make unit tests easier + if err := i.client.Get(i.ctx, router.Key("", i.app.Namespace), ns); err != nil && !apierrors.IsNotFound(err) { return "", err } name := ns.Labels[labels.AcornProjectName] @@ -225,10 +231,10 @@ func (i *Interpolator) resolveApp(keyName string) (string, bool, error) { case "name": return publicname.Get(i.app), true, nil case "account": - accountID, err := i.getAccountID() + accountID, err := i.GetAccountID() return accountID, true, err case "project": - projectName, err := i.getProjectName() + projectName, err := i.GetProjectName() return projectName, true, err case "namespace": return i.app.Status.Namespace, true, nil