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

Remove upgrade to v1beta10 #2030

Merged
merged 3 commits into from
Apr 26, 2019
Merged

Remove upgrade to v1beta10 #2030

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
bc09f6b
Remove upgrade to v1beta10
Apr 25, 2019
589d69e
add test for executionEnvironment as well
Apr 25, 2019
89bbb7d
run check-docs
Apr 26, 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
115 changes: 2 additions & 113 deletions docs/content/en/schemas/v1beta9.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,6 @@
"gcr.io/k8s-skaffold/example"
]
},
"plugin": {
"$ref": "#/definitions/BuilderPlugin",
"description": "plugin used to build this artifact.",
"x-intellij-html-description": "plugin used to build this artifact."
},
"sync": {
"additionalProperties": {
"type": "string"
Expand All @@ -85,8 +80,7 @@
"preferredOrder": [
"image",
"context",
"sync",
"plugin"
"sync"
],
"additionalProperties": false
},
Expand All @@ -111,11 +105,6 @@
"gcr.io/k8s-skaffold/example"
]
},
"plugin": {
"$ref": "#/definitions/BuilderPlugin",
"description": "plugin used to build this artifact.",
"x-intellij-html-description": "plugin used to build this artifact."
},
"sync": {
"additionalProperties": {
"type": "string"
Expand All @@ -133,7 +122,6 @@
"image",
"context",
"sync",
"plugin",
"docker"
],
"additionalProperties": false
Expand All @@ -159,11 +147,6 @@
"gcr.io/k8s-skaffold/example"
]
},
"plugin": {
"$ref": "#/definitions/BuilderPlugin",
"description": "plugin used to build this artifact.",
"x-intellij-html-description": "plugin used to build this artifact."
},
"sync": {
"additionalProperties": {
"type": "string"
Expand All @@ -181,7 +164,6 @@
"image",
"context",
"sync",
"plugin",
"bazel"
],
"additionalProperties": false
Expand All @@ -207,11 +189,6 @@
"description": "*alpha* builds images using the [Jib plugin for Maven](https://github.com/GoogleContainerTools/jib/tree/master/jib-maven-plugin).",
"x-intellij-html-description": "<em>alpha</em> builds images using the <a href=\"https://github.com/GoogleContainerTools/jib/tree/master/jib-maven-plugin\">Jib plugin for Maven</a>."
},
"plugin": {
"$ref": "#/definitions/BuilderPlugin",
"description": "plugin used to build this artifact.",
"x-intellij-html-description": "plugin used to build this artifact."
},
"sync": {
"additionalProperties": {
"type": "string"
Expand All @@ -229,7 +206,6 @@
"image",
"context",
"sync",
"plugin",
"jibMaven"
],
"additionalProperties": false
Expand All @@ -255,11 +231,6 @@
"description": "*alpha* builds images using the [Jib plugin for Gradle](https://github.com/GoogleContainerTools/jib/tree/master/jib-gradle-plugin).",
"x-intellij-html-description": "<em>alpha</em> builds images using the <a href=\"https://github.com/GoogleContainerTools/jib/tree/master/jib-gradle-plugin\">Jib plugin for Gradle</a>."
},
"plugin": {
"$ref": "#/definitions/BuilderPlugin",
"description": "plugin used to build this artifact.",
"x-intellij-html-description": "plugin used to build this artifact."
},
"sync": {
"additionalProperties": {
"type": "string"
Expand All @@ -277,7 +248,6 @@
"image",
"context",
"sync",
"plugin",
"jibGradle"
],
"additionalProperties": false
Expand All @@ -303,11 +273,6 @@
"description": "*alpha* builds images using [kaniko](https://github.com/GoogleContainerTools/kaniko).",
"x-intellij-html-description": "<em>alpha</em> builds images using <a href=\"https://github.com/GoogleContainerTools/kaniko\">kaniko</a>."
},
"plugin": {
"$ref": "#/definitions/BuilderPlugin",
"description": "plugin used to build this artifact.",
"x-intellij-html-description": "plugin used to build this artifact."
},
"sync": {
"additionalProperties": {
"type": "string"
Expand All @@ -325,7 +290,6 @@
"image",
"context",
"sync",
"plugin",
"kaniko"
],
"additionalProperties": false
Expand Down Expand Up @@ -380,11 +344,6 @@
"description": "the images you're going to be building.",
"x-intellij-html-description": "the images you're going to be building."
},
"executionEnvironment": {
"$ref": "#/definitions/ExecutionEnvironment",
"description": "environment in which the build should run. Possible values: googleCloudBuild.",
"x-intellij-html-description": "environment in which the build should run. Possible values: googleCloudBuild."
},
"insecureRegistries": {
"items": {
"type": "string"
Expand All @@ -403,8 +362,7 @@
"preferredOrder": [
"artifacts",
"insecureRegistries",
"tagPolicy",
"executionEnvironment"
"tagPolicy"
],
"additionalProperties": false
},
Expand All @@ -418,11 +376,6 @@
"description": "the images you're going to be building.",
"x-intellij-html-description": "the images you're going to be building."
},
"executionEnvironment": {
"$ref": "#/definitions/ExecutionEnvironment",
"description": "environment in which the build should run. Possible values: googleCloudBuild.",
"x-intellij-html-description": "environment in which the build should run. Possible values: googleCloudBuild."
},
"insecureRegistries": {
"items": {
"type": "string"
Expand All @@ -447,7 +400,6 @@
"artifacts",
"insecureRegistries",
"tagPolicy",
"executionEnvironment",
"local"
],
"additionalProperties": false
Expand All @@ -462,11 +414,6 @@
"description": "the images you're going to be building.",
"x-intellij-html-description": "the images you're going to be building."
},
"executionEnvironment": {
"$ref": "#/definitions/ExecutionEnvironment",
"description": "environment in which the build should run. Possible values: googleCloudBuild.",
"x-intellij-html-description": "environment in which the build should run. Possible values: googleCloudBuild."
},
"googleCloudBuild": {
"$ref": "#/definitions/GoogleCloudBuild",
"description": "*beta* describes how to do a remote build on [Google Cloud Build](https://cloud.google.com/cloud-build/).",
Expand All @@ -491,7 +438,6 @@
"artifacts",
"insecureRegistries",
"tagPolicy",
"executionEnvironment",
"googleCloudBuild"
],
"additionalProperties": false
Expand All @@ -511,11 +457,6 @@
"description": "*beta* describes how to do an on-cluster build.",
"x-intellij-html-description": "<em>beta</em> describes how to do an on-cluster build."
},
"executionEnvironment": {
"$ref": "#/definitions/ExecutionEnvironment",
"description": "environment in which the build should run. Possible values: googleCloudBuild.",
"x-intellij-html-description": "environment in which the build should run. Possible values: googleCloudBuild."
},
"insecureRegistries": {
"items": {
"type": "string"
Expand All @@ -535,7 +476,6 @@
"artifacts",
"insecureRegistries",
"tagPolicy",
"executionEnvironment",
"cluster"
],
"additionalProperties": false
Expand All @@ -544,29 +484,6 @@
"description": "contains all the configuration for the build steps.",
"x-intellij-html-description": "contains all the configuration for the build steps."
},
"BuilderPlugin": {
"properties": {
"name": {
"type": "string",
"description": "name of the build plugin.",
"x-intellij-html-description": "name of the build plugin."
},
"properties": {
"additionalProperties": {},
"type": "object",
"description": "key-value pairs passed to the plugin.",
"x-intellij-html-description": "key-value pairs passed to the plugin.",
"default": "{}"
}
},
"preferredOrder": [
"name",
"properties"
],
"additionalProperties": false,
"description": "contains all fields necessary for specifying a build plugin.",
"x-intellij-html-description": "contains all fields necessary for specifying a build plugin."
},
"ClusterDetails": {
"properties": {
"dockerConfig": {
Expand Down Expand Up @@ -773,34 +690,6 @@
"description": "*beta* tags images with a configurable template string.",
"x-intellij-html-description": "<em>beta</em> tags images with a configurable template string."
},
"ExecEnvironment": {
"type": "string",
"description": "name of an execution environment.",
"x-intellij-html-description": "name of an execution environment."
},
"ExecutionEnvironment": {
"properties": {
"name": {
"$ref": "#/definitions/ExecEnvironment",
"description": "name of the environment.",
"x-intellij-html-description": "name of the environment."
},
"properties": {
"additionalProperties": {},
"type": "object",
"description": "key-value pairs passed to the environment.",
"x-intellij-html-description": "key-value pairs passed to the environment.",
"default": "{}"
}
},
"preferredOrder": [
"name",
"properties"
],
"additionalProperties": false,
"description": "environment in which the build should run (ex. local or in-cluster, etc.).",
"x-intellij-html-description": "environment in which the build should run (ex. local or in-cluster, etc.)."
},
"GitTagger": {
"properties": {
"variant": {
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 @@ -20,7 +20,7 @@ import (
"github.com/GoogleContainerTools/skaffold/pkg/skaffold/schema/util"
)

const Version string = "skaffold/v1beta10"
const Version string = "skaffold/v1beta9"

// NewSkaffoldConfig creates a SkaffoldConfig
func NewSkaffoldConfig() util.VersionedConfig {
Expand Down
Loading