Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into main-8161
Browse files Browse the repository at this point in the history
  • Loading branch information
sethrylan authored Dec 14, 2022
2 parents c15f4dd + 0d0476b commit c3db0fe
Show file tree
Hide file tree
Showing 341 changed files with 130 additions and 30 deletions.
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ pkg/skaffold/deploy/**kpt** @GoogleContainerTools/skaffold-team @yuwenma

# Debug owners
pkg/skaffold/debug/** @GoogleContainerTools/skaffold-team
docs/content/en/docs/how-tos/debug/** @GoogleContainerTools/skaffold-team
docs-v1/content/en/docs/how-tos/debug/** @GoogleContainerTools/skaffold-team
integration/test-data/debug/** @GoogleContainerTools/skaffold-team
integration/debug_test.go @GoogleContainerTools/skaffold-team
4 changes: 2 additions & 2 deletions DEVELOPMENT.md
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,8 @@ e.g In this example [PR](https://github.com/GoogleContainerTools/skaffold/pull/5
2. Run `hack/generate-proto.sh`. These will generate go code and structs for the newly added proto fields.
```shell script
git status
modified: docs/content/en/api/skaffold.swagger.json
modified: docs/content/en/docs/references/api/grpc.md
modified: docs-v1/content/en/api/skaffold.swagger.json
modified: docs-v1/content/en/docs/references/api/grpc.md
modified: proto/enums/enums.pb.go
modified: proto/enums/enums.proto
```
Expand Down
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -302,11 +302,11 @@ submit-release-trigger:

.PHONY: preview-docs
preview-docs:
./deploy/docs/local-preview.sh hugo serve -D --bind=0.0.0.0 --ignoreCache
./deploy/docs-v1/local-preview.sh hugo serve -D --bind=0.0.0.0 --ignoreCache

.PHONY: build-docs-preview
build-docs-preview:
./deploy/docs/local-preview.sh hugo --baseURL=https://skaffold.dev
./deploy/docs-v1/local-preview.sh hugo --baseURL=https://skaffold.dev

.PHONY: preview-docs-v2
preview-docs-v2:
Expand All @@ -329,7 +329,7 @@ generate-schemas-v2:
# telemetry generation
.PHONY: generate-schemas
generate-telemetry-json:
go run hack/struct-json/main.go -- pkg/skaffold/instrumentation/types.go docs/content/en/docs/resources/telemetry/metrics.json
go run hack/struct-json/main.go -- pkg/skaffold/instrumentation/types.go docs-v1/content/en/docs/resources/telemetry/metrics.json

# telemetry generation
.PHONY: generate-schemas-v2
Expand All @@ -343,7 +343,7 @@ flags-dashboard:

# static files

$(EMBEDDED_FILES_CHECK): go.mod docs/content/en/schemas/* docs-v2/content/en/schemas/*
$(EMBEDDED_FILES_CHECK): go.mod docs-v1/content/en/schemas/* docs-v2/content/en/schemas/*
hack/generate-embedded-files.sh

# run comparisonstats - ex: make COMPARISONSTATS_ARGS='usr/local/bin/skaffold /usr/local/bin/skaffold helm-deployment main.go "//per-dev-iteration-comment"' comparisonstats
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ steps:
- 'bash'
- '-xc'
- |
deploy/docs/build.sh https://skaffold-v1.web.app && cd docs && firebase deploy --only hosting:release --project $PROJECT_ID
deploy/docs-v1/build.sh https://skaffold-v1.web.app && cd docs-v1 && firebase deploy --only hosting:release --project $PROJECT_ID
images: [
'gcr.io/$PROJECT_ID/docs-controller:latest'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ steps:
- 'bash'
- '-xc'
- |
deploy/docs/build.sh https://skaffold-latest.firebaseapp.com && cd docs && firebase deploy --only hosting:head --project $PROJECT_ID
deploy/docs-v1/build.sh https://skaffold-latest.firebaseapp.com && cd docs-v1 && firebase deploy --only hosting:head --project $PROJECT_ID
images:
- 'gcr.io/$PROJECT_ID/docs-controller:latest'
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ weight: 30
******
WARNING!!!
The file docs/content/en/docs/references/api/grpc.md is generated based on proto/markdown.tmpl,
The file docs-v1/content/en/docs/references/api/grpc.md is generated based on proto/markdown.tmpl,
and generated with ./hack/generate_proto.sh!
Please edit the template file and not the markdown one directly!
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ weight: 30
******
WARNING!!!
The file docs/content/en/docs/references/api/grpc.md is generated based on proto/markdown.tmpl,
The file docs-v1/content/en/docs/references/api/grpc.md is generated based on proto/markdown.tmpl,
and generated with ./hack/generate_proto.sh!
Please edit the template file and not the markdown one directly!
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ debugging.
The ko builder implementation work will add `KO_DATA_PATH` to
[the set of environment variables used to detect Go-based applications](https://github.com/GoogleContainerTools/skaffold/blob/c75c55133e709b2fee906eb158be13c7ccfa72cd/pkg/skaffold/debug/transform_go.go#L67-L72)
and updating the associated unit tests and
[documentation](https://github.com/GoogleContainerTools/skaffold/blob/01a833614efd780ddece99198aa7fdcf3f355706/docs/content/en/docs/workflows/debug.md#L103).
[documentation](https://github.com/GoogleContainerTools/skaffold/blob/01a833614efd780ddece99198aa7fdcf3f355706/docs-v1/content/en/docs/workflows/debug.md#L103).

## Design

Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{{ $gh_repo := ($.Param "github_repo") }}
{{ if $gh_repo }}
<div class="td-page-meta ml-2 pb-1 pt-2 mb-0">
{{ $editURL := printf "%s/edit/main/docs/content/%s/%s" $gh_repo ($.Site.Language.Lang) .Path }}
{{ $editURL := printf "%s/edit/main/docs-v1/content/%s/%s" $gh_repo ($.Site.Language.Lang) .Path }}
{{ $issuesURL := printf "%s/issues/new?title=%s" $gh_repo (htmlEscape $.Title )}}
<a href="{{ $editURL }}" target="_blank"><i class="fa fa-edit fa-fw"></i> {{ T "post_edit_this" }}</a>
<a href="{{ $issuesURL }}" target="_blank"><i class="fab fa-github fa-fw"></i> {{ T "post_create_issue" }}</a>
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit c3db0fe

Please sign in to comment.