Skip to content

Commit

Permalink
[1.17 backport] Docs: workflow adjustment, version bumps (#10533)
Browse files Browse the repository at this point in the history
Co-authored-by: Art Berger <[email protected]>
  • Loading branch information
Rachael-Graham and artberger authored Dec 23, 2024
1 parent 8c39169 commit cdfd9ef
Show file tree
Hide file tree
Showing 10 changed files with 30 additions and 21 deletions.
28 changes: 15 additions & 13 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
if: ${{ always() }}
needs: receiver
outputs:
minor: ${{ steps.version-variables.outputs.minor }}
steps:
Expand All @@ -35,7 +37,7 @@ jobs:
if [[ "${{ github.event_name }}" == "release" ]]; then
version=${{ github.event.release.target_commitish }}
elif [[ "${{ github.event_name }}" == "repository_dispatch" ]]; then
version=${{ steps.dispatch-receiver.outputs.dispatch_lts }}
version=${{ needs.receiver.outputs.dispatch_lts }}
else
version=${{ inputs.branch }}
fi
Expand Down Expand Up @@ -110,19 +112,19 @@ jobs:
run: |
pushd docs || exit 1
# OSS
cp ../gloo/docs/content/static/content/gloo-security-scan.docgen static/content/gg-security-updates/gloo-security-scan.docgen
cp ../gloo/docs/content/static/content/gloo-security-scan-0.docgen static/content/gg-security-updates/gloo-security-scan-0.docgen
cp ../gloo/docs/content/static/content/gloo-security-scan-1.docgen static/content/gg-security-updates/gloo-security-scan-1.docgen
cp ../gloo/docs/content/static/content/gloo-security-scan-2.docgen static/content/gg-security-updates/gloo-security-scan-2.docgen
cp ../gloo/docs/content/static/content/gloo-security-scan-3.docgen static/content/gg-security-updates/gloo-security-scan-3.docgen
cp ../gloo/docs/content/static/content/gloo-security-scan-4.docgen static/content/gg-security-updates/gloo-security-scan-4.docgen
[ -f ../gloo/docs/content/static/content/gloo-security-scan.docgen ] && cp ../gloo/docs/content/static/content/gloo-security-scan.docgen static/content/gg-security-updates/gloo-security-scan.docgen
[ -f ../gloo/docs/content/static/content/gloo-security-scan-0.docgen ] && cp ../gloo/docs/content/static/content/gloo-security-scan-0.docgen static/content/gg-security-updates/gloo-security-scan-0.docgen
[ -f ../gloo/docs/content/static/content/gloo-security-scan-1.docgen ] && cp ../gloo/docs/content/static/content/gloo-security-scan-1.docgen static/content/gg-security-updates/gloo-security-scan-1.docgen
[ -f ../gloo/docs/content/static/content/gloo-security-scan-2.docgen ] && cp ../gloo/docs/content/static/content/gloo-security-scan-2.docgen static/content/gg-security-updates/gloo-security-scan-2.docgen
[ -f ../gloo/docs/content/static/content/gloo-security-scan-3.docgen ] && cp ../gloo/docs/content/static/content/gloo-security-scan-3.docgen static/content/gg-security-updates/gloo-security-scan-3.docgen
[ -f ../gloo/docs/content/static/content/gloo-security-scan-4.docgen ] && cp ../gloo/docs/content/static/content/gloo-security-scan-4.docgen static/content/gg-security-updates/gloo-security-scan-4.docgen
# Enterprise
cp ../gloo/docs/content/static/content/glooe-security-scan.docgen static/content/gg-security-updates/glooe-security-scan.docgen
cp ../gloo/docs/content/static/content/glooe-security-scan-0.docgen static/content/gg-security-updates/glooe-security-scan-0.docgen
cp ../gloo/docs/content/static/content/glooe-security-scan-1.docgen static/content/gg-security-updates/glooe-security-scan-1.docgen
cp ../gloo/docs/content/static/content/glooe-security-scan-2.docgen static/content/gg-security-updates/glooe-security-scan-2.docgen
cp ../gloo/docs/content/static/content/glooe-security-scan-3.docgen static/content/gg-security-updates/glooe-security-scan-3.docgen
cp ../gloo/docs/content/static/content/glooe-security-scan-4.docgen static/content/gg-security-updates/glooe-security-scan-4.docgen
[ -f ../gloo/docs/content/static/content/glooe-security-scan.docgen ] && cp ../gloo/docs/content/static/content/glooe-security-scan.docgen static/content/gg-security-updates/glooe-security-scan.docgen
[ -f ../gloo/docs/content/static/content/glooe-security-scan-0.docgen ] && cp ../gloo/docs/content/static/content/glooe-security-scan-0.docgen static/content/gg-security-updates/glooe-security-scan-0.docgen
[ -f ../gloo/docs/content/static/content/glooe-security-scan-1.docgen ] && cp ../gloo/docs/content/static/content/glooe-security-scan-1.docgen static/content/gg-security-updates/glooe-security-scan-1.docgen
[ -f ../gloo/docs/content/static/content/glooe-security-scan-2.docgen ] && cp ../gloo/docs/content/static/content/glooe-security-scan-2.docgen static/content/gg-security-updates/glooe-security-scan-2.docgen
[ -f ../gloo/docs/content/static/content/glooe-security-scan-3.docgen ] && cp ../gloo/docs/content/static/content/glooe-security-scan-3.docgen static/content/gg-security-updates/glooe-security-scan-3.docgen
[ -f ../gloo/docs/content/static/content/glooe-security-scan-4.docgen ] && cp ../gloo/docs/content/static/content/glooe-security-scan-4.docgen static/content/gg-security-updates/glooe-security-scan-4.docgen
popd || exit 1
- name: Copy security posture
run: |
Expand Down
5 changes: 5 additions & 0 deletions changelog/v1.17.20/docs-fixes.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
changelog:
- type: NON_USER_FACING
description: >-
Weekly backport of doc fixes, such as links, typos, version bumps, and minor Slack requests.
skipCI-kube-tests:true
4 changes: 3 additions & 1 deletion docs/content/guides/graphql/observability.md
Original file line number Diff line number Diff line change
Expand Up @@ -69,5 +69,7 @@ If you encounter errors or unexpected behavior in your Gloo GraphQL setup, you c
{{< /highlight >}}

3. Use the following command. Logs are now collected for your GraphQL resources, and are served by the gateway proxy pod.

```sh
glooctl proxy logs debug
glooctl proxy logs --name gateway-proxy debug
```
2 changes: 1 addition & 1 deletion docs/content/introduction/faq.md
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@ You can then compare the output to what the Envoy config should look like.
If you want to quickly get the logs for the proxy:

```bash
glooctl proxy logs -f
glooctl proxy logs --name gateway-proxy -f
```

### Why are the ports on my gateway proxy not opened?
Expand Down
2 changes: 1 addition & 1 deletion docs/content/operations/debugging_gloo/_index.md
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ Finally, you can use the Solo.io Envoy UI to browse the config. You can safely u
If things look okay (within your ability to tell), another good place to look is the Envoy proxy logs. You can very quickly turn on `debug` logging to Envoy as well as `tail` the logs with this handy `glooctl` command:
```bash
glooctl proxy logs -f
glooctl proxy logs --name gateway-proxy -f
```
When you have the logging window up, send requests through to the proxy and you can get some very detailed debugging logging going through the log tail.
Expand Down
2 changes: 1 addition & 1 deletion docs/content/static/content/version_gee_latest.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.17.4
1.17.5
2 changes: 1 addition & 1 deletion docs/content/static/content/version_gee_n+1.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.18.0-rc3
1.18.1
2 changes: 1 addition & 1 deletion docs/content/static/content/version_geoss_latest.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.17.16
1.17.19
2 changes: 1 addition & 1 deletion docs/content/static/content/version_geoss_n+1.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.18.0-rc3
1.18.2
2 changes: 1 addition & 1 deletion docs/content/static/content/version_geoss_n-1.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.16.22
1.16.23

0 comments on commit cdfd9ef

Please sign in to comment.