chore: bump examples/* to apiVersion: skaffold/v3 (#7970)

GoogleContainerTools · Oct 24, 2022 · 2f9785d · 2f9785d
1 parent 6c50b2a
commit 2f9785d
Show file tree

Hide file tree

Showing 83 changed files with 1,338 additions and 170 deletions.
diff --git a/examples/bazel/skaffold.yaml b/examples/bazel/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta29
+apiVersion: skaffold/v3
 kind: Config
 build:
   artifacts:

diff --git a/examples/buildpacks-java/skaffold.yaml b/examples/buildpacks-java/skaffold.yaml
@@ -1,11 +1,9 @@
-apiVersion: skaffold/v2beta29
+apiVersion: skaffold/v3
 kind: Config
 build:
   artifacts:
   - image: skaffold-buildpacks
     buildpacks:
-      builder: "gcr.io/buildpacks/builder:v1"
-      trustBuilder: true
       env:
       - GOOGLE_RUNTIME_VERSION=8
 profiles:

diff --git a/examples/buildpacks-node/skaffold.yaml b/examples/buildpacks-node/skaffold.yaml
@@ -1,8 +1,6 @@
-apiVersion: skaffold/v2beta29
+apiVersion: skaffold/v3
 kind: Config
 build:
   artifacts:
   - image: skaffold-buildpacks-node
-    buildpacks:
-      builder: "gcr.io/buildpacks/builder:v1"
-      trustBuilder: true
+    buildpacks: {}
diff --git a/examples/buildpacks-python/skaffold.yaml b/examples/buildpacks-python/skaffold.yaml
@@ -1,11 +1,10 @@
-apiVersion: skaffold/v2beta29
+apiVersion: skaffold/v3
 kind: Config
 build:
   artifacts:
   - image: skaffold-buildpacks
     buildpacks:
       builder: "gcr.io/buildpacks/builder:v1"
-      trustBuilder: true
 profiles:
 - name: gcb
   build:

diff --git a/examples/buildpacks/skaffold.yaml b/examples/buildpacks/skaffold.yaml
@@ -1,11 +1,9 @@
-apiVersion: skaffold/v2beta29
+apiVersion: skaffold/v3
 kind: Config
 build:
   artifacts:
   - image: skaffold-buildpacks
     buildpacks:
-      builder: "gcr.io/buildpacks/builder:v1"
-      trustBuilder: true
       env:
       - GOPROXY={{.GOPROXY}}
 profiles:

diff --git a/examples/cross-platform-builds/skaffold.yaml b/examples/cross-platform-builds/skaffold.yaml
@@ -1,13 +1,20 @@
-apiVersion: skaffold/v2beta29
+apiVersion: skaffold/v3
 kind: Config
 build:
   artifacts:
   - image: skaffold-example
-deploy:
-  kubectl:
-    manifests:
-      - k8s-*
+    context: .
+    docker:
+      dockerfile: Dockerfile
+      noCache: true
+  tagPolicy:
+    gitCommit: {}
+  local:
+    concurrency: 1
+manifests:
+  rawYaml:
+  - k8s-*
 profiles:
   - name: cloudbuild
     build:
-      googleCloudBuild: {}
+      googleCloudBuild: {}
diff --git a/examples/custom-buildx/buildx.sh b/examples/custom-buildx/buildx.sh
@@ -8,7 +8,8 @@
 #  (1) delete the buildx builder named `skaffold-builder`, and
 #  (2) update the corresponding node-affinities in k8s/pod.yaml.
 
-# The platforms to build.
+# The platforms to build. Default to linux/amd64.
+$PLATFORMS=${PLATFORMS:=linux/amd64}
 
 # `buildx` uses named _builder_ instances configured for specific platforms.
 # This script creates a `skaffold-builder` as required.

diff --git a/examples/custom-buildx/go.mod b/examples/custom-buildx/go.mod
@@ -1,3 +1,3 @@
 module github.com/GoogleContainerTools/skaffold/examples/custom-buildx
 
-go 1.19
+go 1.18
diff --git a/examples/custom-buildx/skaffold.yaml b/examples/custom-buildx/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta29
+apiVersion: skaffold/v3alpha1
 kind: Config
 build:
   platforms: ["linux/amd64", "linux/arm64"]

diff --git a/examples/custom-tests/skaffold.yaml b/examples/custom-tests/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta29
+apiVersion: skaffold/v3
 kind: Config
 build:
   artifacts:
@@ -15,7 +15,6 @@ test:
       - command: echo Hello world!!
         dependencies:
           command: echo [\"main_test.go\"] 
-deploy:
-  kubectl:
-    manifests:
-      - k8s-*
+manifests:
+  rawYaml:
+    - k8s-*
diff --git a/examples/custom/skaffold.yaml b/examples/custom/skaffold.yaml
@@ -1,14 +1,13 @@
-apiVersion: skaffold/v2beta29
+apiVersion: skaffold/v3
 kind: Config
 build:
   artifacts:
-  - image: ko://github.com/GoogleContainerTools/skaffold/examples/custom
+  - image: github.com/googlecontainertools/skaffold/examples/custom
     custom:
       buildCommand: ./build.sh
       dependencies:
         paths:
-        - "**/*.go"
-        - go.mod
-        - .ko.yaml
+        - "go.mod"
+        - "**.go"
   tagPolicy:
     sha256: {}
diff --git a/examples/dev-journey-buildpacks/skaffold.yaml b/examples/dev-journey-buildpacks/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta29
+apiVersion: skaffold/v3
 kind: Config
 build:
   artifacts:

diff --git a/examples/docker-deploy/bert/Dockerfile b/examples/docker-deploy/bert/Dockerfile
@@ -1,6 +1,5 @@
 FROM golang:1.18 as builder
 WORKDIR /code
-COPY test .
 COPY main.go .
 COPY go.mod .
 # `skaffold debug` sets SKAFFOLD_GO_GCFLAGS to disable compiler optimizations

diff --git a/examples/docker-deploy/skaffold.yaml b/examples/docker-deploy/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta29
+apiVersion: skaffold/v3
 kind: Config
 build:
   local:

diff --git a/examples/gcb-kaniko/skaffold.yaml b/examples/gcb-kaniko/skaffold.yaml
@@ -1,14 +1,12 @@
-apiVersion: skaffold/v2beta29
+apiVersion: skaffold/v3
 kind: Config
 build:
   googleCloudBuild:
-    # Change `k8s-skaffold` with your PROJECT_ID
     projectId: k8s-skaffold
   artifacts:
   - image: skaffold-example
     kaniko:
       cache: {}
-deploy:
-  kubectl:
-    manifests:
-      - k8s-*
+manifests:
+  rawYaml:
+  - k8s-*
diff --git a/examples/generate-pipeline/skaffold.yaml b/examples/generate-pipeline/skaffold.yaml
@@ -1,9 +1,8 @@
-apiVersion: skaffold/v2beta29
+apiVersion: skaffold/v3
 kind: Config
 build:
   artifacts:
   - image: pipeline-example
-deploy:
-  kubectl:
-    manifests:
-    - k8s-*
+manifests:
+  rawYaml:
+  - k8s-*
diff --git a/examples/getting-started-kustomize/skaffold.yaml b/examples/getting-started-kustomize/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta29
+apiVersion: skaffold/v3
 kind: Config
 metadata:
   name: getting-started-kustomize
@@ -8,18 +8,20 @@ build:
     context: app
     docker:
       dockerfile: Dockerfile
-deploy:
+manifests:
   kustomize:
     paths:
     - overlays/dev
+deploy:
+  kubectl: {}
 profiles:
 - name: prod
-  deploy:
+  manifests:
     kustomize:
       paths:
       - overlays/prod
 - name: staging
-  deploy:
+  manifests:
     kustomize:
       paths:
       - overlays/staging
diff --git a/examples/getting-started/k8s-pod.yaml b/examples/getting-started/k8s-pod.yaml
@@ -2,7 +2,6 @@ apiVersion: v1
 kind: Pod
 metadata:
   name: getting-started
-  namespace: ""
 spec:
   containers:
   - name: getting-started

diff --git a/examples/getting-started/skaffold.yaml b/examples/getting-started/skaffold.yaml
@@ -1,9 +1,8 @@
-apiVersion: skaffold/v2beta29
+apiVersion: skaffold/v3
 kind: Config
 build:
   artifacts:
   - image: skaffold-example
-deploy:
-  kubectl:
-    manifests:
-      - k8s-*
+manifests:
+  rawYaml:
+  - k8s-pod.yaml
diff --git a/examples/google-cloud-build/skaffold.yaml b/examples/google-cloud-build/skaffold.yaml
@@ -1,12 +1,10 @@
-apiVersion: skaffold/v2beta29
+apiVersion: skaffold/v3
 kind: Config
 build:
   googleCloudBuild:
-    # Change `k8s-skaffold` with your PROJECT_ID
     projectId: k8s-skaffold
   artifacts:
   - image: skaffold-example
-deploy:
-  kubectl:
-    manifests:
-      - k8s-*
+manifests:
+  rawYaml:
+  - k8s-*
diff --git a/examples/helm-deployment-dependencies/README.md b/examples/helm-deployment-dependencies/README.md
@@ -6,8 +6,6 @@ This example follows the [helm](../helm-deployment) example, but with a local ch
 
 The `skipBuildDependencies` option is used to skip the `helm dep build` command. This must be disabled for charts with local dependencies.
 
-The image can be passed to the subchart using the standard Helm format of `subchart-name.value`.
-
 ```yaml
 deploy:
   helm:
@@ -16,9 +14,6 @@ deploy:
       chartPath: skaffold-helm
       namespace: skaffold
       skipBuildDependencies: true # Skip helm dep build
-      artifactOverrides :
-        image: skaffold-helm
-        "subchart.image": skaffold-helm # Set image for subchart
       valuesFiles:
         - helm-values-file.yaml
 ```
diff --git a/examples/helm-deployment-dependencies/skaffold.yaml b/examples/helm-deployment-dependencies/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta29
+apiVersion: skaffold/v3
 kind: Config
 build:
   tagPolicy:
@@ -14,10 +14,6 @@ deploy:
       #valuesFiles:
       #- helm-skaffold-values.yaml
       skipBuildDependencies: true # Skip helm dep build
-      artifactOverrides:
-        image: skaffold-helm
-        skaffold-helm-subchart:
-          image: skaffold-helm
       #recreatePods will pass --recreate-pods to helm upgrade
       #recreatePods: true
       #overrides builds an override values.yaml file to run with the helm deploy

diff --git a/examples/helm-deployment/skaffold.yaml b/examples/helm-deployment/skaffold.yaml
@@ -1,9 +1,9 @@
-apiVersion: skaffold/v2beta29
+apiVersion: skaffold/v3
 kind: Config
 build:
   artifacts:
   - image: skaffold-helm
-deploy:
+manifests:
   helm:
     releases:
     - name: skaffold-helm

diff --git a/examples/helm-remote-repo/skaffold.yaml b/examples/helm-remote-repo/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta29
+apiVersion: skaffold/v3
 kind: Config
 deploy:
   helm:

diff --git a/examples/hot-reload/skaffold.yaml b/examples/hot-reload/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta29
+apiVersion: skaffold/v3
 kind: Config
 build:
   artifacts:

diff --git a/examples/jib-gradle/skaffold.yaml b/examples/jib-gradle/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta29
+apiVersion: skaffold/v3
 kind: Config
 build:
   artifacts:

diff --git a/examples/jib-multimodule/skaffold.yaml b/examples/jib-multimodule/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta29
+apiVersion: skaffold/v3
 kind: Config
 build:
   artifacts:

diff --git a/examples/jib-sync/skaffold-gradle.yaml b/examples/jib-sync/skaffold-gradle.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta29
+apiVersion: skaffold/v3
 kind: Config
 build:
   artifacts:

diff --git a/examples/jib-sync/skaffold-maven.yaml b/examples/jib-sync/skaffold-maven.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta29
+apiVersion: skaffold/v3
 kind: Config
 build:
   artifacts:

diff --git a/examples/jib/skaffold.yaml b/examples/jib/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta29
+apiVersion: skaffold/v3
 kind: Config
 build:
   artifacts:

diff --git a/examples/kaniko/skaffold.yaml b/examples/kaniko/skaffold.yaml
@@ -1,4 +1,4 @@
-apiVersion: skaffold/v2beta29
+apiVersion: skaffold/v3
 kind: Config
 build:
   artifacts:
@@ -9,7 +9,6 @@ build:
     pullSecretName: e2esecret-with-path
     pullSecretPath:     kaniko-secret.json
     namespace: default
-deploy:
-  kubectl:
-    manifests:
-      - k8s-*
+manifests:
+  rawYaml:
+  - k8s-*
diff --git a/examples/ko-sync-infer/README.md b/examples/ko-sync-infer/README.md
@@ -0,0 +1,18 @@
+### Example: inferred file sync using the ko builder
+
+This example uses
+[inferred file sync](https://skaffold.dev/docs/pipeline-stages/filesync/#inferred-sync-mode)
+for static assets with the
+[`ko` builder](https://skaffold.dev/docs/pipeline-stages/builders/ko/)
+for a Go web app.
+
+To observe the behavior of file sync, run this command:
+
+```shell
+skaffold dev
+```
+
+Try changing the HTML file in the `kodata` directory to see how Skaffold
+syncs the file.
+
+If change the the `main.go` file, Skaffold will rebuild and redeploy the image.