Skip to content

Add missing v1beta11 version #2332

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.

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
merged 1 commit into from
Jun 25, 2019
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
46 changes: 44 additions & 2 deletions pkg/skaffold/schema/samples_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,17 +30,20 @@ import (
)

const (
samplesRoot = "../../../docs/content/en/samples"
samplesRoot = "../../../docs/content/en/samples"
examplesRoot = "../../../examples"
)

var (
ignoredSamples = []string{"structureTest.yaml", "build.sh"}
)

// Samples are skaffold.yaml fragments that are used
// in the documentation.
func TestParseSamples(t *testing.T) {
paths, err := findSamples(samplesRoot)
if err != nil {
t.Fatalf("unable to read sample files in %q", samplesRoot)
t.Fatalf("unable to list samples in %q", samplesRoot)
}

if len(paths) == 0 {
Expand Down Expand Up @@ -70,6 +73,32 @@ func TestParseSamples(t *testing.T) {
}
}

// TestParseExamples complete skaffold.yaml that user can use
// with the latest release of Skaffold.
func TestParseExamples(t *testing.T) {
paths, err := findExamples(examplesRoot)
if err != nil {
t.Fatalf("unable to list examples in %q", examplesRoot)
}

if len(paths) == 0 {
t.Fatalf("did not find examples in %q", examplesRoot)
}

for _, path := range paths {
name := filepath.Base(filepath.Dir(path))

testutil.Run(t, name, func(t *testutil.T) {
buf, err := ioutil.ReadFile(path)
t.CheckNoError(err)

configFile := t.TempFile("skaffold.yaml", buf)
_, err = ParseConfig(configFile, true)
t.CheckNoError(err)
})
}
}

func findSamples(root string) ([]string, error) {
var files []string

Expand All @@ -83,6 +112,19 @@ func findSamples(root string) ([]string, error) {
return files, err
}

func findExamples(root string) ([]string, error) {
var files []string

err := filepath.Walk(root, func(path string, info os.FileInfo, err error) error {
if !info.IsDir() && info.Name() == "skaffold.yaml" {
files = append(files, path)
}
return err
})

return files, err
}

func addHeader(buf []byte) []byte {
if bytes.HasPrefix(buf, []byte("apiVersion:")) {
return buf
Expand Down
2 changes: 2 additions & 0 deletions pkg/skaffold/schema/versions.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ import (
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/v1alpha5"
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/v1beta1"
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/v1beta10"
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/v1beta11"
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/v1beta2"
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/v1beta3"
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/v1beta4"
Expand Down Expand Up @@ -63,6 +64,7 @@ var SchemaVersions = Versions{
{v1beta8.Version, v1beta8.NewSkaffoldConfig},
{v1beta9.Version, v1beta9.NewSkaffoldConfig},
{v1beta10.Version, v1beta10.NewSkaffoldConfig},
{v1beta11.Version, v1beta11.NewSkaffoldConfig},
{latest.Version, latest.NewSkaffoldConfig},
}

Expand Down