Skip to content

refactor: move template out of internal #5212

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
brandtkeller merged 2 commits into from
Aug 18, 2026
Merged

refactor: move template out of internal #5212

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9eb0433
refactor!: move template out of internal
a1994sc Aug 11, 2026
7550389
refactor!: move template to pkg
a1994sc Aug 14, 2026
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
1 change: 1 addition & 0 deletions .prekignore
View file
Open in desktop
Comment thread
AustinAbro321 marked this conversation as resolved.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
vendor/
1 change: 0 additions & 1 deletion src/internal/template/testdata/invalid/input.yaml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion src/pkg/packager/actions/actions.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (
"github.com/goccy/go-yaml"
"github.com/zarf-dev/zarf/src/api/v1alpha1"
ptmpl "github.com/zarf-dev/zarf/src/internal/packager/template"
"github.com/zarf-dev/zarf/src/internal/template"
"github.com/zarf-dev/zarf/src/pkg/logger"
"github.com/zarf-dev/zarf/src/pkg/packager/template"
Comment thread
AustinAbro321 marked this conversation as resolved.
Outdated
"github.com/zarf-dev/zarf/src/pkg/utils"
"github.com/zarf-dev/zarf/src/pkg/utils/exec"
"github.com/zarf-dev/zarf/src/pkg/value"
Expand Down
2 changes: 1 addition & 1 deletion src/pkg/packager/assemble/assemble.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,14 @@ import (
"github.com/zarf-dev/zarf/src/internal/git"
"github.com/zarf-dev/zarf/src/internal/packager/helm"
"github.com/zarf-dev/zarf/src/internal/packager/kustomize"
"github.com/zarf-dev/zarf/src/internal/template"
"github.com/zarf-dev/zarf/src/pkg/archive"
"github.com/zarf-dev/zarf/src/pkg/images"
"github.com/zarf-dev/zarf/src/pkg/logger"
"github.com/zarf-dev/zarf/src/pkg/packager/actions"
"github.com/zarf-dev/zarf/src/pkg/packager/filters"
"github.com/zarf-dev/zarf/src/pkg/packager/layout"
"github.com/zarf-dev/zarf/src/pkg/packager/load"
"github.com/zarf-dev/zarf/src/pkg/packager/template"
"github.com/zarf-dev/zarf/src/pkg/signing"
"github.com/zarf-dev/zarf/src/pkg/transform"
"github.com/zarf-dev/zarf/src/pkg/utils"
Expand Down
2 changes: 1 addition & 1 deletion src/pkg/packager/deploy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ import (
"github.com/zarf-dev/zarf/src/internal/packager/helm"
"github.com/zarf-dev/zarf/src/internal/packager/requirements"
ptmpl "github.com/zarf-dev/zarf/src/internal/packager/template"
"github.com/zarf-dev/zarf/src/internal/template"
"github.com/zarf-dev/zarf/src/pkg/cluster"
"github.com/zarf-dev/zarf/src/pkg/feature"
"github.com/zarf-dev/zarf/src/pkg/images"
"github.com/zarf-dev/zarf/src/pkg/logger"
"github.com/zarf-dev/zarf/src/pkg/packager/actions"
"github.com/zarf-dev/zarf/src/pkg/packager/filters"
"github.com/zarf-dev/zarf/src/pkg/packager/layout"
"github.com/zarf-dev/zarf/src/pkg/packager/template"
"github.com/zarf-dev/zarf/src/pkg/pki"
"github.com/zarf-dev/zarf/src/pkg/state"
"github.com/zarf-dev/zarf/src/pkg/transform"
Expand Down
2 changes: 1 addition & 1 deletion src/pkg/packager/find_images.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ import (
"github.com/zarf-dev/zarf/src/config"
"github.com/zarf-dev/zarf/src/internal/packager/helm"
"github.com/zarf-dev/zarf/src/internal/packager/template"
itpl "github.com/zarf-dev/zarf/src/internal/template"
"github.com/zarf-dev/zarf/src/pkg/images"
"github.com/zarf-dev/zarf/src/pkg/logger"
"github.com/zarf-dev/zarf/src/pkg/packager/layout"
"github.com/zarf-dev/zarf/src/pkg/packager/load"
itpl "github.com/zarf-dev/zarf/src/pkg/packager/template"
"github.com/zarf-dev/zarf/src/pkg/state"
"github.com/zarf-dev/zarf/src/pkg/transform"
"github.com/zarf-dev/zarf/src/pkg/utils"
Expand Down
2 changes: 1 addition & 1 deletion src/pkg/packager/inspect.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ import (
"github.com/zarf-dev/zarf/src/config"
"github.com/zarf-dev/zarf/src/internal/packager/helm"
"github.com/zarf-dev/zarf/src/internal/packager/template"
tmpl "github.com/zarf-dev/zarf/src/internal/template"
"github.com/zarf-dev/zarf/src/pkg/feature"
"github.com/zarf-dev/zarf/src/pkg/packager/assemble"
"github.com/zarf-dev/zarf/src/pkg/packager/layout"
"github.com/zarf-dev/zarf/src/pkg/packager/load"
tmpl "github.com/zarf-dev/zarf/src/pkg/packager/template"
"github.com/zarf-dev/zarf/src/pkg/state"
"github.com/zarf-dev/zarf/src/pkg/utils"
"github.com/zarf-dev/zarf/src/pkg/value"
Expand Down
2 changes: 1 addition & 1 deletion src/pkg/packager/remove.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ import (

"github.com/zarf-dev/zarf/src/internal/packager/helm"
"github.com/zarf-dev/zarf/src/internal/packager/requirements"
"github.com/zarf-dev/zarf/src/internal/template"
"github.com/zarf-dev/zarf/src/pkg/feature"
"github.com/zarf-dev/zarf/src/pkg/logger"
"github.com/zarf-dev/zarf/src/pkg/packager/template"
"github.com/zarf-dev/zarf/src/pkg/state"
"github.com/zarf-dev/zarf/src/pkg/value"

Expand Down
0 src/internal/template/refs.go → src/pkg/packager/template/refs.go
View file
Open in desktop
File renamed without changes.
0 src/internal/template/refs_test.go → src/pkg/packager/template/refs_test.go
View file
Open in desktop
File renamed without changes.
0 src/internal/template/template.go → src/pkg/packager/template/template.go
View file
Open in desktop
File renamed without changes.
0 src/internal/template/template_test.go → src/pkg/packager/template/template_test.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...template/testdata/configmap/expected.yaml → ...template/testdata/configmap/expected.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ kind: ConfigMap
metadata:
name: my-config
data:
port: "8080"
port: "8080"
2 changes: 1 addition & 1 deletion ...al/template/testdata/configmap/input.yaml → ...er/template/testdata/configmap/input.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ kind: ConfigMap
metadata:
name: {{ .Values.app.name }}
data:
port: "{{ .Values.app.port }}"
port: "{{ .Values.app.port }}"
0 ...template/testdata/constants/expected.yaml → ...template/testdata/constants/expected.yaml
View file
Open in desktop
File renamed without changes.
0 ...al/template/testdata/constants/input.yaml → ...er/template/testdata/constants/input.yaml
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...emplate/testdata/deployment/expected.yaml → ...emplate/testdata/deployment/expected.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ spec:
replicas: 3
selector:
matchLabels:
app: my-deployment
app: my-deployment
2 changes: 1 addition & 1 deletion ...l/template/testdata/deployment/input.yaml → ...r/template/testdata/deployment/input.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ spec:
replicas: {{ .Values.app.replicas }}
selector:
matchLabels:
app: {{ .Values.app.name }}
app: {{ .Values.app.name }}
1 change: 1 addition & 0 deletions src/pkg/packager/template/testdata/invalid/input.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
name: {{ .Values.missing
2 changes: 1 addition & 1 deletion ...mplate/testdata/sprig-basic/expected.yaml → ...mplate/testdata/sprig-basic/expected.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ message: Hello World
count: 3
first: 1
last: 3
quoted: "hello"
quoted: "hello"
2 changes: 1 addition & 1 deletion .../template/testdata/sprig-basic/input.yaml → .../template/testdata/sprig-basic/input.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ message: {{ .Values.message | title }}
count: {{ .Values.numbers | len }}
first: {{ .Values.numbers | first }}
last: {{ .Values.numbers | last }}
quoted: {{ .Values.text | quote }}
quoted: {{ .Values.text | quote }}
2 changes: 1 addition & 1 deletion ...te/testdata/sprig-functions/expected.yaml → ...te/testdata/sprig-functions/expected.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@ data:
timestamp: "2023-01-01"
random: abc12345
joined: "apple,banana,cherry"
default-value: "fallback"
default-value: "fallback"
0 ...plate/testdata/sprig-functions/input.yaml → ...plate/testdata/sprig-functions/input.yaml
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion src/pkg/packager/values_preflight.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ import (
"github.com/zarf-dev/zarf/src/api/v1alpha1"
"github.com/zarf-dev/zarf/src/config"
"github.com/zarf-dev/zarf/src/internal/packager/helm"
"github.com/zarf-dev/zarf/src/internal/template"
"github.com/zarf-dev/zarf/src/pkg/packager/layout"
"github.com/zarf-dev/zarf/src/pkg/packager/template"
"github.com/zarf-dev/zarf/src/pkg/utils"
"github.com/zarf-dev/zarf/src/pkg/value"
)
Expand Down