Skip to content
This repository has been archived by the owner on Mar 16, 2024. It is now read-only.

Add support for acorn.region interpolation in Acornfiles #2391

Merged
merged 1 commit into from
Jan 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions pkg/controller/controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,7 @@ type Controller struct {
}

func New(ctx context.Context) (*Controller, error) {
if err := crds.Create(ctx, scheme.Scheme, v1.SchemeGroupVersion); err != nil {
return nil, err
}
if err := crds.Create(ctx, scheme.Scheme, adminv1.SchemeGroupVersion); err != nil {
if err := crds.Create(ctx, scheme.Scheme, v1.SchemeGroupVersion, adminv1.SchemeGroupVersion); err != nil {
return nil, err
}

Expand Down
3 changes: 2 additions & 1 deletion pkg/jobs/jobs.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import (
v1 "github.com/acorn-io/runtime/pkg/apis/internal.acorn.io/v1"
"github.com/acorn-io/runtime/pkg/appdefinition"
"github.com/acorn-io/runtime/pkg/encryption/nacl"
"github.com/acorn-io/z"
corev1 "k8s.io/api/core/v1"
apierror "k8s.io/apimachinery/pkg/api/errors"
"k8s.io/utils/strings/slices"
Expand Down Expand Up @@ -138,7 +139,7 @@ func GetEvent(jobName string, appInstance *v1.AppInstance) string {
if !appInstance.DeletionTimestamp.IsZero() {
return "delete"
}
if appInstance.Spec.Stop != nil && *appInstance.Spec.Stop {
if z.Dereference(appInstance.Spec.Stop) {
return "stop"
}
if (appInstance.Generation <= 1 || slices.Contains(appInstance.Status.AppSpec.Jobs[jobName].Events, "create")) && !appInstance.Status.AppStatus.Jobs[jobName].CreateEventSucceeded {
Expand Down
16 changes: 16 additions & 0 deletions pkg/secrets/interpolation.go
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,19 @@ func (i *Interpolator) GetProjectName() (string, error) {
return name, nil
}

func (i *Interpolator) GetRegion() (string, error) {
if region := i.app.GetRegion(); region != "" {
return region, nil
}

project := &v1.ProjectInstance{}
if err := i.client.Get(i.ctx, router.Key("", i.app.Namespace), project); err != nil {
return "", err
}

return project.Status.DefaultRegion, nil
njhale marked this conversation as resolved.
Show resolved Hide resolved
}

func (i *Interpolator) resolveApp(keyName string) (string, bool, error) {
switch strings.ToLower(keyName) {
case "name":
Expand Down Expand Up @@ -270,6 +283,9 @@ func (i *Interpolator) resolveApp(keyName string) (string, bool, error) {
case "externalid":
externalID, err := i.getExternalID()
return externalID, true, err
case "region":
region, err := i.GetRegion()
return region, true, err
}
return "", false, nil
}
Expand Down
Loading