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.

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

v1beta18 -> v1 #3174

Merged
merged 4 commits into from
Nov 5, 2019
Merged
Show file tree
Hide file tree
Changes from 1 commit
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
2 changes: 1 addition & 1 deletion docs/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ weight = 1
copyright = "Skaffold Authors"
privacy_policy = "https://policies.google.com/privacy"
github_repo = "https://github.com/GoogleContainerTools/skaffold"
skaffold_version = "skaffold/v1beta18"
skaffold_version = "skaffold/v1"

# Google Custom Search Engine ID. Remove or comment out to disable search.
gcs_engine_id = "013756393218025596041:3nojel67sum"
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion integration/examples/bazel/skaffold.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v1beta18
apiVersion: skaffold/v1
kind: Config
build:
artifacts:
Expand Down
2 changes: 1 addition & 1 deletion integration/examples/buildpacks/skaffold.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v1beta18
apiVersion: skaffold/v1
kind: Config
build:
artifacts:
Expand Down
2 changes: 1 addition & 1 deletion integration/examples/custom/skaffold.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v1beta18
apiVersion: skaffold/v1
kind: Config
build:
artifacts:
Expand Down
2 changes: 1 addition & 1 deletion integration/examples/gcb-kaniko/skaffold.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v1beta18
apiVersion: skaffold/v1
kind: Config
build:
googleCloudBuild:
Expand Down
2 changes: 1 addition & 1 deletion integration/examples/generate-pipeline/skaffold.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v1beta18
apiVersion: skaffold/v1
kind: Config
build:
artifacts:
Expand Down
2 changes: 1 addition & 1 deletion integration/examples/getting-started/skaffold.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v1beta18
apiVersion: skaffold/v1
kind: Config
build:
artifacts:
Expand Down
2 changes: 1 addition & 1 deletion integration/examples/google-cloud-build/skaffold.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v1beta18
apiVersion: skaffold/v1
kind: Config
build:
googleCloudBuild:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v1beta18
apiVersion: skaffold/v1
kind: Config
build:
tagPolicy:
Expand Down
2 changes: 1 addition & 1 deletion integration/examples/helm-deployment/skaffold.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v1beta18
apiVersion: skaffold/v1
kind: Config
build:
tagPolicy:
Expand Down
2 changes: 1 addition & 1 deletion integration/examples/hot-reload/skaffold.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v1beta18
apiVersion: skaffold/v1
kind: Config
build:
artifacts:
Expand Down
2 changes: 1 addition & 1 deletion integration/examples/jib-gradle/skaffold.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v1beta18
apiVersion: skaffold/v1
kind: Config
build:
artifacts:
Expand Down
2 changes: 1 addition & 1 deletion integration/examples/jib-multimodule/skaffold.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v1beta18
apiVersion: skaffold/v1
kind: Config
build:
artifacts:
Expand Down
2 changes: 1 addition & 1 deletion integration/examples/jib/skaffold.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v1beta18
apiVersion: skaffold/v1
kind: Config
build:
artifacts:
Expand Down
2 changes: 1 addition & 1 deletion integration/examples/kaniko-local/skaffold.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v1beta18
apiVersion: skaffold/v1
kind: Config
build:
artifacts:
Expand Down
2 changes: 1 addition & 1 deletion integration/examples/kaniko/skaffold.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v1beta18
apiVersion: skaffold/v1
kind: Config
build:
artifacts:
Expand Down
2 changes: 1 addition & 1 deletion integration/examples/kustomize/skaffold.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v1beta18
apiVersion: skaffold/v1
kind: Config
deploy:
kustomize: {}
2 changes: 1 addition & 1 deletion integration/examples/microservices/skaffold.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v1beta18
apiVersion: skaffold/v1
kind: Config
build:
artifacts:
Expand Down
2 changes: 1 addition & 1 deletion integration/examples/nodejs/skaffold.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v1beta18
apiVersion: skaffold/v1
kind: Config
build:
artifacts:
Expand Down
2 changes: 1 addition & 1 deletion integration/examples/profiles/skaffold.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v1beta18
apiVersion: skaffold/v1
kind: Config
build:
# only build and deploy "world-service" on main profile
Expand Down
2 changes: 1 addition & 1 deletion integration/examples/react-reload/skaffold.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v1beta18
apiVersion: skaffold/v1
kind: Config
build:
artifacts:
Expand Down
2 changes: 1 addition & 1 deletion integration/examples/structure-tests/skaffold.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v1beta18
apiVersion: skaffold/v1
kind: Config
build:
artifacts:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v1beta18
apiVersion: skaffold/v1
kind: Config
build:
artifacts:
Expand Down
2 changes: 1 addition & 1 deletion integration/testdata/build/skaffold.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v1beta18
apiVersion: skaffold/v1
kind: Config
build:
local:
Expand Down
2 changes: 1 addition & 1 deletion integration/testdata/custom/skaffold.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v1beta18
apiVersion: skaffold/v1
kind: Config
build:
artifacts:
Expand Down
2 changes: 1 addition & 1 deletion integration/testdata/debug/skaffold.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v1beta18
apiVersion: skaffold/v1
kind: Config
build:
artifacts:
Expand Down
2 changes: 1 addition & 1 deletion integration/testdata/dev/skaffold.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v1beta18
apiVersion: skaffold/v1
kind: Config
build:
artifacts:
Expand Down
2 changes: 1 addition & 1 deletion integration/testdata/gke_loadbalancer/skaffold.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v1beta18
apiVersion: skaffold/v1
kind: Config
build:
artifacts:
Expand Down
2 changes: 1 addition & 1 deletion integration/testdata/jib-gradle/skaffold.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v1beta18
apiVersion: skaffold/v1
kind: Config
build:
artifacts:
Expand Down
2 changes: 1 addition & 1 deletion integration/testdata/jib/skaffold.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v1beta18
apiVersion: skaffold/v1
kind: Config
build:
artifacts:
Expand Down
2 changes: 1 addition & 1 deletion integration/testdata/kaniko-microservices/skaffold.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v1beta18
apiVersion: skaffold/v1
kind: Config
build:
artifacts:
Expand Down
2 changes: 1 addition & 1 deletion integration/testdata/kaniko-sub-folder/skaffold.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v1beta18
apiVersion: skaffold/v1
kind: Config
build:
artifacts:
Expand Down
2 changes: 1 addition & 1 deletion integration/testdata/kaniko-target/skaffold.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v1beta18
apiVersion: skaffold/v1
kind: Config
build:
artifacts:
Expand Down
2 changes: 1 addition & 1 deletion integration/testdata/tagPolicy/skaffold.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v1beta18
apiVersion: skaffold/v1
kind: Config
build:
artifacts:
Expand Down
2 changes: 1 addition & 1 deletion pkg/skaffold/schema/latest/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
)

// This config version is not yet released, it is SAFE TO MODIFY the structs in this file.
const Version string = "skaffold/v1beta18"
const Version string = "skaffold/v1"

// NewSkaffoldConfig creates a SkaffoldConfig
func NewSkaffoldConfig() util.VersionedConfig {
Expand Down
2 changes: 1 addition & 1 deletion pkg/skaffold/schema/v1beta17/upgrade.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
)

// Upgrade upgrades a configuration to the next version.
// Config changes from v1beta17 to v1beta18
// Config changes from v1beta17 to v1.0
balopat marked this conversation as resolved.
Show resolved Hide resolved
// 1. Additions:
// Add EphemeralStorage and ResourceStorage to Kaniko Pod Resource Requirement.
// 2. Removals:
Expand Down
2 changes: 1 addition & 1 deletion pkg/skaffold/schema/v1beta17/upgrade_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ profiles:
manifests:
- k8s-*
`
expected := `apiVersion: skaffold/v1beta18
expected := `apiVersion: skaffold/v1
kind: Config
build:
artifacts:
Expand Down