Skip to content

Commit 88a27ab

Browse files
gsquared94gsquared94
authored
chore: remove v1 config package and move it to latest package. (#7290)
1 parent a06a46c commit 88a27ab

File tree

324 files changed

+3591
-3595
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

324 files changed

+3591
-3595
lines changed

‎DEVELOPMENT.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ to be submitted.
7070

7171
Some changes to the skaffold code require a change to the skaffold config. These changes require a few extra steps:
7272

73-
* Open the latest Config at [pkg/skaffold/schema/latest/v1/config.go](https://github.com/GoogleContainerTools/skaffold/blob/main/pkg/skaffold/schema/latest/v1/config.go) and inspect the comment at [L28](https://github.com/GoogleContainerTools/skaffold/blob/main/pkg/skaffold/schema/latest/v1/config.go#L28)
73+
* Open the latest Config at [pkg/skaffold/schema/latest/config.go](https://github.com/GoogleContainerTools/skaffold/blob/main/pkg/skaffold/schema/latest/config.go) and inspect the comment at [L28](https://github.com/GoogleContainerTools/skaffold/blob/main/pkg/skaffold/schema/latest/config.go#L28)
7474
* If the line mentions the config version is not released, proceed making your changes.
7575
```
7676
// This config version is not yet released, it is SAFE TO MODIFY the structs in this file.

‎cmd/skaffold/app/cmd/build.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import (
2828
"github.com/GoogleContainerTools/skaffold/cmd/skaffold/app/flags"
2929
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/config"
3030
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner"
31-
latestV1 "github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest/v1"
31+
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest"
3232
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/util"
3333
)
3434

@@ -95,10 +95,10 @@ func doBuild(ctx context.Context, out io.Writer) error {
9595
})
9696
}
9797

98-
func targetArtifacts(opts config.SkaffoldOptions, configs []util.VersionedConfig) []*latestV1.Artifact {
99-
var targetArtifacts []*latestV1.Artifact
98+
func targetArtifacts(opts config.SkaffoldOptions, configs []util.VersionedConfig) []*latest.Artifact {
99+
var targetArtifacts []*latest.Artifact
100100
for _, cfg := range configs {
101-
for _, artifact := range cfg.(*latestV1.SkaffoldConfig).Build.Artifacts {
101+
for _, artifact := range cfg.(*latest.SkaffoldConfig).Build.Artifacts {
102102
if opts.IsTargetImage(artifact) {
103103
targetArtifacts = append(targetArtifacts, artifact)
104104
}

‎cmd/skaffold/app/cmd/build_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import (
2929
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/graph"
3030
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner"
3131
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner/runcontext"
32-
latestV1 "github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest/v1"
32+
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest"
3333
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/util"
3434
"github.com/GoogleContainerTools/skaffold/testutil"
3535
)
@@ -38,7 +38,7 @@ type mockRunner struct {
3838
runner.Runner
3939
}
4040

41-
func (r *mockRunner) Build(ctx context.Context, out io.Writer, artifacts []*latestV1.Artifact) ([]graph.Artifact, error) {
41+
func (r *mockRunner) Build(ctx context.Context, out io.Writer, artifacts []*latest.Artifact) ([]graph.Artifact, error) {
4242
out.Write([]byte("Build Completed"))
4343
return []graph.Artifact{{
4444
ImageName: "gcr.io/skaffold/example",
@@ -52,7 +52,7 @@ func (r *mockRunner) Stop() error {
5252

5353
func TestTagFlag(t *testing.T) {
5454
mockCreateRunner := func(context.Context, io.Writer, config.SkaffoldOptions) (runner.Runner, []util.VersionedConfig, *runcontext.RunContext, error) {
55-
return &mockRunner{}, []util.VersionedConfig{&latestV1.SkaffoldConfig{}}, nil, nil
55+
return &mockRunner{}, []util.VersionedConfig{&latest.SkaffoldConfig{}}, nil, nil
5656
}
5757

5858
testutil.Run(t, "override tag with argument", func(t *testutil.T) {
@@ -71,7 +71,7 @@ func TestTagFlag(t *testing.T) {
7171

7272
func TestQuietFlag(t *testing.T) {
7373
mockCreateRunner := func(context.Context, io.Writer, config.SkaffoldOptions) (runner.Runner, []util.VersionedConfig, *runcontext.RunContext, error) {
74-
return &mockRunner{}, []util.VersionedConfig{&latestV1.SkaffoldConfig{}}, nil, nil
74+
return &mockRunner{}, []util.VersionedConfig{&latest.SkaffoldConfig{}}, nil, nil
7575
}
7676

7777
tests := []struct {
@@ -117,7 +117,7 @@ func TestQuietFlag(t *testing.T) {
117117

118118
func TestFileOutputFlag(t *testing.T) {
119119
mockCreateRunner := func(context.Context, io.Writer, config.SkaffoldOptions) (runner.Runner, []util.VersionedConfig, *runcontext.RunContext, error) {
120-
return &mockRunner{}, []util.VersionedConfig{&latestV1.SkaffoldConfig{}}, nil, nil
120+
return &mockRunner{}, []util.VersionedConfig{&latest.SkaffoldConfig{}}, nil, nil
121121
}
122122

123123
tests := []struct {
@@ -183,7 +183,7 @@ func TestRunBuild(t *testing.T) {
183183
return nil, nil, nil, errors.New("some error")
184184
}
185185
mockCreateRunner := func(context.Context, io.Writer, config.SkaffoldOptions) (runner.Runner, []util.VersionedConfig, *runcontext.RunContext, error) {
186-
return &mockRunner{}, []util.VersionedConfig{&latestV1.SkaffoldConfig{}}, nil, nil
186+
return &mockRunner{}, []util.VersionedConfig{&latest.SkaffoldConfig{}}, nil, nil
187187
}
188188

189189
tests := []struct {

‎cmd/skaffold/app/cmd/debug_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/config"
2525
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner"
2626
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner/runcontext"
27-
latestV1 "github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest/v1"
27+
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest"
2828
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/util"
2929
"github.com/GoogleContainerTools/skaffold/testutil"
3030
)
@@ -50,7 +50,7 @@ func TestDebugIndependentFromDev(t *testing.T) {
5050
mockRunner := &mockDevRunner{}
5151
testutil.Run(t, "DevDebug", func(t *testutil.T) {
5252
t.Override(&createRunner, func(context.Context, io.Writer, config.SkaffoldOptions) (runner.Runner, []util.VersionedConfig, *runcontext.RunContext, error) {
53-
return mockRunner, []util.VersionedConfig{&latestV1.SkaffoldConfig{}}, nil, nil
53+
return mockRunner, []util.VersionedConfig{&latest.SkaffoldConfig{}}, nil, nil
5454
})
5555
t.Override(&opts, config.SkaffoldOptions{})
5656
t.Override(&doDev, func(context.Context, io.Writer) error {

‎cmd/skaffold/app/cmd/deploy.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525
"github.com/GoogleContainerTools/skaffold/cmd/skaffold/app/tips"
2626
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/graph"
2727
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner"
28-
latestV1 "github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest/v1"
28+
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest"
2929
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/util"
3030
)
3131

@@ -50,9 +50,9 @@ func doDeploy(ctx context.Context, out io.Writer) error {
5050
if opts.SkipRender {
5151
return r.DeployAndLog(ctx, out, []graph.Artifact{})
5252
}
53-
var artifacts []*latestV1.Artifact
53+
var artifacts []*latest.Artifact
5454
for _, cfg := range configs {
55-
artifacts = append(artifacts, cfg.(*latestV1.SkaffoldConfig).Build.Artifacts...)
55+
artifacts = append(artifacts, cfg.(*latest.SkaffoldConfig).Build.Artifacts...)
5656
}
5757
buildArtifacts, err := getBuildArtifactsAndSetTags(artifacts, r.ApplyDefaultRepo)
5858
if err != nil {

‎cmd/skaffold/app/cmd/dev.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525

2626
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/output/log"
2727
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner"
28-
latestV1 "github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest/v1"
28+
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest"
2929
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/util"
3030
)
3131

@@ -61,12 +61,12 @@ func runDev(ctx context.Context, out io.Writer) error {
6161
case <-ctx.Done():
6262
return nil
6363
default:
64-
// Note: The latestV1.SkaffoldConfig is used for both latestV1 schema and latestV2 schema because
65-
// the latestV1 and latestV2 use the same Build struct. Ideally they should be separated.
64+
// Note: The latest.SkaffoldConfig is used for both latest schema and latestV2 schema because
65+
// the latest and latestV2 use the same Build struct. Ideally they should be separated.
6666
err := withRunner(ctx, out, func(r runner.Runner, configs []util.VersionedConfig) error {
67-
var artifacts []*latestV1.Artifact
67+
var artifacts []*latest.Artifact
6868
for _, cfg := range configs {
69-
artifacts = append(artifacts, cfg.(*latestV1.SkaffoldConfig).Build.Artifacts...)
69+
artifacts = append(artifacts, cfg.(*latest.SkaffoldConfig).Build.Artifacts...)
7070
}
7171
err := r.Dev(ctx, out, artifacts)
7272

‎cmd/skaffold/app/cmd/dev_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/config"
2626
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner"
2727
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner/runcontext"
28-
latestV1 "github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest/v1"
28+
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest"
2929
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/util"
3030
"github.com/GoogleContainerTools/skaffold/testutil"
3131
)
@@ -38,7 +38,7 @@ type mockDevRunner struct {
3838
calls []string
3939
}
4040

41-
func (r *mockDevRunner) Dev(context.Context, io.Writer, []*latestV1.Artifact) error {
41+
func (r *mockDevRunner) Dev(context.Context, io.Writer, []*latest.Artifact) error {
4242
r.calls = append(r.calls, "Dev")
4343
return r.errDev
4444
}
@@ -98,7 +98,7 @@ func TestDoDev(t *testing.T) {
9898
errDev: context.Canceled,
9999
}
100100
t.Override(&createRunner, func(context.Context, io.Writer, config.SkaffoldOptions) (runner.Runner, []util.VersionedConfig, *runcontext.RunContext, error) {
101-
return mockRunner, []util.VersionedConfig{&latestV1.SkaffoldConfig{}}, nil, nil
101+
return mockRunner, []util.VersionedConfig{&latest.SkaffoldConfig{}}, nil, nil
102102
})
103103
t.Override(&opts, config.SkaffoldOptions{
104104
Cleanup: true,
@@ -118,7 +118,7 @@ type mockConfigChangeRunner struct {
118118
cycles int
119119
}
120120

121-
func (m *mockConfigChangeRunner) Dev(context.Context, io.Writer, []*latestV1.Artifact) error {
121+
func (m *mockConfigChangeRunner) Dev(context.Context, io.Writer, []*latest.Artifact) error {
122122
m.cycles++
123123
if m.cycles == 1 {
124124
// pass through the first cycle with a config reload
@@ -148,7 +148,7 @@ func TestDevConfigChange(t *testing.T) {
148148
mockRunner := &mockConfigChangeRunner{}
149149

150150
t.Override(&createRunner, func(context.Context, io.Writer, config.SkaffoldOptions) (runner.Runner, []util.VersionedConfig, *runcontext.RunContext, error) {
151-
return mockRunner, []util.VersionedConfig{&latestV1.SkaffoldConfig{}}, nil, nil
151+
return mockRunner, []util.VersionedConfig{&latest.SkaffoldConfig{}}, nil, nil
152152
})
153153
t.Override(&opts, config.SkaffoldOptions{
154154
Cleanup: true,

‎cmd/skaffold/app/cmd/diagnose.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/output"
2828
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/parser"
2929
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner/runcontext"
30-
latestV1 "github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest/v1"
30+
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest"
3131
schemaUtil "github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/util"
3232
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/util"
3333
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/version"
@@ -67,7 +67,7 @@ func doDiagnose(ctx context.Context, out io.Writer) error {
6767
}
6868
// remove the dependency config references since they have already been imported and will be marshalled together.
6969
for i := range configs {
70-
configs[i].(*latestV1.SkaffoldConfig).Dependencies = nil
70+
configs[i].(*latest.SkaffoldConfig).Dependencies = nil
7171
}
7272
buf, err := yaml.MarshalWithSeparator(configs)
7373
if err != nil {
@@ -84,7 +84,7 @@ func printArtifactDiagnostics(ctx context.Context, out io.Writer, configs []sche
8484
return fmt.Errorf("getting run context: %w", err)
8585
}
8686
for _, c := range configs {
87-
config := c.(*latestV1.SkaffoldConfig)
87+
config := c.(*latest.SkaffoldConfig)
8888
fmt.Fprintln(out, "Skaffold version:", version.Get().GitCommit)
8989
fmt.Fprintln(out, "Configuration version:", config.APIVersion)
9090
fmt.Fprintln(out, "Number of artifacts:", len(config.Build.Artifacts))

‎cmd/skaffold/app/cmd/diagnose_test.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424

2525
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/config"
2626
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner/runcontext"
27-
latestV1 "github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest/v1"
27+
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest"
2828
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/util"
2929
"github.com/GoogleContainerTools/skaffold/testutil"
3030
)
@@ -64,17 +64,17 @@ metadata:
6464
t.Override(&yamlOnly, test.yamlOnly)
6565
t.Override(&getCfgs, func(context.Context, config.SkaffoldOptions) ([]util.VersionedConfig, error) {
6666
return []util.VersionedConfig{
67-
&latestV1.SkaffoldConfig{
67+
&latest.SkaffoldConfig{
6868
APIVersion: "testVersion",
6969
Kind: "Config",
70-
Metadata: latestV1.Metadata{
70+
Metadata: latest.Metadata{
7171
Name: "config1",
7272
},
7373
},
74-
&latestV1.SkaffoldConfig{
74+
&latest.SkaffoldConfig{
7575
APIVersion: "testVersion",
7676
Kind: "Config",
77-
Metadata: latestV1.Metadata{
77+
Metadata: latest.Metadata{
7878
Name: "config2",
7979
},
8080
},

‎cmd/skaffold/app/cmd/filter.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import (
3030
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/kubernetes/debugging"
3131
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/kubernetes/manifest"
3232
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/runner"
33-
latestV1 "github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest/v1"
33+
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest"
3434
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/util"
3535
)
3636

@@ -97,7 +97,7 @@ func getInsecureRegistries(opts config.SkaffoldOptions, configs []util.Versioned
9797

9898
regList = append(regList, opts.InsecureRegistries...)
9999
for _, cfg := range configs {
100-
regList = append(regList, cfg.(*latestV1.SkaffoldConfig).Build.InsecureRegistries...)
100+
regList = append(regList, cfg.(*latest.SkaffoldConfig).Build.InsecureRegistries...)
101101
}
102102
regList = append(regList, cfgRegistries...)
103103
insecureRegistries := make(map[string]bool, len(regList))

0 commit comments

Comments
 (0)