Skip to content

Commit

Permalink
Fix merge conflicts in 3.5 branch (#6443)
Browse files Browse the repository at this point in the history
* DOCU-3435: Find in page counts hidden elements in the result

This was caused due to the way the sidebar items (accordion items) expanded and collapsed.
When an accordion item was "collapsed", its:

max-height was set to 0
opacity was set to 1 so technically even though they were "hidden" to the naked eye, they were still "visible".
This caused Chrome's and Firefox's find in page to count the supposedly "hidden" occurrences of the searched text as part of the results.

Setting the visibility to hidden when the item is collapsed, and to visible when it is expanded fixed the issue.

* fix: Kong for Kubernetes Enterprise (#6247)

---------

Co-authored-by: Michael Heap <[email protected]>

* fix: Kong for Kubernetes Enterprise (DB Mode) (#6279)

---------

Co-authored-by: Michael Heap <[email protected]>

* fix: Using multiple backend Services (#6332)

* rewrite of the guide

* Merge KIC 3.0 prerequisites in to KIC 2.x

---------

Co-authored-by: Michael Heap <[email protected]>

* Add Overlays for tag description [skip-ci] (#6271)

* overlays

* add descriptions overlays

* update docs

* Apply suggestions from code review

Co-authored-by: lena-larionova <[email protected]>

* update docs

* one more update

---------

Co-authored-by: lena-larionova <[email protected]>

* Feat: Noname plugins for Kong (#6097)

* updated _metadata to only select the security category

* iryanb index examples schmeas 92523

* 92923 iryanb created 2 different _index.md documents for each plugin

* 101223 noname kong plugin documentation edits

* removed comma

* reformat to use latest templates for third-party plugins

* Formatting & grammar edits

* clean up more formatting, align both plugins, turn examples into tabs

* add Noname to linter dictionary

* make linter happy

---------

Co-authored-by: lena-larionova <[email protected]>

* kgo: update docs with 1.0.2 (#6334)

* add a note to FIPS index page (#6330)

* add a note to FIPS index page

KAG-2803

* format the note and use product name variable

---------

Co-authored-by: lena-larionova <[email protected]>

* Chore: Add search aliases for plugins (#6328)

add search aliases for plugins

* Update: SSH access note for instances deployed using Konnect Tech Preview install platforms (#6305)

* Update: Add note about SSH access for instances deployed in AWS, Azure, or GCP

Add a note about SSH access to Konnect data plane nodes when using the AWS, Azure, or GCP deployment styles and how it's not allowed directly but need to use the cloud provider tools.

Raised in Slack: https://kongstrong.slack.com/archives/C03NRECFJPM/p1691689181346589

* apply small copy edits

---------

Co-authored-by: Diana <[email protected]>

* kgo: add 1.0.2 manifests (#6338)

* feat(multiple-metrics): updated latency section and images (#6319)

* feat(multiple-metrics): updated latency section and images

* copy edits

* shot-scraper

* vale

* update image

---------

Co-authored-by: sichvoge <[email protected]>
Co-authored-by: Angel <[email protected]>

* noname security plugin metadata.yml fix (#6339)

* noname metadata.yml fix

* adjust phrasing for enterprise key in template

---------

Co-authored-by: lena-larionova <[email protected]>

* fix(deps): update non-major dependencies

* fix: Enable Admission webhook (#6342)

---------

Co-authored-by: Michael Heap <[email protected]>

* Guide to migrate Zone CP from On-Prem Global CP to Konnect (#6320)

* add guide to migrate Zone CP from on-prem Global to Konnect

* Make copyedits and fix a few links and formatting issues

Signed-off-by: Diana <[email protected]>

* update the title in the sidebar, change zone to global in prerequisites

* Add yq to Vale dictionary

Signed-off-by: Diana <[email protected]>

* Apply copyedits

* add limitation and 2 diagrams

* Add branded images and figure text for the images

Signed-off-by: Diana <[email protected]>

* Make copyedits, add a command for KDS TLS

Signed-off-by: Diana <[email protected]>

* Change KIC name to variable to appease Vale

* Apply edits based on feedback

Signed-off-by: Diana <[email protected]>

* Remove mockup diagrams

Signed-off-by: Diana <[email protected]>

* Fix broken links

Signed-off-by: Diana <[email protected]>

---------

Signed-off-by: Diana <[email protected]>
Co-authored-by: Diana <[email protected]>

* chore(deps): bump kumahq/kuma-website from 4250ff55 to 8a35288f (#6312)

Signed-off-by: kong-docs[bot] <[email protected]>
Co-authored-by: kong-docs[bot] <[email protected]>

* fix(jwt): state what happens when multiple JWTs are provided (#6353)

fix(jwt): state what happens with many JWTs

Kong rejects request when multiple JWTs were
provided that differ from each other.

Fix: #11796

* Automated Changelog update [skip ci] (#6351)

* Automated changelog update

* Add skip changelog tags and remove entries that should be skipped

---------

Co-authored-by: kong-docs[bot] <[email protected]>
Co-authored-by: Angel <[email protected]>

* Update: reflect latest FIPS support status (#6286)

* Update: reflect latest FIPS support status

* Fix table conditional rendering

Signed-off-by: Diana <[email protected]>

---------

Signed-off-by: Diana <[email protected]>
Co-authored-by: Diana <[email protected]>

* Fix API URL in Konnect Custom Plugin docs (#6357)

* Automated OAS Update (#6354)

* Automated OAS update: api-specs/Konnect/v2/yaml/analytics-reports.yaml, api-specs/Konnect/v2/yaml/analytics-requests.yaml, api-specs/Konnect/v2/yaml/api-products.yaml, api-specs/Konnect/v2/yaml/audit-logs.yaml, api-specs/Konnect/control-planes-config/control-planes-config.yaml, api-specs/Konnect/v2/yaml/control-planes.yaml, api-specs/Konnect/v3/yaml/identity.yaml, api-specs/Konnect/v0/yaml/mesh-control-planes.yaml, apps/konnect-api/openapi/v2/portal-management/openapi.yaml

* remove portal management api

---------

Co-authored-by: lena.larionova <[email protected]>

* fix(portal) remove examples with path in portal gui host (#6358)

* fix: Using mtls-auth plugin (#6355)

---------

Co-authored-by: Michael Heap <[email protected]>

* Update cert-manager guide to use Kuma labels (#6371)

Update cert-manager.md

Kuma uses labels now instead of annotations.

* Fix: Use placeholder token in TBAC examples instead of hashed value (#6365)

Update enable-rbac.md

As per SalesForce case: 00038584 the changed examples try to use the token value returned in Step 3 here: https://docs.konghq.com/gateway/latest/production/access-control/enable-rbac/#super-admin-creates-one-admin-for-each-team However this is a hashed value: https://docs.konghq.com/gateway/latest/admin-api/rbac/reference/ and not the actual user token which was set for adminA in Step 1 here: https://docs.konghq.com/gateway/latest/production/access-control/enable-rbac/#super-admin-creates-one-admin-for-each-team

* noname description update (#6375)

* Feat: Insomnia buttons for API catalog landing page (#6329)

* add insomnia links to api catalog landing page

* add insomnia buttons for konnect specs

* upload missing specs and add insomnia buttons

* styling adjustments

* Chore: Update plugin submodule (#6378)

update plugin submodule to fix 3.4 examples and introduce 3.5

* [Sitemap] Only include `latest` version for gateway-operator (#6376)

* chore(deps): update docs from repo source

Signed-off-by: kumahq[bot] <110050114+kumahq[bot]@users.noreply.github.com>

* chore(deps): bump kumahq/kuma-website from 8a35288f to b95c7b8b

Signed-off-by: kong-docs[bot] <[email protected]>

* doc(kic) add GWAPI redirect instructions (#6335)

* doc(kic) add GWAPI redirect instructions

* feat(kic) modularize TLS config

* fix(kic) formatting fixes

* chore(kic) move test into TLS include

* formatting and rewrite

* fix a typo

* Apply suggestions from code review

---------

Co-authored-by: Rajakavitha Kodhandapani <[email protected]>
Co-authored-by: Michael Heap <[email protected]>

* chore(deps): update tj-actions/changed-files action to v40

* chore(deps): update actions/setup-node action to v4

* fix(deps): update non-major dependencies

* Fix KIC prerequisites (#6399)

* fix: fix changelog entry for openssl version bump (#6404)

* fix: fix changelog entry for openssl version bump

* remove duplicate openssl bumping in 3.4

* Fix: Add missing docker image options to Gateway install overview (#6380)

add missing docker image options to install overview

* fix(opentelemetry): address invalid request to set up plugin (#6406)

The request documented to configure the Opentelemetry plugin is invalid
because it uses a dot `.` in the name of the attribute, which is
interpreted as a field separator in the curl form data.

This updates the documentation without changing the example, using JSON
instead of form data to allow passing a name that includes a dot.

* fix: Rewriting hosts and paths (#6405)

---------

Co-authored-by: Michael Heap <[email protected]>

* WIP: Deprecated fields

* WIP: Render the `shorthand_fields` in a different section

* adjust deprecated params section formatting

* fix: Integrate the Kong Ingress Controller with Prometheus/Grafana (#6409)

---------

Co-authored-by: Michael Heap <[email protected]>

* chore(deps): bump kumahq/kuma-website from b95c7b8b to a3c1ea24 (#6390)

Signed-off-by: kong-docs[bot] <[email protected]>
Co-authored-by: kong-docs[bot] <[email protected]>

* docs(mesh): update docs and changelog (#6382)

chore(deps): update docs from repo source

Signed-off-by: kumahq[bot] <110050114+kumahq[bot]@users.noreply.github.com>
Co-authored-by: kumahq[bot] <110050114+kumahq[bot]@users.noreply.github.com>

* fix(mesh): correct back link

These pages are no longer in use in newer versions but the link
was dead in 2.0.x and 2.1.x

Signed-off-by: Charly Molter <[email protected]>

* Automated OAS Update (#6359)

Automated OAS update: api-specs/Konnect/v2/yaml/api-products.yaml, api-specs/Konnect/v2/yaml/portal-management.yaml

* Fix mistake in auth0 markdown (#6417)

Fix description for the `konnect_org_id` field.

* fix: Using OIDC plugin (#6427)

---------

Co-authored-by: Michael Heap <[email protected]>

* Topnav tweaks (#6429)

* Remove "We are hiring" button from top nav

* Move "API Specs" to the "Docs" dropdown

* Center left-side item on "Docs" and "Plugin Hub" dropdowns

* Add "API Specs" to mobile sidebar

* Add Kong Mesh specific policies to the migration script (#6414)

add Kong Mesh specific policies to the migration script

* Automated OAS Update (#6430)

Automated OAS update: api-specs/Konnect/v2/yaml/portal-management.yaml

* Update resource limit language (#6431)

Update resource limit language

* Automated Changelog update [skip ci] (#6394)

* Automated changelog update

* remove Kuma auto updates

---------

Co-authored-by: kong-docs[bot] <[email protected]>
Co-authored-by: Angel <[email protected]>

---------

Signed-off-by: Diana <[email protected]>
Signed-off-by: kong-docs[bot] <[email protected]>
Signed-off-by: kumahq[bot] <110050114+kumahq[bot]@users.noreply.github.com>
Signed-off-by: Charly Molter <[email protected]>
Co-authored-by: Fabian Rodriguez <[email protected]>
Co-authored-by: Rajakavitha Kodhandapani <[email protected]>
Co-authored-by: Michael Heap <[email protected]>
Co-authored-by: lena-larionova <[email protected]>
Co-authored-by: nn iryanb <[email protected]>
Co-authored-by: Patryk Małek <[email protected]>
Co-authored-by: Niklaus Schen <[email protected]>
Co-authored-by: Dustin Dauncey <[email protected]>
Co-authored-by: Diana <[email protected]>
Co-authored-by: Christian Heidenreich <[email protected]>
Co-authored-by: sichvoge <[email protected]>
Co-authored-by: Daniella Freese <[email protected]>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Ilya Lobkov <[email protected]>
Co-authored-by: kong-docs <[email protected]>
Co-authored-by: kong-docs[bot] <[email protected]>
Co-authored-by: Mikołaj Nowak <[email protected]>
Co-authored-by: Wangchong Zhou <[email protected]>
Co-authored-by: kong-apiops <[email protected]>
Co-authored-by: lena.larionova <[email protected]>
Co-authored-by: Nathan Bailey <[email protected]>
Co-authored-by: Viktor Gamov <[email protected]>
Co-authored-by: jamesgkong <[email protected]>
Co-authored-by: kumahq[bot] <110050114+kumahq[bot]@users.noreply.github.com>
Co-authored-by: Travis Raines <[email protected]>
Co-authored-by: Qirui(Keery) Nie <[email protected]>
Co-authored-by: Samuele <[email protected]>
Co-authored-by: kong[bot] <123129154+kong[bot]@users.noreply.github.com>
Co-authored-by: Charly Molter <[email protected]>
Co-authored-by: Ross Kukulinski <[email protected]>
  • Loading branch information
1 parent 6c67a07 commit ba31b79
Show file tree
Hide file tree
Showing 199 changed files with 69,372 additions and 7,425 deletions.
2 changes: 2 additions & 0 deletions .github/styles/kong/dictionary.txt
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ Netlify
Nginx
Nginx's
Node.js
Noname
OAuth
Okta
Okta's
Expand Down Expand Up @@ -470,5 +471,6 @@ xbox
xenial
yaml
yml
yq
zipkin
zsh
2 changes: 1 addition & 1 deletion .github/workflows/build-docs-pdf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
run: bundle install --jobs 4 --retry 3

# Configure Node to build assets
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: "16"
- name: Cache node modules
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-plugin-pdf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
run: bundle install --jobs 4 --retry 3

# Configure Node to build assets
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: "16"
- name: Cache node modules
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci-autofix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,14 @@ jobs:
repository: ${{ github.event.pull_request.head.repo.full_name }}
ref: ${{ github.event.pull_request.head.ref }}
fetch-depth: 0
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: 16
cache: 'npm'
- run: npm ci
- name: Get changed files
id: changed-files
uses: tj-actions/changed-files@v39
uses: tj-actions/changed-files@v40
with:
sha: ${{ github.event.pull_request.head.sha }}
files: |
Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/linting.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,14 +32,14 @@ jobs:
- uses: actions/checkout@v4
with:
fetch-depth: 100
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: 16
cache: 'npm'
- run: npm ci
- name: Get changed files
id: changed-files
uses: tj-actions/changed-files@v39
uses: tj-actions/changed-files@v40
with:
sha: ${{ github.sha }}
files: |
Expand Down Expand Up @@ -86,9 +86,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 2
- name: Get changed files
id: changed-files
uses: tj-actions/changed-files@v39
uses: tj-actions/changed-files@v40
with:
sha: ${{ github.sha }}
files: |
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/run-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
run: gem install foreman

# Configure Node to build assets
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: "16"
- name: Cache node modules
Expand Down Expand Up @@ -79,7 +79,7 @@ jobs:
with:
submodules: 'recursive'
# Configure Node to build assets
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: "16"
- name: Cache node modules
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/scheduled-broken-link-checker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
run: gem install foreman

# Configure Node to build assets
- uses: actions/setup-node@v3
- uses: actions/setup-node@v4
with:
node-version: "16"
- name: Cache node modules
Expand Down
2 changes: 1 addition & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -188,4 +188,4 @@ DEPENDENCIES
rubocop

BUNDLED WITH
2.4.10
2.4.21
Loading

0 comments on commit ba31b79

Please sign in to comment.