Remove hand written annotated-scaffold.yaml

Signed-off-by: David Gageot <[email protected]>
GoogleContainerTools · Feb 20, 2019 · 100bb53 · 100bb53
1 parent 36a0c9f
commit 100bb53
Show file tree

Hide file tree

Showing 9 changed files with 6 additions and 265 deletions.
diff --git a/deprecation-policy.md b/deprecation-policy.md
@@ -21,7 +21,7 @@ A "deprecation event" would coincide with a release.
 a.) docs
 b.) release notes 
 c.) command help (if applicable)
-d.) annotated-skaffold.yaml (if applicable)
+d.) https://skaffold.dev/docs/references/yaml/ (if applicable)
 
 2. if applicable, [from the kubernetes policy](https://kubernetes.io/docs/reference/using-api/deprecation-policy/#deprecating-a-flag-or-cli): 
  > Rule #6: Deprecated CLI elements must emit warnings (optionally disable) when used.

diff --git a/docs/content/en/docs/concepts/_index.md b/docs/content/en/docs/concepts/_index.md
@@ -25,8 +25,7 @@ read the configuration file from the current directory.
 | `deploy` |  Specifies how Skaffold deploys artifacts. Skaffold supports using `kubectl`, `helm`, or `kustomize` to deploy artifacts. See [Deployers](/docs/how-tos/deployers) for more information. |
 | `profiles`|  Profile is a set of settings that, when activated, overrides the current configuration. You can use Profile to override the `build`, `test` and `deploy` sections. |
 
-You can learn more about the syntax of `skaffold.yaml` at
-[`skaffold.yaml References`](https://github.com/GoogleContainerTools/skaffold/blob/master/examples/annotated-skaffold.yaml).
+You can [learn more](/docs/references/yaml) about the syntax of `skaffold.yaml`.
 
 ## Global configuration (~/.skaffold/config)
 

diff --git a/docs/content/en/docs/how-tos/builders/_index.md b/docs/content/en/docs/how-tos/builders/_index.md
@@ -21,7 +21,7 @@ controls how Skaffold builds artifacts. To use a specific tool for building
 artifacts, add the value representing the tool and options for using the tool
 to the `build` section. For a detailed discussion on Skaffold configuration,
 see [Skaffold Concepts: Configuration](/docs/concepts/#configuration) and
-[skaffold.yaml References](https://github.com/GoogleContainerTools/skaffold/blob/master/examples/annotated-skaffold.yaml).
+[skaffold.yaml References](/docs/references/yaml).
 
 ## Dockerfile locally with Docker
 

diff --git a/docs/content/en/docs/how-tos/deployers/_index.md b/docs/content/en/docs/how-tos/deployers/_index.md
@@ -24,7 +24,7 @@ controls how Skaffold builds artifacts. To use a specific tool for deploying
 artifacts, add the value representing the tool and options for using the tool
 to the `build` section. For a detailed discussion on Skaffold configuration,
 see [Skaffold Concepts: Configuration](/docs/concepts/#configuration) and
-[Skaffold.yaml References](https://github.com/GoogleContainerTools/skaffold/blob/master/examples/annotated-skaffold.yaml).
+[Skaffold.yaml References](/docs/references/yaml).
 
 ## Deploying with kubectl
 

diff --git a/docs/content/en/docs/how-tos/profiles/_index.md b/docs/content/en/docs/how-tos/profiles/_index.md
@@ -13,7 +13,7 @@ environments in your app's lifecycle, like Production or Development.
 You can create profiles in the `profiles` section of `skaffold.yaml`. For a
 detailed discussion on Skaffold configuration,
 see [Skaffold Concepts: Configuration](/docs/concepts/#configuration) and
-[skaffold.yaml References](https://github.com/GoogleContainerTools/skaffold/blob/master/examples/annotated-skaffold.yaml).
+[skaffold.yaml References](/docs/references/yaml).
 
 ## Profiles (`profiles`)
 

diff --git a/docs/content/en/docs/how-tos/taggers/_index.md b/docs/content/en/docs/how-tos/taggers/_index.md
@@ -17,7 +17,7 @@ Tag policy is specified in the `tagPolicy` field of the `build` section of the
 Skaffold configuration file, `skaffold.yaml`. For a detailed discussion on
 Skaffold configuration,
 see [Skaffold Concepts: Configuration](/docs/concepts/#configuration) and
-[skaffold.yaml References](https://github.com/GoogleContainerTools/skaffold/blob/master/examples/annotated-skaffold.yaml).
+[skaffold.yaml References](/docs/references/yaml).
 
 ## `gitCommit`: using Git commit IDs as tags
 

diff --git a/hack/new_version.sh b/hack/new_version.sh
@@ -43,7 +43,6 @@ goimports -w pkg/skaffold/schema/${PREV_VERSION}/upgrade*.go
 sed -i pkg/skaffold/schema/latest/config.go -e "s;$CURRENT_VERSION;$NEW_VERSION;g"
 
 find integration -name "skaffold.yaml" -print0 | xargs -0 -I xx sed -i xx -e "s;$CURRENT_VERSION;$NEW_VERSION;g"
-sed -i integration/examples/annotated-skaffold.yaml -e "s;$CURRENT_VERSION;$NEW_VERSION;g"
 
 sed pkg/skaffold/schema/versions.go -i -e "s;\(.*\)$PREV_VERSION.Version\(.*\)$PREV_VERSION\(.*\);&\n\1$CURRENT_VERSION.Version\2$CURRENT_VERSION\3;g"
 sed pkg/skaffold/schema/versions.go -i -e "s;\(.*\)/$PREV_VERSION\(.*\);&\n\1/$CURRENT_VERSION\2;g"

diff --git a/integration/examples/annotated-skaffold.yaml b/integration/examples/annotated-skaffold.yaml
diff --git a/integration/run_test.go b/integration/run_test.go
@@ -99,11 +99,6 @@ func TestRun(t *testing.T) {
 			description: "microservices",
 			dir:         "examples/microservices",
 			deployments: []string{"leeroy-app", "leeroy-web"},
-		}, {
-			description: "annotated-skaffold",
-			dir:         "examples",
-			filename:    "annotated-skaffold.yaml",
-			pods:        []string{"getting-started"},
 		}, {
 			description: "envTagger",
 			dir:         "examples/tagging-with-environment-variables",