Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: GoogleContainerTools/skaffold
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: df85d0c5928536ca6bb76b843b1ea344515ecb3b
Choose a base ref
..
head repository: GoogleContainerTools/skaffold
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 5cd9b6358199e9c2caacc35b5c25442d7735f6d6
Choose a head ref
Showing with 7,844 additions and 317 deletions.
  1. +2 −2 .github/workflows/codeql-analysis.yml
  2. +2 −2 .github/workflows/scorecards.yml
  3. +1 −1 docs-v2/config.toml
  4. +1 −1 docs-v2/content/en/docs/references/cli/_index.md
  5. +2 −8 docs-v2/content/en/schemas/v4beta10.json
  6. +4,706 −0 docs-v2/content/en/schemas/v4beta11.json
  7. +3 −3 examples/grpc-e2e-tests/cloud-spanner-bootstrap/go.mod
  8. +6 −6 examples/grpc-e2e-tests/cloud-spanner-bootstrap/go.sum
  9. +3 −3 examples/grpc-e2e-tests/service/go.mod
  10. +6 −6 examples/grpc-e2e-tests/service/go.sum
  11. +2 −0 fs/assets/credits_generated/github.com/hashicorp/hcl/go.mod
  12. +1 −1 go.mod
  13. +2 −2 go.sum
  14. +1 −1 hack/tools/go.mod
  15. +4 −13 hack/tools/go.sum
  16. +1 −1 integration/examples/bazel/skaffold.yaml
  17. +1 −1 integration/examples/buildpacks-java/skaffold.yaml
  18. +1 −1 integration/examples/buildpacks-node/skaffold.yaml
  19. +1 −1 integration/examples/buildpacks-python/skaffold.yaml
  20. +1 −1 integration/examples/buildpacks/skaffold.yaml
  21. +1 −1 integration/examples/cross-platform-builds/skaffold.yaml
  22. +1 −1 integration/examples/custom-buildx/skaffold.yaml
  23. +1 −1 integration/examples/custom-tests/skaffold.yaml
  24. +1 −1 integration/examples/custom/skaffold.yaml
  25. +1 −1 integration/examples/dev-journey-buildpacks/skaffold.yaml
  26. +1 −1 integration/examples/docker-deploy/skaffold.yaml
  27. +1 −1 integration/examples/gcb-kaniko/skaffold.yaml
  28. +1 −1 integration/examples/generate-pipeline/skaffold.yaml
  29. +1 −1 integration/examples/getting-started-kustomize/skaffold.yaml
  30. +1 −1 integration/examples/getting-started/skaffold.yaml
  31. +1 −1 integration/examples/go-integration-coverage/skaffold.yaml
  32. +1 −1 integration/examples/google-cloud-build/skaffold.yaml
  33. +3 −3 integration/examples/grpc-e2e-tests/service/go.mod
  34. +6 −6 integration/examples/grpc-e2e-tests/service/go.sum
  35. +1 −1 integration/examples/grpc-e2e-tests/skaffold.yaml
  36. +1 −1 integration/examples/helm-deployment-dependencies/skaffold.yaml
  37. +1 −1 integration/examples/helm-deployment/skaffold.yaml
  38. +1 −1 integration/examples/helm-remote-repo/skaffold.yaml
  39. +1 −1 integration/examples/helm-render/skaffold.yaml
  40. +1 −1 integration/examples/hot-reload/skaffold.yaml
  41. +1 −1 integration/examples/jib-gradle/skaffold.yaml
  42. +1 −1 integration/examples/jib-multimodule/skaffold.yaml
  43. +1 −1 integration/examples/jib-sync/skaffold-gradle.yaml
  44. +1 −1 integration/examples/jib-sync/skaffold-maven.yaml
  45. +1 −1 integration/examples/jib/skaffold.yaml
  46. +1 −1 integration/examples/kaniko/skaffold.yaml
  47. +1 −1 integration/examples/ko-sync-infer/skaffold.yaml
  48. +1 −1 integration/examples/ko/skaffold.yaml
  49. +1 −1 integration/examples/kustomize/skaffold-kustomize-args.yaml
  50. +1 −1 integration/examples/kustomize/skaffold.yaml
  51. +1 −1 integration/examples/lifecycle-hooks/skaffold.yaml
  52. +1 −1 integration/examples/microservices/skaffold.yaml
  53. +1 −1 integration/examples/multi-config-microservices/base/skaffold.yaml
  54. +1 −1 integration/examples/multi-config-microservices/leeroy-app/skaffold.yaml
  55. +1 −1 integration/examples/multi-config-microservices/leeroy-web/skaffold.yaml
  56. +1 −1 integration/examples/multi-config-microservices/skaffold.yaml
  57. +1 −1 integration/examples/multiple-renderers/skaffold.yaml
  58. +1 −1 integration/examples/nodejs/skaffold.yaml
  59. +1 −1 integration/examples/profile-patches/skaffold.yaml
  60. +1 −1 integration/examples/profiles/skaffold.yaml
  61. +1 −1 integration/examples/react-reload-docker/skaffold.yaml
  62. +1 −1 integration/examples/react-reload/skaffold.yaml
  63. +1 −1 integration/examples/remote-multi-config-microservices/skaffold.yaml
  64. +1 −1 integration/examples/ruby/skaffold.yaml
  65. +1 −1 integration/examples/simple-artifact-dependency/skaffold.yaml
  66. +1 −1 integration/examples/structure-tests/skaffold.yaml
  67. +1 −1 integration/examples/tagging-with-environment-variables/skaffold.yaml
  68. +1 −1 integration/examples/templated-fields/skaffold.yaml
  69. +1 −1 integration/examples/typescript/skaffold.yaml
  70. +1 −1 integration/examples/using-env-file/skaffold.yaml
  71. +1 −1 integration/testdata/build-dependencies/skaffold.yaml
  72. +1 −1 integration/testdata/build/docker-with-platform-amd/skaffold.yaml
  73. +1 −1 integration/testdata/build/docker-with-platform-arm/skaffold.yaml
  74. +1 −1 integration/testdata/build/gcb-with-platform/skaffold.yaml
  75. +1 −1 integration/testdata/build/secret/skaffold.yaml
  76. +1 −1 integration/testdata/build/skaffold.yaml
  77. +1 −1 integration/testdata/build/squash/skaffold.yaml
  78. +1 −1 integration/testdata/build/ssh/skaffold.yaml
  79. +1 −1 integration/testdata/custom-actions-k8s/skaffold.yaml
  80. +1 −1 integration/testdata/custom-actions-local/skaffold.yaml
  81. +1 −1 integration/testdata/custom-test/skaffold.yaml
  82. +1 −1 integration/testdata/debug/skaffold.yaml
  83. +1 −1 integration/testdata/deploy-cloudrun-with-hooks/module1/skaffold.yaml
  84. +1 −1 integration/testdata/deploy-cloudrun-with-hooks/module2/skaffold.yaml
  85. +1 −1 integration/testdata/deploy-cloudrun-with-hooks/skaffold.yaml
  86. +1 −1 integration/testdata/deploy-cloudrun/skaffold.yaml
  87. +1 −1 integration/testdata/deploy-hello-tail/skaffold.yaml
  88. +1 −1 integration/testdata/deploy-multiple/skaffold.yaml
  89. +1 −1 integration/testdata/dev/skaffold.yaml
  90. +3 −3 integration/testdata/diagnose/multi-config/diagnose.tmpl
  91. +1 −1 integration/testdata/diagnose/multi-config/skaffold.yaml
  92. +1 −1 integration/testdata/diagnose/multi-config/skaffold2.yaml
  93. +1 −1 integration/testdata/diagnose/multi-config/skaffold3.yaml
  94. +1 −1 integration/testdata/diagnose/temp-config/diagnose.tmpl
  95. +1 −1 integration/testdata/diagnose/temp-config/skaffold.yaml
  96. +1 −1 integration/testdata/docker-deploy/skaffold.yaml
  97. +1 −1 integration/testdata/empty-dir/skaffold.yaml
  98. +1 −1 integration/testdata/file-sync/skaffold-infer.yaml
  99. +1 −1 integration/testdata/file-sync/skaffold-manual.yaml
  100. +1 −1 integration/testdata/gcb-with-location/skaffold.yaml
  101. +1 −1 integration/testdata/getting-started/skaffold.yaml
  102. +1 −1 integration/testdata/gke_loadbalancer-render/skaffold.yaml
  103. +1 −1 integration/testdata/gke_loadbalancer/skaffold.yaml
  104. +1 −1 integration/testdata/hello/skaffold.yaml
  105. +1 −1 integration/testdata/helm-deploy-namespace/skaffold.yaml
  106. +1 −1 integration/testdata/helm-render-delete/skaffold.yaml
  107. +1 −1 integration/testdata/helm-render/skaffold.yaml
  108. +1 −1 integration/testdata/helm/skaffold.yaml
  109. +1 −1 integration/testdata/init/compose/skaffold.yaml
  110. +1 −1 integration/testdata/init/hello-with-manifest/skaffold.yaml
  111. +1 −1 integration/testdata/init/helm-project/skaffold.yaml
  112. +1 −1 integration/testdata/inspect/cluster/skaffold.add.default.yaml
  113. +1 −1 integration/testdata/inspect/cluster/skaffold.add.profile.yaml
  114. +1 −1 integration/testdata/inspect/cluster/skaffold.cluster.yaml
  115. +1 −1 integration/testdata/inspect/cluster/skaffold.local.yaml
  116. +1 −1 integration/testdata/inspect/cluster/skaffold.modified.default.yaml
  117. +1 −1 integration/testdata/inspect/cluster/skaffold.modified.profile.yaml
  118. +1 −1 integration/testdata/inspect/gcb/skaffold.add.default.yaml
  119. +1 −1 integration/testdata/inspect/gcb/skaffold.add.profile.yaml
  120. +1 −1 integration/testdata/inspect/gcb/skaffold.gcb.yaml
  121. +1 −1 integration/testdata/inspect/gcb/skaffold.local.yaml
  122. +1 −1 integration/testdata/inspect/gcb/skaffold.modified.default.yaml
  123. +1 −1 integration/testdata/inspect/gcb/skaffold.modified.profile.yaml
  124. +1 −1 integration/testdata/jib/skaffold.yaml
  125. +1 −1 integration/testdata/kaniko-explicit-repo/skaffold.yaml
  126. +1 −1 integration/testdata/kaniko-insecure-registry/app/skaffold.yaml
  127. +1 −1 integration/testdata/kaniko-insecure-registry/skaffold.yaml
  128. +1 −1 integration/testdata/kaniko-microservices/skaffold.yaml
  129. +1 −1 integration/testdata/kaniko-sub-folder/skaffold.yaml
  130. +1 −1 integration/testdata/kaniko-target/skaffold.yaml
  131. +1 −1 integration/testdata/kustomize/remote/skaffold.yaml
  132. +1 −1 integration/testdata/modules/app1/skaffold.yaml
  133. +1 −1 integration/testdata/modules/app2/skaffold.yaml
  134. +1 −1 integration/testdata/modules/app3/skaffold.yaml
  135. +1 −1 integration/testdata/modules/skaffold.yaml
  136. +1 −1 integration/testdata/multi-config-pods/module1/skaffold.yaml
  137. +1 −1 integration/testdata/multi-config-pods/module2/skaffold.yaml
  138. +1 −1 integration/testdata/multi-config-pods/skaffold.yaml
  139. +1 −1 integration/testdata/post-render-hooks/module1/skaffold.yaml
  140. +1 −1 integration/testdata/post-render-hooks/module2/skaffold.yaml
  141. +1 −1 integration/testdata/post-render-hooks/skaffold.yaml
  142. +1 −1 integration/testdata/tagPolicy/skaffold.yaml
  143. +1 −1 integration/testdata/test-events/skaffold.yaml
  144. +1 −1 integration/testdata/verify-fail-k8s/skaffold.yaml
  145. +1 −1 integration/testdata/verify-fail/skaffold.yaml
  146. +1 −1 integration/testdata/verify-no-tests/skaffold.yaml
  147. +1 −1 integration/testdata/verify-succeed-k8s/skaffold.yaml
  148. +1 −1 integration/testdata/verify-succeed/skaffold.yaml
  149. +7 −0 pkg/skaffold/build/cluster/kaniko.go
  150. +4 −0 pkg/skaffold/build/docker/docker.go
  151. +38 −25 pkg/skaffold/build/docker/docker_test.go
  152. +1 −1 pkg/skaffold/initializer/testdata/init/allcli/skaffold.yaml
  153. +1 −1 pkg/skaffold/initializer/testdata/init/getting-started-kustomize/skaffold.yaml
  154. +1 −1 pkg/skaffold/initializer/testdata/init/hello-no-manifest/skaffold.yaml
  155. +1 −1 pkg/skaffold/initializer/testdata/init/hello/skaffold.yaml
  156. +1 −1 pkg/skaffold/initializer/testdata/init/helm-deployment/skaffold.yaml
  157. +1 −1 pkg/skaffold/initializer/testdata/init/ignore-tags/skaffold.yaml
  158. +1 −1 pkg/skaffold/initializer/testdata/init/microservices/skaffold.yaml
  159. +1 −1 pkg/skaffold/initializer/testdata/init/windows/skaffold.yaml
  160. +5 −3 pkg/skaffold/schema/latest/config.go
  161. +1,976 −0 pkg/skaffold/schema/v4beta10/config.go
  162. +38 −0 pkg/skaffold/schema/v4beta10/upgrade.go
  163. +235 −0 pkg/skaffold/schema/v4beta10/upgrade_test.go
  164. +1 −1 pkg/skaffold/schema/v4beta9/upgrade.go
  165. +1 −1 pkg/skaffold/schema/v4beta9/upgrade_test.go
  166. +1 −2 pkg/skaffold/schema/validation/validation.go
  167. +4 −4 pkg/skaffold/schema/validation/validation_test.go
  168. +2 −0 pkg/skaffold/schema/versions.go
  169. +23 −13 pkg/skaffold/util/tar.go
  170. +31 −0 vendor/golang.org/x/net/http2/frame.go
  171. +10 −1 vendor/golang.org/x/net/http2/pipe.go
  172. +7 −6 vendor/golang.org/x/net/http2/server.go
  173. +331 −0 vendor/golang.org/x/net/http2/testsync.go
  174. +237 −61 vendor/golang.org/x/net/http2/transport.go
  175. +1 −1 vendor/modules.txt
4 changes: 2 additions & 2 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
@@ -53,7 +53,7 @@ jobs:
# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v3.24.9
uses: github/codeql-action/init@v3.25.1
with:
languages: ${{ matrix.language }}
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -65,4 +65,4 @@ jobs:
make out/skaffold
- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v3.24.9
uses: github/codeql-action/analyze@v3.25.1
4 changes: 2 additions & 2 deletions .github/workflows/scorecards.yml
Original file line number Diff line number Diff line change
@@ -42,14 +42,14 @@ jobs:

# Upload the results as artifacts (optional).
- name: "Upload artifact"
uses: actions/upload-artifact@5d5d22a31266ced268874388b861e4b58bb5c2f3 # v3.1.0
uses: actions/upload-artifact@1746f4ab65b179e0ea60a494b83293b640dd5bba # v3.1.0
with:
name: SARIF file
path: results.sarif
retention-days: 5

# Upload the results to GitHub's code scanning dashboard.
- name: "Upload to code-scanning"
uses: github/codeql-action/upload-sarif@v3.24.9 # v1.0.26
uses: github/codeql-action/upload-sarif@v3.25.1 # v1.0.26
with:
sarif_file: results.sarif
2 changes: 1 addition & 1 deletion docs-v2/config.toml
Original file line number Diff line number Diff line change
@@ -82,7 +82,7 @@ weight = 1
copyright = "Skaffold Authors"
privacy_policy = "https://policies.google.com/privacy"
github_repo = "https://github.com/GoogleContainerTools/skaffold"
skaffold_version = "skaffold/v4beta10"
skaffold_version = "skaffold/v4beta11"

# Google Custom Search Engine ID. Remove or comment out to disable search.
# gcs_engine_id = "013756393218025596041:3nojel67sum"
2 changes: 1 addition & 1 deletion docs-v2/content/en/docs/references/cli/_index.md
Original file line number Diff line number Diff line change
@@ -1032,7 +1032,7 @@ Options:
--overwrite=false: Overwrite original config with fixed config
--remote-cache-dir='': Specify the location of the remote cache (default $HOME/.skaffold/remote-cache)
--sync-remote-cache='missing': Controls how Skaffold manages the remote config cache (see `remote-cache-dir`). One of `always` (default), `missing`, or `never`. `always` syncs remote repositories to latest on access. `missing` only clones remote repositories if they do not exist locally. `never` means the user takes responsibility for updating remote repositories.
--version='skaffold/v4beta10': Target schema version to upgrade to
--version='skaffold/v4beta11': Target schema version to upgrade to
Usage:
skaffold fix [options]
10 changes: 2 additions & 8 deletions docs-v2/content/en/schemas/v4beta10.json
Original file line number Diff line number Diff line change
@@ -1773,14 +1773,8 @@
},
"network": {
"type": "string",
"description": "passed through to docker and overrides the network configuration of docker builder. If unset, use whatever is configured in the underlying docker daemon. Valid modes are `host`: use the host's networking stack. `bridge`: use the bridged network configuration. `container:<name|id>`: reuse another container's network stack. `none`: no networking in the container.",
"x-intellij-html-description": "passed through to docker and overrides the network configuration of docker builder. If unset, use whatever is configured in the underlying docker daemon. Valid modes are <code>host</code>: use the host's networking stack. <code>bridge</code>: use the bridged network configuration. <code>container:&lt;name|id&gt;</code>: reuse another container's network stack. <code>none</code>: no networking in the container.",
"enum": [
"host",
"bridge",
"container:<name|id>",
"none"
]
"description": "passed through to docker and overrides the network configuration of docker builder. If unset, use whatever is configured in the underlying docker daemon. Examples: `host`: use the host's networking stack. `bridge`: use the bridged network configuration. `container:<name|id>`: reuse another container's network stack. `none`: no networking in the container. `my-custom-network`: user-defined network.",
"x-intellij-html-description": "passed through to docker and overrides the network configuration of docker builder. If unset, use whatever is configured in the underlying docker daemon. Examples: <code>host</code>: use the host's networking stack. <code>bridge</code>: use the bridged network configuration. <code>container:&lt;name|id&gt;</code>: reuse another container's network stack. <code>none</code>: no networking in the container. <code>my-custom-network</code>: user-defined network."
},
"noCache": {
"type": "boolean",
Loading