generate schemas

Author: nkubala

docs/content/en/schemas/v2beta7.json

@@ -923,11 +923,6 @@
           "x-intellij-html-description": "used to pass in --no-cache to docker build to prevent caching.",
           "default": "false"
         },
-        "secret": {
-          "$ref": "#/definitions/DockerSecret",
-          "description": "contains information about a local secret passed to `docker build`, along with optional destination information.",
-          "x-intellij-html-description": "contains information about a local secret passed to <code>docker build</code>, along with optional destination information."
-        },
         "target": {
           "type": "string",
           "description": "Dockerfile target name to build.",
@@ -940,8 +935,7 @@
         "buildArgs",
         "network",
         "cacheFrom",
-        "noCache",
-        "secret"
+        "noCache"
       ],
       "additionalProperties": false,
       "description": "describes an artifact built from a Dockerfile, usually using `docker build`.",
@@ -968,36 +962,6 @@
       "description": "contains information about the docker `config.json` to mount.",
       "x-intellij-html-description": "contains information about the docker <code>config.json</code> to mount."
     },
-    "DockerSecret": {
-      "required": [
-        "id"
-      ],
-      "properties": {
-        "dst": {
-          "type": "string",
-          "description": "path in the container to mount the secret.",
-          "x-intellij-html-description": "path in the container to mount the secret."
-        },
-        "id": {
-          "type": "string",
-          "description": "id of the secret.",
-          "x-intellij-html-description": "id of the secret."
-        },
-        "src": {
-          "type": "string",
-          "description": "path to the secret on the host machine.",
-          "x-intellij-html-description": "path to the secret on the host machine."
-        }
-      },
-      "preferredOrder": [
-        "id",
-        "src",
-        "dst"
-      ],
-      "additionalProperties": false,
-      "description": "contains information about a local secret passed to `docker build`, along with optional destination information.",
-      "x-intellij-html-description": "contains information about a local secret passed to <code>docker build</code>, along with optional destination information."
-    },
     "DockerfileDependency": {
       "properties": {
         "buildArgs": {

docs/content/en/schemas/v2beta8.json

@@ -923,6 +923,11 @@
           "x-intellij-html-description": "used to pass in --no-cache to docker build to prevent caching.",
           "default": "false"
         },
+        "secret": {
+          "$ref": "#/definitions/DockerSecret",
+          "description": "contains information about a local secret passed to `docker build`, along with optional destination information.",
+          "x-intellij-html-description": "contains information about a local secret passed to <code>docker build</code>, along with optional destination information."
+        },
         "target": {
           "type": "string",
           "description": "Dockerfile target name to build.",
@@ -935,7 +940,8 @@
         "buildArgs",
         "network",
         "cacheFrom",
-        "noCache"
+        "noCache",
+        "secret"
       ],
       "additionalProperties": false,
       "description": "describes an artifact built from a Dockerfile, usually using `docker build`.",
@@ -962,6 +968,36 @@
       "description": "contains information about the docker `config.json` to mount.",
       "x-intellij-html-description": "contains information about the docker <code>config.json</code> to mount."
     },
+    "DockerSecret": {
+      "required": [
+        "id"
+      ],
+      "properties": {
+        "dst": {
+          "type": "string",
+          "description": "path in the container to mount the secret.",
+          "x-intellij-html-description": "path in the container to mount the secret."
+        },
+        "id": {
+          "type": "string",
+          "description": "id of the secret.",
+          "x-intellij-html-description": "id of the secret."
+        },
+        "src": {
+          "type": "string",
+          "description": "path to the secret on the host machine.",
+          "x-intellij-html-description": "path to the secret on the host machine."
+        }
+      },
+      "preferredOrder": [
+        "id",
+        "src",
+        "dst"
+      ],
+      "additionalProperties": false,
+      "description": "contains information about a local secret passed to `docker build`, along with optional destination information.",
+      "x-intellij-html-description": "contains information about a local secret passed to <code>docker build</code>, along with optional destination information."
+    },
     "DockerfileDependency": {
       "properties": {
         "buildArgs": {

integration/build_test.go

@@ -36,24 +36,6 @@ import (
 
 const imageName = "gcr.io/k8s-skaffold/simple-build:"
 
-func TestBuildKit(t *testing.T) {
-	MarkIntegrationTest(t, NeedsGcp)
-
-	dir := "testdata/build/secret"
-
-	// Run without artifact caching
-	skaffold.Build("--cache-artifacts=false").InDir(dir).RunOrFail(t)
-
-	// Run with artifact caching
-	skaffold.Build("--cache-artifacts=true").InDir(dir).RunOrFail(t)
-
-	// Run a second time with artifact caching
-	out := skaffold.Build("--cache-artifacts=true").InDir(dir).RunOrFailOutput(t)
-	if strings.Contains(string(out), "Not found. Building") {
-		t.Errorf("images were expected to be found in cache: %s", out)
-	}
-}
-
 func TestBuild(t *testing.T) {
 	MarkIntegrationTest(t, CanRunWithoutGcp)
 

integration/testdata/build/secret/skaffold.yaml

@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta7
+apiVersion: skaffold/v2beta8
 kind: Config
 build:
   local:

integration/testdata/build/skaffold.yaml

@@ -2,7 +2,6 @@ apiVersion: skaffold/v2beta8
 kind: Config
 build:
   local:
-    # useBuildkit: true
     push: false
   artifacts:
     # A simple Docker build