Skip to content
Open
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
6 changes: 3 additions & 3 deletions src/internal/api/v1alpha1/validate.go
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
const (
// ZarfMaxChartNameLength limits helm chart name size to account for K8s/helm limits and zarf prefix
ZarfMaxChartNameLength = 40
errChartReleaseNameEmpty = "release name empty, unable to fallback to chart name"
errChartReleaseNameEmpty = "release name empty, unable to fall back to chart name"
)

// Package errors found during validation.
Expand Down Expand Up @@ -248,10 +248,10 @@ func validateAction(action v1alpha1.ZarfComponentAction) error {
return err
}

// validateReleaseName validates a release name against DNS 1035 spec, using chartName as fallback.
// validateReleaseName validates a release name against DNS 1035 spec, using chartName as a fallback.
// https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#rfc-1035-label-names
func validateReleaseName(chartName, releaseName string) error {
// Fallback to chartName if releaseName is empty
// Fall back to chartName if releaseName is empty
// NOTE: Similar fallback mechanism happens in src/internal/packager/helm/chart.go:InstallOrUpgradeChart
if releaseName == "" {
releaseName = chartName
Expand Down
2 changes: 1 addition & 1 deletion src/internal/api/v1alpha1/validate_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ func TestValidateChart(t *testing.T) {
partialMatch: true,
},
{
name: "missing releaseName fallsback to name",
name: "missing releaseName falls back to name",
Comment thread
luojiyin1987 marked this conversation as resolved.
chart: v1alpha1.ZarfChart{Name: "chart3", Namespace: "namespace", URL: "http://whatever", Version: "v1.0.0"},
expectedErrs: nil,
},
Expand Down
2 changes: 1 addition & 1 deletion src/pkg/packager/publish_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -315,7 +315,7 @@ func TestPublishPackageDirectoryNameCollision(t *testing.T) {
require.NoError(t, err)

// Create a temporary directory to use as working directory and
// create a subdir with same name as the package to test name collission
// create a subdir with same name as the package to test name collision
// https://github.com/zarf-dev/zarf/issues/4148
tmpDir := t.TempDir()
collisionDir := filepath.Join(tmpDir, "test")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: scrach
name: scratch
spec:
selector:
matchLabels:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: scrach
name: scratch
spec:
selector:
matchLabels:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: apps/v1
kind: Deployment
metadata:
name: scrach
name: scratch
spec:
selector:
matchLabels:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ spec:
image: xn--7o8h.com/myimage:9.8.7
- name: project
image: registry.io/foo/project--id.module--name.ver---sion--name
- name: seperate
- name: separate
image: foo_bar:latest
- name: domain-port
image: foo.com:8080/bar:1.2.3
Expand Down