Upgrade to config v1beta11 and cleanup v1beta6

GoogleContainerTools · May 20, 2019 · 6720ca6 · 6720ca6
1 parent a127128
commit 6720ca6
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 18 deletions.
diff --git a/docs/content/en/schemas/v1beta10.json b/docs/content/en/schemas/v1beta10.json
@@ -1306,20 +1306,14 @@
     },
     "KanikoCache": {
       "properties": {
-        "hostPath": {
-          "type": "string",
-          "description": "specifies a path on the host that is mounted to each pod as read only cache volume containing base images. If set, must exist on each node and prepopulated with kaniko-warmer.",
-          "x-intellij-html-description": "specifies a path on the host that is mounted to each pod as read only cache volume containing base images. If set, must exist on each node and prepopulated with kaniko-warmer."
-        },
         "repo": {
           "type": "string",
           "description": "a remote repository to store cached layers. If none is specified, one will be inferred from the image name. See [Kaniko Caching](https://github.com/GoogleContainerTools/kaniko#caching).",
           "x-intellij-html-description": "a remote repository to store cached layers. If none is specified, one will be inferred from the image name. See <a href=\"https://github.com/GoogleContainerTools/kaniko#caching\">Kaniko Caching</a>."
         }
       },
       "preferredOrder": [
-        "repo",
-        "hostPath"
+        "repo"
       ],
       "additionalProperties": false,
       "description": "configures Kaniko caching. If a cache is specified, Kaniko will use a remote cache which will speed up builds.",

diff --git a/docs/content/en/schemas/v1beta11.json b/docs/content/en/schemas/v1beta11.json
@@ -1306,14 +1306,20 @@
     },
     "KanikoCache": {
       "properties": {
+        "hostPath": {
+          "type": "string",
+          "description": "specifies a path on the host that is mounted to each pod as read only cache volume containing base images. If set, must exist on each node and prepopulated with kaniko-warmer.",
+          "x-intellij-html-description": "specifies a path on the host that is mounted to each pod as read only cache volume containing base images. If set, must exist on each node and prepopulated with kaniko-warmer."
+        },
         "repo": {
           "type": "string",
           "description": "a remote repository to store cached layers. If none is specified, one will be inferred from the image name. See [Kaniko Caching](https://github.com/GoogleContainerTools/kaniko#caching).",
           "x-intellij-html-description": "a remote repository to store cached layers. If none is specified, one will be inferred from the image name. See <a href=\"https://github.com/GoogleContainerTools/kaniko#caching\">Kaniko Caching</a>."
         }
       },
       "preferredOrder": [
-        "repo"
+        "repo",
+        "hostPath"
       ],
       "additionalProperties": false,
       "description": "configures Kaniko caching. If a cache is specified, Kaniko will use a remote cache which will speed up builds.",

diff --git a/docs/content/en/schemas/v1beta6.json b/docs/content/en/schemas/v1beta6.json
@@ -1174,20 +1174,14 @@
     },
     "KanikoCache": {
       "properties": {
-        "hostPath": {
-          "type": "string",
-          "description": "specifies a path on the host that is mounted to each pod as read only cache volume containing base images. If set, must exist on each node and prepopulated with kaniko-warmer.",
-          "x-intellij-html-description": "specifies a path on the host that is mounted to each pod as read only cache volume containing base images. If set, must exist on each node and prepopulated with kaniko-warmer."
-        },
         "repo": {
           "type": "string",
           "description": "a remote repository to store cached layers. If none is specified, one will be inferred from the image name. See [Kaniko Caching](https://github.com/GoogleContainerTools/kaniko#caching).",
           "x-intellij-html-description": "a remote repository to store cached layers. If none is specified, one will be inferred from the image name. See <a href=\"https://github.com/GoogleContainerTools/kaniko#caching\">Kaniko Caching</a>."
         }
       },
       "preferredOrder": [
-        "repo",
-        "hostPath"
+        "repo"
       ],
       "additionalProperties": false,
       "description": "configures Kaniko caching. If a cache is specified, Kaniko will use a remote cache which will speed up builds.",

diff --git a/pkg/skaffold/schema/v1beta6/config.go b/pkg/skaffold/schema/v1beta6/config.go
@@ -229,9 +229,6 @@ type KanikoCache struct {
 	// Repo is a remote repository to store cached layers. If none is specified, one will be
 	// inferred from the image name. See [Kaniko Caching](https://github.com/GoogleContainerTools/kaniko#caching).
 	Repo string `yaml:"repo,omitempty"`
-	// HostPath specifies a path on the host that is mounted to each pod as read only cache volume containing base images.
-	// If set, must exist on each node and prepopulated with kaniko-warmer.
-	HostPath string `yaml:"hostPath,omitempty"`
 }
 
 // KanikoBuild *beta* describes how to do an on-cluster build using