From 3a116f13ebf22e058aa1ccb6b1168403bda1ffdf Mon Sep 17 00:00:00 2001 From: Diana <75819066+cloudjumpercat@users.noreply.github.com> Date: Fri, 5 May 2023 11:44:12 -0500 Subject: [PATCH 1/8] Add Amazon Linux 2023 to support page Signed-off-by: Diana <75819066+cloudjumpercat@users.noreply.github.com> --- app/_data/tables/support/gateway/packages.yml | 6 ++ .../tables/support/gateway/versions/33.yml | 93 +++++++++++++++++++ app/_src/gateway/support/index.md | 3 + 3 files changed, 102 insertions(+) create mode 100644 app/_data/tables/support/gateway/versions/33.yml diff --git a/app/_data/tables/support/gateway/packages.yml b/app/_data/tables/support/gateway/packages.yml index b5a63415f76e..97c2bf7ec345 100644 --- a/app/_data/tables/support/gateway/packages.yml +++ b/app/_data/tables/support/gateway/packages.yml @@ -23,6 +23,12 @@ _packages: package: true arm: false fips: false + amazonlinux2023: &amazonlinux2023 + os: Amazon Linux + version: 2023 + package: true + arm: false + fips: false centos7: ¢os7 os: CentOS version: 7 diff --git a/app/_data/tables/support/gateway/versions/33.yml b/app/_data/tables/support/gateway/versions/33.yml new file mode 100644 index 000000000000..6cc6a6f69c33 --- /dev/null +++ b/app/_data/tables/support/gateway/versions/33.yml @@ -0,0 +1,93 @@ +{% include_relative_once _data/tables/support/gateway/packages.yml %} +{% include_relative_once _data/tables/support/gateway/third-party.yml %} +{% include_relative_once _data/tables/support/gateway/browsers.yml %} + +lts: false +distributions: + - <<: *alpine + docker: true + - <<: *amazonlinux2 + docker: true + arm: true + - <<: *amazonlinux2023 + docker: true + arm: true + - *centos7 + - *debian10 + - <<: *debian11 + docker: true + - *rhel7 + - <<: *rhel8 + docker: true + fips: true + - <<: *ubuntu1804 + arm: false + docker: false + - <<: *ubuntu2004 + arm: false + docker: false + fips: true + - <<: *ubuntu2204 + arm: true + docker: true + fips: true + +third-party: + datastore: + - *postgres + - *cassandra + - *redis + - *influxdb + - *kafka + + metrics: + - *prometheus + - *statsd + - *opentelemetry + - *zipkin + + vault: + - *vaultproject + - *aws-sm + - *gcp-sm + + identity_provider: + - *auth0 + - *cognito + - *connect2id + - *curity + - *dex + - *gluu + - *google + - *identityserver + - *keycloak + - *azure-ad + - *microsoft-adfs + - *microsoft-live-connect + - *okta + - *onelogin + - *openam + - *paypal + - *pingfederate + - *salesforce + - *wso2 + - *yahoo + + service_mesh: + - *kongmesh + - *istio + + log_provider: + - *splunk + - *datadog + - *loggly + + s3_api: + - *s3 + - *minio + +browsers: + - *edge + - *chrome + - *firefox + - *safari diff --git a/app/_src/gateway/support/index.md b/app/_src/gateway/support/index.md index 699ea36bba0b..a164d747a0d1 100644 --- a/app/_src/gateway/support/index.md +++ b/app/_src/gateway/support/index.md @@ -45,6 +45,9 @@ Customers with platinum or higher subscriptions may request fixes outside of the Kong supports the following versions of {{site.ee_product_name}}: {% navtabs %} + {% navtab 3.3 %} + {% include_cached gateway-support.html version="3.3" data=site.data.tables.support.gateway.versions.33 eol="February 2024" %} + {% endnavtab %} {% navtab 3.2 %} {% include_cached gateway-support.html version="3.2" data=site.data.tables.support.gateway.versions.32 eol="February 2024" %} {% endnavtab %} From 80e5b8c69e87739ab69fb5458262e812572c7dcd Mon Sep 17 00:00:00 2001 From: Diana <75819066+cloudjumpercat@users.noreply.github.com> Date: Fri, 5 May 2023 13:52:11 -0500 Subject: [PATCH 2/8] Add Amazon Linux 2023 tab to install instructions Signed-off-by: Diana <75819066+cloudjumpercat@users.noreply.github.com> --- .../gateway/install/linux/amazon-linux.md | 46 ++++++++++++++++++- 1 file changed, 44 insertions(+), 2 deletions(-) diff --git a/app/_src/gateway/install/linux/amazon-linux.md b/app/_src/gateway/install/linux/amazon-linux.md index 9a3967deb02f..6751e4784e4f 100644 --- a/app/_src/gateway/install/linux/amazon-linux.md +++ b/app/_src/gateway/install/linux/amazon-linux.md @@ -17,9 +17,51 @@ Kong is licensed under an You can install {{site.base_gateway}} by downloading an installation package or using our yum repository. {% navtabs %} -{% navtab Package %} +{% navtab Package (AL2023) %} +Install {{site.base_gateway}} on Amazon Linux 2023 from the command line. -Install {{site.base_gateway}} on Amazon Linux from the command line. +1. Download the Kong package: + +{% capture download_package %} +{% navtabs_ee codeblock %} +{% navtab Kong Gateway %} +```bash +curl -Lo kong-enterprise-edition-{{page.versions.ee}}.aws.amd64.rpm "{{ site.links.download }}/gateway-3.x-amazonlinux-2023/Packages/k/kong-enterprise-edition-{{page.versions.ee}}.aws.amd64.rpm" +``` +{% endnavtab %} +{% navtab Kong Gateway (OSS) %} +```bash +curl -Lo kong-{{page.versions.ce}}.aws.amd64.rpm "{{ site.links.download }}/gateway-3.x-amazonlinux-2023/Packages/k/kong-{{page.versions.ce}}.aws.amd64.rpm" +``` +{% endnavtab %} +{% endnavtabs_ee %} +{% endcapture %} + +{{ download_package | indent | replace: " ", "" }} + +2. Install the package: + +{% capture install_package %} +{% navtabs_ee codeblock %} +{% navtab Kong Gateway %} +```bash +sudo yum install kong-enterprise-edition-{{page.versions.ee}}.aws.amd64.rpm +``` +{% endnavtab %} +{% navtab Kong Gateway (OSS) %} +```bash +sudo yum install kong-{{page.versions.ce}}.aws.amd64.rpm +``` +{% endnavtab %} +{% endnavtabs_ee %} +{% endcapture %} + +{{ install_package | indent | replace: " ", "" }} + +{% endnavtab %} +{% navtab Package (Amazon Linux 2) %} + +Install {{site.base_gateway}} on Amazon Linux 2 from the command line. 1. Download the Kong package: From d0dbeacee0c5fcb7dec12a9daaef1936c4702c6f Mon Sep 17 00:00:00 2001 From: Diana <75819066+cloudjumpercat@users.noreply.github.com> Date: Wed, 10 May 2023 09:24:13 -0500 Subject: [PATCH 3/8] Apply suggestions from code review Co-authored-by: lena-larionova <54370747+lena-larionova@users.noreply.github.com> --- app/_data/tables/support/gateway/versions/33.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/_data/tables/support/gateway/versions/33.yml b/app/_data/tables/support/gateway/versions/33.yml index 6cc6a6f69c33..66a0922fe3f4 100644 --- a/app/_data/tables/support/gateway/versions/33.yml +++ b/app/_data/tables/support/gateway/versions/33.yml @@ -34,7 +34,9 @@ distributions: third-party: datastore: - - *postgres + - <<: *postgres + versions: + - Amazon Aurora - *cassandra - *redis - *influxdb From 4e3ead86dfbf0527539d3b9926c67a5a2b680b77 Mon Sep 17 00:00:00 2001 From: Diana <75819066+cloudjumpercat@users.noreply.github.com> Date: Wed, 10 May 2023 12:03:07 -0500 Subject: [PATCH 4/8] Add 3.3 to browser and third-party support, add AL2023 Yum repo tab Signed-off-by: Diana <75819066+cloudjumpercat@users.noreply.github.com> --- .../gateway/install/linux/amazon-linux.md | 31 ++++++++++++++++++- app/_src/gateway/support/browser.md | 3 ++ app/_src/gateway/support/third-party.md | 3 ++ 3 files changed, 36 insertions(+), 1 deletion(-) diff --git a/app/_src/gateway/install/linux/amazon-linux.md b/app/_src/gateway/install/linux/amazon-linux.md index 6751e4784e4f..c31d2cd3d683 100644 --- a/app/_src/gateway/install/linux/amazon-linux.md +++ b/app/_src/gateway/install/linux/amazon-linux.md @@ -102,7 +102,36 @@ sudo yum install kong-{{page.versions.ce}}.aws.amd64.rpm {{ install_package | indent | replace: " ", "" }} {% endnavtab %} -{% navtab YUM repository %} +{% navtab YUM repository (AL2023) %} + +Install the YUM repository from the command line. + +1. Download the Kong APT repository: + ```bash + curl https://download.konghq.com/gateway-3.x-amazonlinux-2023/config.repo | sudo tee /etc/yum.repos.d/kong.repo + ``` + +2. Install Kong: + +{% capture install_from_repo %} +{% navtabs_ee codeblock %} +{% navtab Kong Gateway %} +```bash +sudo yum install kong-enterprise-edition-{{page.versions.ee}} +``` +{% endnavtab %} +{% navtab Kong Gateway (OSS) %} +```bash +sudo yum install kong-{{page.versions.ce}} +``` +{% endnavtab %} +{% endnavtabs_ee %} +{% endcapture %} + +{{ install_from_repo | indent | replace: " ", "" }} + +{% endnavtab %} +{% navtab YUM repository (Amazon Linux 2) %} Install the YUM repository from the command line. diff --git a/app/_src/gateway/support/browser.md b/app/_src/gateway/support/browser.md index 92088099052a..a663e5b1f3d5 100644 --- a/app/_src/gateway/support/browser.md +++ b/app/_src/gateway/support/browser.md @@ -8,6 +8,9 @@ breadcrumb: Browser Kong supports N-1 versions of Edge, Chrome, Firefox and Safari on desktop plus any extended support versions. {% navtabs %} + {% navtab 3.3 %} + {% include_cached gateway-support-browsers.html data=site.data.tables.support.gateway.versions.33 %} + {% endnavtab %} {% navtab 3.2 %} {% include_cached gateway-support-browsers.html data=site.data.tables.support.gateway.versions.32 %} {% endnavtab %} diff --git a/app/_src/gateway/support/third-party.md b/app/_src/gateway/support/third-party.md index f466dde73e5a..00e210ae233d 100644 --- a/app/_src/gateway/support/third-party.md +++ b/app/_src/gateway/support/third-party.md @@ -11,6 +11,9 @@ Kong aims to support the last 2 versions of any third party tool, plus the curre > Some third party tools below do not have a version number. These tools are managed services and Kong provides compatibility with the currently released version {% navtabs %} + {% navtab 3.3 %} + {% include_cached gateway-support-third-party.html data=site.data.tables.support.gateway.versions.33 %} + {% endnavtab %} {% navtab 3.2 %} {% include_cached gateway-support-third-party.html data=site.data.tables.support.gateway.versions.32 %} {% endnavtab %} From e10ab00deb9e5b1673d95b7910dbd19ce69bf1c7 Mon Sep 17 00:00:00 2001 From: Diana <75819066+cloudjumpercat@users.noreply.github.com> Date: Wed, 10 May 2023 13:25:07 -0500 Subject: [PATCH 5/8] Update app/_data/tables/support/gateway/versions/33.yml Co-authored-by: lena-larionova <54370747+lena-larionova@users.noreply.github.com> --- app/_data/tables/support/gateway/versions/33.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/app/_data/tables/support/gateway/versions/33.yml b/app/_data/tables/support/gateway/versions/33.yml index 66a0922fe3f4..fa4904136cc7 100644 --- a/app/_data/tables/support/gateway/versions/33.yml +++ b/app/_data/tables/support/gateway/versions/33.yml @@ -36,6 +36,14 @@ third-party: datastore: - <<: *postgres versions: + - 15 + - 14 + - 13 + - 12 + - 11 + - 10 + - 9 + - Amazon RDS - Amazon Aurora - *cassandra - *redis From 75d842691312ea1f75c643562c02234971630fa2 Mon Sep 17 00:00:00 2001 From: Diana <75819066+cloudjumpercat@users.noreply.github.com> Date: Thu, 11 May 2023 11:37:41 -0500 Subject: [PATCH 6/8] Add Amazon Graviton note to install pages Signed-off-by: Diana <75819066+cloudjumpercat@users.noreply.github.com> --- app/_src/gateway/install/linux/amazon-linux.md | 3 +++ app/_src/gateway/install/linux/rhel.md | 3 +++ app/_src/gateway/install/linux/ubuntu.md | 6 ++---- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/app/_src/gateway/install/linux/amazon-linux.md b/app/_src/gateway/install/linux/amazon-linux.md index c31d2cd3d683..b81d6a83004a 100644 --- a/app/_src/gateway/install/linux/amazon-linux.md +++ b/app/_src/gateway/install/linux/amazon-linux.md @@ -16,6 +16,9 @@ Kong is licensed under an You can install {{site.base_gateway}} by downloading an installation package or using our yum repository. +{:.note} +> **Note:** {{site.base_gateway}} supports running on [AWS Graviton processors](https://aws.amazon.com/ec2/graviton/). It can run in all AWS Regions where AWS Graviton is supported. + {% navtabs %} {% navtab Package (AL2023) %} Install {{site.base_gateway}} on Amazon Linux 2023 from the command line. diff --git a/app/_src/gateway/install/linux/rhel.md b/app/_src/gateway/install/linux/rhel.md index 65a98c591188..b04579afbda8 100644 --- a/app/_src/gateway/install/linux/rhel.md +++ b/app/_src/gateway/install/linux/rhel.md @@ -16,6 +16,9 @@ Kong is licensed under an You can install {{site.base_gateway}} by downloading an installation package or using our yum repository. +{:.note} +> **Note:** {{site.base_gateway}} supports running on [AWS Graviton processors](https://aws.amazon.com/ec2/graviton/). It can run in all AWS Regions where AWS Graviton is supported. + {% navtabs %} {% navtab Package %} diff --git a/app/_src/gateway/install/linux/ubuntu.md b/app/_src/gateway/install/linux/ubuntu.md index 3d9f092b5588..ad285de62cc6 100644 --- a/app/_src/gateway/install/linux/ubuntu.md +++ b/app/_src/gateway/install/linux/ubuntu.md @@ -67,10 +67,8 @@ Once {{ site.base_gateway }} is running, you may want to do the following: You can install {{site.base_gateway}} by downloading an installation package or using our APT repository. {:.note .no-icon} -> We currently package {{ site.base_gateway }} for Ubuntu Bionic and Focal. -> If you are using a different release, replace `$(lsb_release -sc)` with `focal` in the commands below. ->

-> To check your release name run `lsb_release -sc`. +> * We currently package {{ site.base_gateway }} for Ubuntu Bionic and Focal. If you are using a different release, replace `$(lsb_release -sc)` with `focal` in the commands below. To check your release name run `lsb_release -sc`. +> * {{site.base_gateway}} supports running on [AWS Graviton processors](https://aws.amazon.com/ec2/graviton/). It can run in all AWS Regions where AWS Graviton is supported. {% navtabs %} {% navtab Package %} From 41eb8aa5f6d5593ef9918af3aa5959663c7e0434 Mon Sep 17 00:00:00 2001 From: Diana <75819066+cloudjumpercat@users.noreply.github.com> Date: Fri, 12 May 2023 14:35:41 -0500 Subject: [PATCH 7/8] Remove mentions of Graviton Signed-off-by: Diana <75819066+cloudjumpercat@users.noreply.github.com> --- app/_src/gateway/install/linux/amazon-linux.md | 3 --- app/_src/gateway/install/linux/rhel.md | 3 --- app/_src/gateway/install/linux/ubuntu.md | 3 +-- 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/app/_src/gateway/install/linux/amazon-linux.md b/app/_src/gateway/install/linux/amazon-linux.md index b81d6a83004a..c31d2cd3d683 100644 --- a/app/_src/gateway/install/linux/amazon-linux.md +++ b/app/_src/gateway/install/linux/amazon-linux.md @@ -16,9 +16,6 @@ Kong is licensed under an You can install {{site.base_gateway}} by downloading an installation package or using our yum repository. -{:.note} -> **Note:** {{site.base_gateway}} supports running on [AWS Graviton processors](https://aws.amazon.com/ec2/graviton/). It can run in all AWS Regions where AWS Graviton is supported. - {% navtabs %} {% navtab Package (AL2023) %} Install {{site.base_gateway}} on Amazon Linux 2023 from the command line. diff --git a/app/_src/gateway/install/linux/rhel.md b/app/_src/gateway/install/linux/rhel.md index b04579afbda8..65a98c591188 100644 --- a/app/_src/gateway/install/linux/rhel.md +++ b/app/_src/gateway/install/linux/rhel.md @@ -16,9 +16,6 @@ Kong is licensed under an You can install {{site.base_gateway}} by downloading an installation package or using our yum repository. -{:.note} -> **Note:** {{site.base_gateway}} supports running on [AWS Graviton processors](https://aws.amazon.com/ec2/graviton/). It can run in all AWS Regions where AWS Graviton is supported. - {% navtabs %} {% navtab Package %} diff --git a/app/_src/gateway/install/linux/ubuntu.md b/app/_src/gateway/install/linux/ubuntu.md index ad285de62cc6..0ba035486cbd 100644 --- a/app/_src/gateway/install/linux/ubuntu.md +++ b/app/_src/gateway/install/linux/ubuntu.md @@ -67,8 +67,7 @@ Once {{ site.base_gateway }} is running, you may want to do the following: You can install {{site.base_gateway}} by downloading an installation package or using our APT repository. {:.note .no-icon} -> * We currently package {{ site.base_gateway }} for Ubuntu Bionic and Focal. If you are using a different release, replace `$(lsb_release -sc)` with `focal` in the commands below. To check your release name run `lsb_release -sc`. -> * {{site.base_gateway}} supports running on [AWS Graviton processors](https://aws.amazon.com/ec2/graviton/). It can run in all AWS Regions where AWS Graviton is supported. +> We currently package {{ site.base_gateway }} for Ubuntu Bionic and Focal. If you are using a different release, replace `$(lsb_release -sc)` with `focal` in the commands below. To check your release name run `lsb_release -sc`. {% navtabs %} {% navtab Package %} From 797294fbe13b190537885040b4d7bfadb133f867 Mon Sep 17 00:00:00 2001 From: Diana <75819066+cloudjumpercat@users.noreply.github.com> Date: Fri, 12 May 2023 15:47:09 -0500 Subject: [PATCH 8/8] Fix EOL date for 3.3 Signed-off-by: Diana <75819066+cloudjumpercat@users.noreply.github.com> --- app/_src/gateway/support/index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/_src/gateway/support/index.md b/app/_src/gateway/support/index.md index a164d747a0d1..6bd0417d2aba 100644 --- a/app/_src/gateway/support/index.md +++ b/app/_src/gateway/support/index.md @@ -46,7 +46,7 @@ Kong supports the following versions of {{site.ee_product_name}}: {% navtabs %} {% navtab 3.3 %} - {% include_cached gateway-support.html version="3.3" data=site.data.tables.support.gateway.versions.33 eol="February 2024" %} + {% include_cached gateway-support.html version="3.3" data=site.data.tables.support.gateway.versions.33 eol="May 2024" %} {% endnavtab %} {% navtab 3.2 %} {% include_cached gateway-support.html version="3.2" data=site.data.tables.support.gateway.versions.32 eol="February 2024" %}