Skip to content

Commit 0f9dde2

Browse files
Nadine2016Rachael-Grahamartberger
authored
Doc fixes 1.17 (#10360)
Co-authored-by: Rachael Graham <[email protected]> Co-authored-by: Art <[email protected]>
1 parent 76c3470 commit 0f9dde2

File tree

4 files changed

+13
-10
lines changed

4 files changed

+13
-10
lines changed

.github/workflows/push-docs.yaml

+7-4
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ jobs:
2525
2626
copy-docs:
2727
runs-on: ubuntu-latest
28+
outputs:
29+
minor: ${{ steps.version-variables.outputs.minor }}
2830
steps:
2931
- name: Get LTS branch version
3032
id: lts-version
@@ -162,16 +164,17 @@ jobs:
162164
163165
slack-notification:
164166
runs-on: ubuntu-latest
165-
needs:
166-
- copy-docs
167+
if: ${{ always() }}
168+
needs: copy-docs
167169
steps:
168170
- name: Notify on workflow success
169171
if: |
170172
needs.copy-docs.result == 'success'
171173
env:
172174
SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
175+
VERSION: ${{needs.copy-docs.outputs.minor}}
173176
run: |
174-
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>"
177+
MESSAGE="✅ *Success:* Automated copy of reference docs for ${VERSION} was successful. <https://github.com/solo-io/docs/pulls|Review the PR>"
175178
176179
curl \
177180
-d "text=$MESSAGE" \
@@ -185,7 +188,7 @@ jobs:
185188
SLACK_BOT_TOKEN: ${{ secrets.SLACK_BOT_TOKEN }}
186189
run: |
187190
JOB_URL=https://github.com/solo-io/gloo/actions/runs/${GITHUB_RUN_ID}
188-
MESSAGE="❌ *Failure:* Automated copy of reference docs for ${{ steps.version-variables.outputs.minor }} failed. <${JOB_URL}|Review the workflow failure>"
191+
MESSAGE="❌ *Failure:* Automated copy of reference docs for ${VERSION} failed. <${JOB_URL}|Review the workflow failure>"
189192
190193
curl \
191194
-d "text=$MESSAGE" \

changelog/v1.17.16/doc-fixes.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ changelog:
22
- type: NON_USER_FACING
33
description: >-
44
Weekly doc fixes, including API proto doc format changes and an update to the copy-docs workflow.
5-
skipCI-kube-tests:true
5+
skipCI-kube-tests:true

docs/content/reference/api/_index.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ Settings
2626

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

3535
ExtAuth

docs/content/reference/cheatsheets/timeouts/_index.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ Review this page for a list of commonly used timeout settings in Gloo Gateway, o
8181
- `sslConfig`
8282
- `transportSocketConnectTimeout` disabled by default, **unlimited** (or limited by connection/idle timeout). Suggested is 10 seconds.
8383
- `virtualHost`
84-
- `options` (see also {{< protobuf name="gloo.solo.io.VirtualHostOptions" display="VirtualHostOptions" >}} )
84+
- `options` (see also {{< protobuf name="gloo.solo.io.Options" display="Options" >}} )
8585
- `retries`
8686
- `perTryTimeout` defaults to **15 seconds** (Route timeout)
8787
- `jwtStaged`
@@ -91,7 +91,7 @@ Review this page for a list of commonly used timeout settings in Gloo Gateway, o
9191
- `remote`
9292
- `cacheDuration` defaults to **5 minutes**
9393
- `routes`
94-
- `options` (see also {{< protobuf name="gloo.solo.io.RouteOptions" display="RouteOptions" >}})
94+
- `options` (see also {{< protobuf name="gloo.solo.io.Options" display="Options" >}})
9595
- `timeout` defaults to **15 seconds**
9696
- `retries`
9797
- `perTryTimeout` defaults to **15 seconds** (Route timeout)
@@ -123,4 +123,4 @@ Review this page for a list of commonly used timeout settings in Gloo Gateway, o
123123
- `unhealthyEdgeInterval` defaults to `unhealthyInterval`'s value
124124
- `healthyEdgeInterval` defaults to `interval`'s value
125125

126-
126+

0 commit comments

Comments
 (0)