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

Merge branch 'main' into konnect #4792

Merged
merged 13 commits into from
Nov 17, 2022
Merged

Merge branch 'main' into konnect #4792

merged 13 commits into from
Nov 17, 2022

Conversation

Guaris
Copy link
Contributor

@Guaris Guaris commented Nov 17, 2022

I want to make sure I resolved the conflicts in the right way.

merges main -> konnect
resolves a conflict in enable-app-reg.md and updates the changelog.

yalhyane and others added 13 commits November 11, 2022 16:40
Changes the `REPO_PREFIX` argument to `REPO` following changes to the kuma.io/installer.sh changes made in kumahq/kuma-website#1149.

Signed-off-by: Philipp Rudloff <philipp.rudloff@konghq.com>

Signed-off-by: Philipp Rudloff <philipp.rudloff@konghq.com>
jekyll expects files in src/.repos/kuma/* which are coming from a submodule.
* kic: add translation failures troubleshooting

* Update troubleshooting.md

* Fix Vale errors, copyedit

Signed-off-by: Diana <75819066+cloudjumpercat@users.noreply.github.com>

Signed-off-by: Diana <75819066+cloudjumpercat@users.noreply.github.com>
Co-authored-by: Diana <75819066+cloudjumpercat@users.noreply.github.com>
* uninstall instructions

* spelling

* formatting

* Apply suggestions from code review

Co-authored-by: lena-larionova <54370747+lena-larionova@users.noreply.github.com>

Co-authored-by: lena-larionova <54370747+lena-larionova@users.noreply.github.com>
* Add Docker image page

* Add new page

* Apply suggestions from code review

Co-authored-by: Angel <Guaris@users.noreply.github.com>

* Rename file, move to new nav file, minor copyedits

Signed-off-by: Diana <75819066+cloudjumpercat@users.noreply.github.com>

* Move location in nav

Signed-off-by: Diana <75819066+cloudjumpercat@users.noreply.github.com>

* Fix broken link

Signed-off-by: Diana <75819066+cloudjumpercat@users.noreply.github.com>

* Make link to doc version specific

Signed-off-by: Diana <75819066+cloudjumpercat@users.noreply.github.com>

* Apply feedback, fix blank lines in nav file

Signed-off-by: Diana <75819066+cloudjumpercat@users.noreply.github.com>

* Backport doc to prior releases

Signed-off-by: Diana <75819066+cloudjumpercat@users.noreply.github.com>

* Remove from pre-1.7 nav

Co-authored-by: lena-larionova <54370747+lena-larionova@users.noreply.github.com>

Signed-off-by: Diana <75819066+cloudjumpercat@users.noreply.github.com>
Co-authored-by: Angel <Guaris@users.noreply.github.com>
Co-authored-by: lena-larionova <54370747+lena-larionova@users.noreply.github.com>
* add sample versions file and update plugin template [skip ci]

* uncomment version to prevent build from failing

* Apply suggestions from code review

Co-authored-by: Diana <75819066+cloudjumpercat@users.noreply.github.com>

Co-authored-by: Diana <75819066+cloudjumpercat@users.noreply.github.com>
* changelog

* feat(dcr): how to request with DCR [tdx-2587] (#4716)

* feat(dcr): how to request with DCR [tdx-2587]

Signed-off-by: Tomasz Wylężek <tomwylezek@gmail.com>

* feat(dcr): change wording [tdx-2587]

Signed-off-by: Tomasz Wylężek <tomwylezek@gmail.com>

* feat(dcr): change wording [tdx-2587]

Signed-off-by: Tomasz Wylężek <tomwylezek@gmail.com>

* feat(dcr): change wording [tdx-2587]

Signed-off-by: Tomasz Wylężek <tomwylezek@gmail.com>

Signed-off-by: Tomasz Wylężek <tomwylezek@gmail.com>

* [TDX-2195] Dev portal app reg with multi-runtime group support (#4473)

* feat(runtime-groups): remove section in runtime-groups about dev portal app reg

This information is no longer necessary with the availablity of app registration in any runtime group.

* feat(enable-app-reg): update bullet about runtime group compatibility

* feat(enable-app-reg): add sub-bullets about Gateway versions

* feat(app-reg): add runtime group compatibility info

* refactor(app-reg): remove redundant info

* fix(app-reg): replace Kong Gateway with variable

* feat(app-reg): add clarification about default runtime group

* feat(app-reg): link back to default runtime group info

* feat(app-reg): add section about runtime group differences

* refactor(app-reg): update info about OIDC credential claims

* chore(app-reg): adjust indentation of Note to ensure it renders properly

* fix(app-reg): add article and fix spacing

* feat(app-reg): add alpha badges

* Revert "feat(app-reg): add alpha badges"

This reverts commit 43b0711.

* feat(app-reg): add section with badge about alpha stage

* fix(app-reg): move badge out of heading

* refactor(app-reg): update intro to account for multi-runtime groups

* fix(app-reg): move badge below heading

* fix(app-reg): remove unnecessary link and overused word

* refactor(app-reg): make mode names consistent with other usages

* Update app/konnect/dev-portal/applications/enable-app-reg.md

Co-authored-by: Andrew Wylde <drewkakes@gmail.com>

Co-authored-by: Andrew Wylde <drewkakes@gmail.com>

* Apply suggestions from code review

Co-authored-by: Diana <75819066+cloudjumpercat@users.noreply.github.com>

* Update app/konnect/updates.md

Signed-off-by: Tomasz Wylężek <tomwylezek@gmail.com>
Co-authored-by: Tomasz Wylężek <tomwylezek@gmail.com>
Co-authored-by: Mike Swierenga <mike.swierenga@gmail.com>
Co-authored-by: Andrew Wylde <drewkakes@gmail.com>
Co-authored-by: Diana <75819066+cloudjumpercat@users.noreply.github.com>
@Guaris Guaris added the review:general Review for general accuracy and presentation. Does the doc work? Does it output correctly? label Nov 17, 2022
@Guaris Guaris requested a review from a team as a code owner November 17, 2022 18:41
@Guaris Guaris self-assigned this Nov 17, 2022
@netlify
Copy link

netlify bot commented Nov 17, 2022

Deploy Preview for kongdocs ready!

Name Link
🔨 Latest commit b1be9fe
🔍 Latest deploy log https://app.netlify.com/sites/kongdocs/deploys/63768078c790050009a2350b
😎 Deploy Preview https://deploy-preview-4792--kongdocs.netlify.app
📱 Preview on mobile
Toggle QR Code...

QR Code

Use your smartphone camera to open QR code link.

To edit notification comments on pull requests, go to your Netlify site settings.

Copy link
Contributor

@lena-larionova lena-larionova left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, not seeing any issues with the merge.

@Guaris Guaris merged commit 53ca272 into konnect Nov 17, 2022
@Guaris Guaris deleted the konnect-merge branch November 17, 2022 18:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
review:general Review for general accuracy and presentation. Does the doc work? Does it output correctly?
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants