Skip to content
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

v1beta6 #1674

Merged
merged 3 commits into from
Feb 25, 2019
Merged

v1beta6 #1674

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ebd5a51
v1beta6
balopat Feb 22, 2019
25bb66f
move the upgrade to use CloneThroughJSON
balopat Feb 22, 2019
3036f56
goimports
balopat Feb 22, 2019
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
2 changes: 1 addition & 1 deletion docs/config.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ weight = 1
#copyright = "Skaffold"
#privacy_policy = "https://policies.google.com/privacy"
github_repo = "https://github.com/GoogleContainerTools/skaffold"
skaffold_version = "skaffold/v1beta5"
skaffold_version = "skaffold/v1beta6"

# Google Custom Search Engine ID. Remove or comment out to disable search.
gcs_engine_id = "013756393218025596041:3nojel67sum"
Expand Down
967 changes: 967 additions & 0 deletions docs/content/en/schemas/v1beta6.json
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions hack/new_version.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ sed -i docs/config.toml -e "s;$CURRENT_VERSION;$NEW_VERSION;g"

cp -R pkg/skaffold/schema/latest pkg/skaffold/schema/${CURRENT_VERSION}

sed -i pkg/skaffold/schema/${CURRENT_VERSION}/*.go -e "s;latest;$CURRENT_VERSION;g"
sed -i pkg/skaffold/schema/${CURRENT_VERSION}/*.go -e "s;package latest;package $CURRENT_VERSION;g"

sed pkg/skaffold/schema/${PREV_VERSION}/upgrade_test.go -e "s;$CURRENT_VERSION;$NEW_VERSION;g" > pkg/skaffold/schema/${CURRENT_VERSION}/upgrade_test.go
sed -i pkg/skaffold/schema/${CURRENT_VERSION}/upgrade_test.go -e "s;$PREV_VERSION;$CURRENT_VERSION;g"
Expand Down Expand Up @@ -62,4 +62,4 @@ echo "Please double check manually the generated files as well: the upgrade func
echo
git status -s
echo
echo "---------------------------------------"
echo "---------------------------------------"
2 changes: 1 addition & 1 deletion integration/examples/bazel/skaffold.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v1beta5
apiVersion: skaffold/v1beta6
kind: Config
build:
artifacts:
Expand Down
2 changes: 1 addition & 1 deletion integration/examples/getting-started/skaffold.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v1beta5
apiVersion: skaffold/v1beta6
kind: Config
build:
artifacts:
Expand Down
2 changes: 1 addition & 1 deletion integration/examples/helm-deployment/skaffold.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v1beta5
apiVersion: skaffold/v1beta6
kind: Config
build:
tagPolicy:
Expand Down
2 changes: 1 addition & 1 deletion integration/examples/hot-reload/skaffold.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v1beta5
apiVersion: skaffold/v1beta6
kind: Config
build:
artifacts:
Expand Down
2 changes: 1 addition & 1 deletion integration/examples/jib-multimodule/skaffold.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v1beta5
apiVersion: skaffold/v1beta6
kind: Config
build:
artifacts:
Expand Down
2 changes: 1 addition & 1 deletion integration/examples/jib/skaffold.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v1beta5
apiVersion: skaffold/v1beta6
kind: Config
build:
artifacts:
Expand Down
2 changes: 1 addition & 1 deletion integration/examples/kaniko-local/skaffold.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v1beta5
apiVersion: skaffold/v1beta6
kind: Config
build:
artifacts:
Expand Down
2 changes: 1 addition & 1 deletion integration/examples/kaniko/skaffold.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v1beta5
apiVersion: skaffold/v1beta6
kind: Config
build:
artifacts:
Expand Down
2 changes: 1 addition & 1 deletion integration/examples/kustomize/skaffold.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v1beta5
apiVersion: skaffold/v1beta6
kind: Config
deploy:
kustomize: {}
2 changes: 1 addition & 1 deletion integration/examples/microservices/skaffold.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v1beta5
apiVersion: skaffold/v1beta6
kind: Config
build:
artifacts:
Expand Down
2 changes: 1 addition & 1 deletion integration/examples/nodejs/skaffold.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v1beta5
apiVersion: skaffold/v1beta6
kind: Config
build:
artifacts:
Expand Down
2 changes: 1 addition & 1 deletion integration/examples/structure-tests/skaffold.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v1beta5
apiVersion: skaffold/v1beta6
kind: Config
build:
artifacts:
Expand Down
2 changes: 1 addition & 1 deletion integration/examples/tagging-with-environment-variables/skaffold.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v1beta5
apiVersion: skaffold/v1beta6
kind: Config
build:
artifacts:
Expand Down
2 changes: 1 addition & 1 deletion integration/examples/test-dev-job/skaffold.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v1beta5
apiVersion: skaffold/v1beta6
kind: Config
build:
artifacts:
Expand Down
2 changes: 1 addition & 1 deletion integration/examples/test-plugin/gcb/skaffold.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v1beta5
apiVersion: skaffold/v1beta6
kind: Config
build:
artifacts:
Expand Down
2 changes: 1 addition & 1 deletion integration/examples/test-plugin/local/bazel/skaffold.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v1beta5
apiVersion: skaffold/v1beta6
kind: Config
build:
artifacts:
Expand Down
2 changes: 1 addition & 1 deletion integration/examples/test-plugin/local/docker/skaffold.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v1beta5
apiVersion: skaffold/v1beta6
kind: Config
build:
artifacts:
Expand Down
2 changes: 1 addition & 1 deletion integration/testdata/build/skaffold.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v1beta5
apiVersion: skaffold/v1beta6
kind: Config
build:
local:
Expand Down
2 changes: 1 addition & 1 deletion integration/testdata/tagPolicy/skaffold.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v1beta5
apiVersion: skaffold/v1beta6
kind: Config
build:
artifacts:
Expand Down
2 changes: 1 addition & 1 deletion pkg/skaffold/schema/latest/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
yamlpatch "github.com/krishicks/yaml-patch"
)

const Version string = "skaffold/v1beta5"
const Version string = "skaffold/v1beta6"

// NewSkaffoldPipeline creates a SkaffoldPipeline
func NewSkaffoldPipeline() util.VersionedConfig {
Expand Down
6 changes: 3 additions & 3 deletions pkg/skaffold/schema/v1beta4/upgrade.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ package v1beta4
import (
"encoding/json"

"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest"
next "github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest"
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/util"
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/v1beta5"
next "github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/v1beta5"
"github.com/pkg/errors"
)

Expand Down Expand Up @@ -51,7 +51,7 @@ func (config *SkaffoldPipeline) Upgrade() (util.VersionedConfig, error) {
}

// convert Test (should be the same)
var newTest []*latest.TestCase
var newTest []*v1beta5.TestCase
if err := convert(config.Test, &newTest); err != nil {
return nil, errors.Wrap(err, "converting new test")
}
Expand Down
4 changes: 2 additions & 2 deletions pkg/skaffold/schema/v1beta4/upgrade_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ package v1beta4
import (
"testing"

"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/latest"
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/v1beta5"
"github.com/GoogleContainerTools/skaffold/testutil"
yaml "gopkg.in/yaml.v2"
)
Expand Down Expand Up @@ -102,7 +102,7 @@ func verifyUpgrade(t *testing.T, input, output string) {
upgraded, err := pipeline.Upgrade()
testutil.CheckError(t, false, err)

expected := latest.NewSkaffoldPipeline()
expected := v1beta5.NewSkaffoldPipeline()
err = yaml.UnmarshalStrict([]byte(output), expected)

testutil.CheckErrorAndDeepEqual(t, false, err, expected, upgraded)
Expand Down
Loading