Skip to content

Commit

Permalink
Merge branch 'GoogleContainerTools:main' into pull-policy
Browse files Browse the repository at this point in the history
  • Loading branch information
@alphanota
alphanota authored Jan 29, 2025
2 parents 6999eb3 + acad129 commit 5b03bd9
Show file tree
Hide file tree
Showing 413 changed files with 3,836 additions and 155,124 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/codeql-analysis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v3.28.1
uses: github/codeql-action/init@v3.28.5
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
Expand All @@ -65,4 +65,4 @@ jobs:
make out/skaffold
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v3.28.1
uses: github/codeql-action/analyze@v3.28.5
2 changes: 1 addition & 1 deletion .github/workflows/scorecards.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,6 @@ jobs:

# Upload the results to GitHub's code scanning dashboard.
- name: "Upload to code-scanning"
uses: github/codeql-action/upload-sarif@1f86f55dce064513e2111b0d4fc7cfb11444c092 # v3.27.5
uses: github/codeql-action/upload-sarif@e7c0c9d71b7bd108fd12e06b56fc58d3d154164d # v3.27.5
with:
sarif_file: results.sarif
6,186 changes: 169 additions & 6,017 deletions CHANGELOG.md
View file

Large diffs are not rendered by default.

13 changes: 11 additions & 2 deletions cmd/skaffold/app/cmd/diagnose.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,14 @@ import (

"github.com/spf13/cobra"

deployutil "github.com/GoogleContainerTools/skaffold/v2/pkg/skaffold/deploy/util"
"github.com/GoogleContainerTools/skaffold/v2/pkg/skaffold/diagnose"
"github.com/GoogleContainerTools/skaffold/v2/pkg/skaffold/output"
"github.com/GoogleContainerTools/skaffold/v2/pkg/skaffold/parser"
"github.com/GoogleContainerTools/skaffold/v2/pkg/skaffold/runner/runcontext"
"github.com/GoogleContainerTools/skaffold/v2/pkg/skaffold/schema/latest"
schemaUtil "github.com/GoogleContainerTools/skaffold/v2/pkg/skaffold/schema/util"
"github.com/GoogleContainerTools/skaffold/v2/pkg/skaffold/tag"
"github.com/GoogleContainerTools/skaffold/v2/pkg/skaffold/tags"
"github.com/GoogleContainerTools/skaffold/v2/pkg/skaffold/util"
"github.com/GoogleContainerTools/skaffold/v2/pkg/skaffold/version"
Expand Down Expand Up @@ -106,13 +108,20 @@ func printArtifactDiagnostics(ctx context.Context, out io.Writer, configs []sche
if err != nil {
return fmt.Errorf("getting run context: %w", err)
}
tagger, err := tag.NewTaggerMux(runCtx)
if err != nil {
return fmt.Errorf("getting tagger: %w", err)
}
imageTags, err := deployutil.ImageTags(ctx, runCtx, tagger, out, runCtx.Artifacts())
if err != nil {
return fmt.Errorf("getting tags: %w", err)
}
for _, c := range configs {
config := c.(*latest.SkaffoldConfig)
fmt.Fprintln(out, "Skaffold version:", version.Get().GitCommit)
fmt.Fprintln(out, "Configuration version:", config.APIVersion)
fmt.Fprintln(out, "Number of artifacts:", len(config.Build.Artifacts))

if err := diagnose.CheckArtifacts(ctx, runCtx, out); err != nil {
if err := diagnose.CheckArtifacts(ctx, runCtx, imageTags, out); err != nil {
return fmt.Errorf("running diagnostic on artifacts: %w", err)
}

Expand Down
26 changes: 13 additions & 13 deletions deploy/skaffold/Dockerfile.deps
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ ARG ARCH=amd64
FROM alpine:3.21.2 as download-kubectl
ARG ARCH
# https://dl.k8s.io/release/stable.txt
ENV KUBECTL_VERSION v1.32.0
ENV KUBECTL_VERSION v1.32.1
ENV KUBECTL_URL https://storage.googleapis.com/skaffold/deps/kubectl/${KUBECTL_VERSION}/kubectl
COPY deploy/skaffold/digests/kubectl.${ARCH}.sha256 .
RUN wget -O kubectl "${KUBECTL_URL}" && sha256sum -c kubectl.${ARCH}.sha256
Expand All @@ -28,7 +28,7 @@ RUN chmod +x kubectl
FROM alpine:3.21.2 as download-helm
ARG ARCH
RUN echo arch=$ARCH
ENV HELM_VERSION v3.16.4
ENV HELM_VERSION v3.17.0
ENV HELM_URL https://storage.googleapis.com/skaffold/deps/helm/helm-${HELM_VERSION}-linux-${ARCH}.tar.gz
COPY deploy/skaffold/digests/helm.${ARCH}.sha256 .
RUN wget -O helm.tar.gz "${HELM_URL}" && sha256sum -c helm.${ARCH}.sha256
Expand All @@ -37,7 +37,7 @@ RUN tar -xvf helm.tar.gz --strip-components 1
# Download kustomize (see https://github.com/kubernetes-sigs/kustomize/releases/latest)
FROM alpine:3.21.2 as download-kustomize
ARG ARCH
ENV KUSTOMIZE_VERSION 5.5.0
ENV KUSTOMIZE_VERSION 5.6.0
ENV KUSTOMIZE_URL https://storage.googleapis.com/skaffold/deps/kustomize/v${KUSTOMIZE_VERSION}/kustomize_v${KUSTOMIZE_VERSION}_linux_${ARCH}.tar.gz
COPY deploy/skaffold/digests/kustomize.${ARCH}.sha256 .
RUN wget -O kustomize.tar.gz "${KUSTOMIZE_URL}" && sha256sum -c kustomize.${ARCH}.sha256
Expand Down Expand Up @@ -82,7 +82,7 @@ RUN chmod +x kind
# Download k3d (see https://github.com/k3d-io/k3d/releases/latest)
FROM alpine:3.21.2 as download-k3d
ARG ARCH
ENV K3D_VERSION v5.7.5
ENV K3D_VERSION v5.8.1
ENV K3D_URL https://storage.googleapis.com/skaffold/deps/k3d/${K3D_VERSION}/k3d-linux-amd64
COPY deploy/skaffold/digests/k3d.${ARCH}.sha256 .
RUN wget -O k3d "${K3D_URL}" && sha256sum -c k3d.${ARCH}.sha256
Expand All @@ -91,7 +91,7 @@ RUN chmod +x k3d
# Download gcloud (see https://cloud.google.com/sdk/docs/release-notes)
FROM alpine:3.21.2 as download-gcloud
ARG ARCH
ENV GCLOUD_VERSION 505.0.0
ENV GCLOUD_VERSION 507.0.0
ENV GCLOUD_URL https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-${GCLOUD_VERSION}-linux-GCLOUDARCH.tar.gz
# SHAs listed at https://cloud.google.com/sdk/docs/downloads-versioned-archives
COPY deploy/skaffold/digests/gcloud.${ARCH}.sha256 .
Expand All @@ -104,7 +104,7 @@ RUN tar -zxf gcloud.tar.gz
# Download bazel (see https://github.com/bazelbuild/bazel/releases/latest)
FROM alpine:3.21.2 as download-bazel
ARG ARCH
ENV BAZEL_VERSION 8.0.0
ENV BAZEL_VERSION 8.0.1
ENV BAZEL_URL https://storage.googleapis.com/skaffold/deps/bazel/${BAZEL_VERSION}/bazel-${BAZEL_VERSION}-linux-BAZELARCH
COPY deploy/skaffold/digests/bazel.${ARCH}.sha256 .
RUN \
Expand All @@ -113,16 +113,16 @@ RUN \
sha256sum -c bazel.${ARCH}.sha256
RUN chmod +x bazel

FROM ubuntu:20.04 as runtime_deps
FROM ubuntu:24.04 as runtime_deps

RUN apt-get update && \
apt-get install --no-install-recommends --no-install-suggests -y \
git python unzip && \
git python3 unzip && \
rm -rf /var/lib/apt/lists/*

COPY --from=docker:23.0.1 /usr/local/bin/docker /usr/local/bin/
COPY --from=docker:27.5.1 /usr/local/bin/docker /usr/local/bin/
# From Docker Engine version 23.0.0, Buildx is distributed in a separate package: docker-buildx-plugin. In earlier versions, Buildx was included in the docker-ce-cli package
COPY --from=docker/buildx-bin:0.10.4 /buildx /usr/libexec/docker/cli-plugins/docker-buildx
COPY --from=docker/buildx-bin:0.20.1 /buildx /usr/libexec/docker/cli-plugins/docker-buildx
COPY --from=download-kubectl kubectl /usr/local/bin/
COPY --from=download-helm helm /usr/local/bin/
COPY --from=download-kustomize kustomize /usr/local/bin/
Expand Down Expand Up @@ -155,12 +155,12 @@ ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get update && apt-get install --no-install-recommends --no-install-suggests -y \
curl \
build-essential \
python-setuptools \
python3-setuptools \
lsb-release \
openjdk-17-jdk \
openjdk-21-jdk \
software-properties-common \
jq \
apt-transport-https && \
rm -rf /var/lib/apt/lists/*
COPY --from=golang:1.23.4 /usr/local/go /usr/local/go
COPY --from=golang:1.23.5 /usr/local/go /usr/local/go
ENV PATH /usr/local/go/bin:/root/go/bin:$PATH
2 changes: 1 addition & 1 deletion deploy/skaffold/digests/bazel.amd64.sha256
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
18417fdee645a8dc08bc3f27e33f71a5681f9f14661b33ac48536a31dc8d00f1 bazel
40f243b118f46d1c88842315e78ec5f9f6390980d67a90f7b64098613e60d65b bazel
2 changes: 1 addition & 1 deletion deploy/skaffold/digests/gcloud.amd64.sha256
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3be8585aed4cdada86fd38ee872c6a07d9ab898ae5ce65296b5445ae181f78e9 gcloud.tar.gz
497203706b4471edaacc5548a545d24bb087cdb1557ce00b9dfbdf168f633dd4 gcloud.tar.gz
2 changes: 1 addition & 1 deletion deploy/skaffold/digests/helm.amd64.sha256
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
fc307327959aa38ed8f9f7e66d45492bb022a66c3e5da6063958254b9767d179 helm.tar.gz
fb5d12662fde6eeff36ac4ccacbf3abed96b0ee2de07afdde4edb14e613aee24 helm.tar.gz
2 changes: 1 addition & 1 deletion deploy/skaffold/digests/k3d.amd64.sha256
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5d3f22817d9e163ab6ed43572189dd49fe724d7a6948075b570067747eca8d3f k3d
b900911e5943fecbc341f21a628d9c425d19b629bad8df13d60ba28d1f8e2e6e k3d
2 changes: 1 addition & 1 deletion deploy/skaffold/digests/kubectl.amd64.sha256
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
646d58f6d98ee670a71d9cdffbf6625aeea2849d567f214bc43a35f8ccb7bf70 kubectl
e16c80f1a9f94db31063477eb9e61a2e24c1a4eee09ba776b029048f5369db0c kubectl
2 changes: 1 addition & 1 deletion deploy/skaffold/digests/kustomize.amd64.sha256
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6703a3a70a0c47cf0b37694030b54f1175a9dfeb17b3818b623ed58b9dbc2a77 kustomize.tar.gz
54e4031ddc4e7fc59e408da29e7c646e8e57b8088c51b84b3df0864f47b5148f kustomize.tar.gz
4 changes: 2 additions & 2 deletions docs-v2/content/en/schemas/v4beta12.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2672,8 +2672,8 @@
},
"buildContextCompressionLevel": {
"type": "integer",
"description": "gzip compression level for the build context.",
"x-intellij-html-description": "gzip compression level for the build context.",
"description": "gzip compression level(0-9) for the build context. 0: NoCompression. 1: BestSpeed. 9: BestCompression. -1: DefaultCompression. -2: HuffmanOnly.",
"x-intellij-html-description": "gzip compression level(0-9) for the build context. 0: NoCompression. 1: BestSpeed. 9: BestCompression. -1: DefaultCompression. -2: HuffmanOnly.",
"default": "1"
},
"cache": {
Expand Down
1 change: 1 addition & 0 deletions docs-v2/content/en/schemas/version-mappings/v4beta12-version.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"binVersion":"2.14.0","releaseNoteLink":"https://github.com/GoogleContainerTools/skaffold/releases/tag/v2.14.0"}
2 changes: 1 addition & 1 deletion examples/bazel/skaffold.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v4beta11
apiVersion: skaffold/v4beta12
kind: Config
metadata:
name: hello
Expand Down
2 changes: 1 addition & 1 deletion examples/buildpacks-java/skaffold.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v4beta11
apiVersion: skaffold/v4beta12
kind: Config
build:
artifacts:
Expand Down
2 changes: 1 addition & 1 deletion examples/buildpacks-node/skaffold.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v4beta11
apiVersion: skaffold/v4beta12
kind: Config
build:
artifacts:
Expand Down
2 changes: 1 addition & 1 deletion examples/buildpacks-python/skaffold.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v4beta11
apiVersion: skaffold/v4beta12
kind: Config
build:
artifacts:
Expand Down
2 changes: 1 addition & 1 deletion examples/buildpacks/skaffold.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v4beta11
apiVersion: skaffold/v4beta12
kind: Config
build:
artifacts:
Expand Down
2 changes: 1 addition & 1 deletion examples/cross-platform-builds/skaffold.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v4beta11
apiVersion: skaffold/v4beta12
kind: Config
build:
artifacts:
Expand Down
2 changes: 1 addition & 1 deletion examples/custom-buildx/skaffold.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v4beta11
apiVersion: skaffold/v4beta12
kind: Config
build:
platforms: ["linux/amd64", "linux/arm64"]
Expand Down
2 changes: 1 addition & 1 deletion examples/custom-tests/skaffold.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v4beta11
apiVersion: skaffold/v4beta12
kind: Config
build:
artifacts:
Expand Down
2 changes: 1 addition & 1 deletion examples/custom/skaffold.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v4beta11
apiVersion: skaffold/v4beta12
kind: Config
build:
artifacts:
Expand Down
2 changes: 1 addition & 1 deletion examples/dev-journey-buildpacks/skaffold.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v4beta11
apiVersion: skaffold/v4beta12
kind: Config
build:
artifacts:
Expand Down
2 changes: 1 addition & 1 deletion examples/docker-deploy/skaffold.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v4beta11
apiVersion: skaffold/v4beta12
kind: Config
build:
local:
Expand Down
2 changes: 1 addition & 1 deletion examples/gcb-kaniko/skaffold.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v4beta11
apiVersion: skaffold/v4beta12
kind: Config
build:
googleCloudBuild:
Expand Down
2 changes: 1 addition & 1 deletion examples/generate-pipeline/skaffold.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v4beta11
apiVersion: skaffold/v4beta12
kind: Config
build:
artifacts:
Expand Down
2 changes: 1 addition & 1 deletion examples/getting-started-kustomize/skaffold.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v4beta11
apiVersion: skaffold/v4beta12
kind: Config
metadata:
name: getting-started-kustomize
Expand Down
2 changes: 1 addition & 1 deletion examples/getting-started/skaffold.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v4beta11
apiVersion: skaffold/v4beta12
kind: Config
build:
artifacts:
Expand Down
2 changes: 1 addition & 1 deletion examples/go-integration-coverage/skaffold.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

apiVersion: skaffold/v4beta11
apiVersion: skaffold/v4beta12
kind: Config
metadata:
name: go-integration-coverage
Expand Down
2 changes: 1 addition & 1 deletion examples/google-cloud-build/skaffold.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v4beta11
apiVersion: skaffold/v4beta12
kind: Config
build:
googleCloudBuild:
Expand Down
6 changes: 3 additions & 3 deletions examples/grpc-e2e-tests/cloud-spanner-bootstrap/go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ require (
github.com/googleapis/enterprise-certificate-proxy v0.2.3 // indirect
github.com/googleapis/gax-go/v2 v2.7.1 // indirect
go.opencensus.io v0.24.0 // indirect
golang.org/x/net v0.23.0 // indirect
golang.org/x/net v0.33.0 // indirect
golang.org/x/oauth2 v0.7.0 // indirect
golang.org/x/sys v0.18.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/sys v0.28.0 // indirect
golang.org/x/text v0.21.0 // indirect
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.33.0 // indirect
Expand Down
12 changes: 6 additions & 6 deletions examples/grpc-e2e-tests/cloud-spanner-bootstrap/go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,8 @@ golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU=
golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs=
golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/oauth2 v0.7.0 h1:qe6s0zUXlPX80/dITx3440hWZ7GwMwgDDyrSGTPJG/g=
golang.org/x/oauth2 v0.7.0/go.mod h1:hPLQkd9LyjfXTiRohC/41GhcFqxisoUQ99sCUOHO9x4=
Expand All @@ -101,13 +101,13 @@ golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5h
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA=
golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=
golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
Expand Down
2 changes: 1 addition & 1 deletion examples/grpc-e2e-tests/skaffold.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v4beta11
apiVersion: skaffold/v4beta12
kind: Config
metadata:
name: visitor-counter-e2e
Expand Down
2 changes: 1 addition & 1 deletion examples/helm-deployment-dependencies/skaffold.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v4beta11
apiVersion: skaffold/v4beta12
kind: Config
build:
tagPolicy:
Expand Down
2 changes: 1 addition & 1 deletion examples/helm-deployment/skaffold.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v4beta11
apiVersion: skaffold/v4beta12
kind: Config
build:
artifacts:
Expand Down
2 changes: 1 addition & 1 deletion examples/helm-remote-repo/skaffold.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v4beta11
apiVersion: skaffold/v4beta12
kind: Config
deploy:
helm:
Expand Down
2 changes: 1 addition & 1 deletion examples/helm-render/skaffold.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v4beta11
apiVersion: skaffold/v4beta12
kind: Config
build:
artifacts:
Expand Down
2 changes: 1 addition & 1 deletion examples/hot-reload/skaffold.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v4beta11
apiVersion: skaffold/v4beta12
kind: Config
build:
artifacts:
Expand Down
2 changes: 1 addition & 1 deletion examples/jib-gradle/skaffold.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v4beta11
apiVersion: skaffold/v4beta12
kind: Config
build:
artifacts:
Expand Down
2 changes: 1 addition & 1 deletion examples/jib-multimodule/skaffold.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v4beta11
apiVersion: skaffold/v4beta12
kind: Config
build:
artifacts:
Expand Down
2 changes: 1 addition & 1 deletion examples/jib-sync/skaffold-gradle.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v4beta11
apiVersion: skaffold/v4beta12
kind: Config
build:
artifacts:
Expand Down
2 changes: 1 addition & 1 deletion examples/jib-sync/skaffold-maven.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v4beta11
apiVersion: skaffold/v4beta12
kind: Config
build:
artifacts:
Expand Down
2 changes: 1 addition & 1 deletion examples/jib/skaffold.yaml
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
apiVersion: skaffold/v4beta11
apiVersion: skaffold/v4beta12
kind: Config
build:
artifacts:
Expand Down
Loading

0 comments on commit 5b03bd9

Please sign in to comment.