Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Doc fixes 1.17 #10360

Merged
merged 8 commits into from
Nov 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions .github/workflows/push-docs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@ jobs:

copy-docs:
runs-on: ubuntu-latest
outputs:
minor: ${{ steps.version-variables.outputs.minor }}
steps:
- name: Get LTS branch version
id: lts-version
Expand Down Expand Up @@ -162,16 +164,17 @@ jobs:

slack-notification:
runs-on: ubuntu-latest
needs:
- copy-docs
if: ${{ always() }}
needs: copy-docs
steps:
- name: Notify on workflow success
if: |
needs.copy-docs.result == 'success'
env:
SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
VERSION: ${{needs.copy-docs.outputs.minor}}
run: |
MESSAGE="✅ *Success:* Automated copy of reference docs for ${{ steps.version-variables.outputs.minor }} was successful. <https://github.com/solo-io/docs/pulls|Review the PR>"
MESSAGE="✅ *Success:* Automated copy of reference docs for ${VERSION} was successful. <https://github.com/solo-io/docs/pulls|Review the PR>"

curl \
-d "text=$MESSAGE" \
Expand All @@ -185,7 +188,7 @@ jobs:
SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
run: |
JOB_URL=https://github.com/solo-io/gloo/actions/runs/${GITHUB_RUN_ID}
MESSAGE="❌ *Failure:* Automated copy of reference docs for ${{ steps.version-variables.outputs.minor }} failed. <${JOB_URL}|Review the workflow failure>"
MESSAGE="❌ *Failure:* Automated copy of reference docs for ${VERSION} failed. <${JOB_URL}|Review the workflow failure>"

curl \
-d "text=$MESSAGE" \
Expand Down
2 changes: 1 addition & 1 deletion changelog/v1.17.16/doc-fixes.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ changelog:
- type: NON_USER_FACING
description: >-
Weekly doc fixes, including API proto doc format changes and an update to the copy-docs workflow.
skipCI-kube-tests:true
skipCI-kube-tests:true
4 changes: 2 additions & 2 deletions docs/content/reference/api/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ Settings

Routing
- VirtualService: {{< protobuf name="gateway.solo.io.VirtualService" >}}
- Options: {{< protobuf name="gloo.solo.io.VirtualHostOptions" >}}
- Options: {{< versioned_link_path fromRoot="/reference/api/github.com/solo-io/gloo/projects/gloo/api/v1/options.proto.sk/#virtualhostoptions" >}}
- RouteTable: {{< protobuf name="gateway.solo.io.RouteTable" >}}
- Routes: {{< protobuf name="gateway.solo.io.Route" >}}
- Options: {{< protobuf name="gloo.solo.io.RouteOptions" >}}
- Options: {{< versioned_link_path fromRoot="/reference/api/github.com/solo-io/gloo/projects/gloo/api/v1/options.proto.sk/#routeoptions" >}}
- Upstream: {{< protobuf name="gloo.solo.io.Upstream" >}}

ExtAuth
Expand Down
6 changes: 3 additions & 3 deletions docs/content/reference/cheatsheets/timeouts/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ Review this page for a list of commonly used timeout settings in Gloo Gateway, o
- `sslConfig`
- `transportSocketConnectTimeout` disabled by default, **unlimited** (or limited by connection/idle timeout). Suggested is 10 seconds.
- `virtualHost`
- `options` (see also {{< protobuf name="gloo.solo.io.VirtualHostOptions" display="VirtualHostOptions" >}} )
- `options` (see also {{< protobuf name="gloo.solo.io.Options" display="Options" >}} )
- `retries`
- `perTryTimeout` defaults to **15 seconds** (Route timeout)
- `jwtStaged`
Expand All @@ -91,7 +91,7 @@ Review this page for a list of commonly used timeout settings in Gloo Gateway, o
- `remote`
- `cacheDuration` defaults to **5 minutes**
- `routes`
- `options` (see also {{< protobuf name="gloo.solo.io.RouteOptions" display="RouteOptions" >}})
- `options` (see also {{< protobuf name="gloo.solo.io.Options" display="Options" >}})
- `timeout` defaults to **15 seconds**
- `retries`
- `perTryTimeout` defaults to **15 seconds** (Route timeout)
Expand Down Expand Up @@ -123,4 +123,4 @@ Review this page for a list of commonly used timeout settings in Gloo Gateway, o
- `unhealthyEdgeInterval` defaults to `unhealthyInterval`'s value
- `healthyEdgeInterval` defaults to `interval`'s value



Loading