[1.18 backport] Docs: workflow adjustment, version bumps (#10532)

Co-authored-by: Art Berger <[email protected]>

Author: Rachael-Graham

.github/workflows/push-docs.yaml

@@ -25,6 +25,8 @@ jobs:
 
   copy-docs:
     runs-on: ubuntu-latest
+    if: ${{ always() }}
+    needs: receiver
     outputs:
       minor: ${{ steps.version-variables.outputs.minor }}
     steps:
@@ -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
@@ -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: |
@@ -151,6 +153,14 @@ jobs:
         cp ../gloo/docs/content/reference/cli/glooctl_uninstall.md content/en/gateway/${{ steps.version-variables.outputs.directory }}/reference/cli/glooctl_uninstall.md
         cp ../gloo/docs/content/reference/cli/glooctl_upgrade.md content/en/gateway/${{ steps.version-variables.outputs.directory }}/reference/cli/glooctl_upgrade.md
         popd || exit 1
+    - name: Copy API
+      run: |
+        pushd docs || exit 1
+        cp ../gloo/docs/content/reference/api/github.com/solo-io/gloo/projects/gateway2/api/v1alpha1/direct_responses.md assets/conrefs/pages/gateway/reference/direct_responses_${{ steps.version-variables.outputs.minor }}.md
+        sed -i '1,2d' assets/conrefs/pages/gateway/reference/direct_responses_${{ steps.version-variables.outputs.minor }}.md
+        cp ../gloo/docs/content/reference/api/github.com/solo-io/gloo/projects/gateway2/api/v1alpha1/gateway_parameters.md assets/conrefs/pages/gateway/reference/gateway_parameters_${{ steps.version-variables.outputs.minor }}.md
+        sed -i '1,2d' assets/conrefs/pages/gateway/reference/gateway_parameters_${{ steps.version-variables.outputs.minor }}.md
+        popd || exit 1
     - name: Push and create PR
       env:
         GITHUB_TOKEN: ${{ secrets.DOCS_TOKEN }}

changelog/v1.18.3/docs-fixes.yaml

@@ -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

docs/content/guides/graphql/observability.md

@@ -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
+   ```

docs/content/introduction/faq.md

@@ -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?

docs/content/operations/debugging_gloo/_index.md

@@ -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.

docs/content/static/content/version_gee_latest.md

@@ -1 +1 @@
-1.18.0
+1.18.1

docs/content/static/content/version_gee_n+1.md

@@ -1 +1 @@
-1.18.0
+1.18.1

docs/content/static/content/version_gee_n-1.md

@@ -1 +1 @@
-1.17.4
+1.17.5

docs/content/static/content/version_gee_n-1_oldpatch.md

@@ -1 +1 @@
-1.17.3
+1.17.4

docs/content/static/content/version_geoss_latest.md

@@ -1 +1 @@
-1.18.0
+1.18.2

docs/content/static/content/version_geoss_n-1.md

@@ -1 +1 @@
-1.17.16
+1.17.19