From 75a1dd6331796bc557c9a701779092f81e037057 Mon Sep 17 00:00:00 2001
From: Diana <75819066+cloudjumpercat@users.noreply.github.com>
Date: Fri, 12 May 2023 15:53:53 -0500
Subject: [PATCH] [DOCU-3167] Add Amazon Linux 2023 to support page (#5536)
* Add Amazon Linux 2023 to support page
Signed-off-by: Diana <75819066+cloudjumpercat@users.noreply.github.com>
* Add Amazon Linux 2023 tab to install instructions
Signed-off-by: Diana <75819066+cloudjumpercat@users.noreply.github.com>
* Apply suggestions from code review
Co-authored-by: lena-larionova <54370747+lena-larionova@users.noreply.github.com>
* Add 3.3 to browser and third-party support, add AL2023 Yum repo tab
Signed-off-by: Diana <75819066+cloudjumpercat@users.noreply.github.com>
* Update app/_data/tables/support/gateway/versions/33.yml
Co-authored-by: lena-larionova <54370747+lena-larionova@users.noreply.github.com>
* Add Amazon Graviton note to install pages
Signed-off-by: Diana <75819066+cloudjumpercat@users.noreply.github.com>
* Remove mentions of Graviton
Signed-off-by: Diana <75819066+cloudjumpercat@users.noreply.github.com>
* Fix EOL date for 3.3
Signed-off-by: Diana <75819066+cloudjumpercat@users.noreply.github.com>
---------
Signed-off-by: Diana <75819066+cloudjumpercat@users.noreply.github.com>
Co-authored-by: lena-larionova <54370747+lena-larionova@users.noreply.github.com>
---
app/_data/tables/support/gateway/packages.yml | 6 +
.../tables/support/gateway/versions/33.yml | 103 ++++++++++++++++++
.../gateway/install/linux/amazon-linux.md | 77 ++++++++++++-
app/_src/gateway/install/linux/ubuntu.md | 5 +-
app/_src/gateway/support/browser.md | 3 +
app/_src/gateway/support/index.md | 3 +
app/_src/gateway/support/third-party.md | 3 +
7 files changed, 193 insertions(+), 7 deletions(-)
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..fa4904136cc7
--- /dev/null
+++ b/app/_data/tables/support/gateway/versions/33.yml
@@ -0,0 +1,103 @@
+{% 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
+ versions:
+ - 15
+ - 14
+ - 13
+ - 12
+ - 11
+ - 10
+ - 9
+ - Amazon RDS
+ - Amazon Aurora
+ - *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/install/linux/amazon-linux.md b/app/_src/gateway/install/linux/amazon-linux.md
index 9a3967deb02f..c31d2cd3d683 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:
@@ -60,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/install/linux/ubuntu.md b/app/_src/gateway/install/linux/ubuntu.md
index 3d9f092b5588..0ba035486cbd 100644
--- a/app/_src/gateway/install/linux/ubuntu.md
+++ b/app/_src/gateway/install/linux/ubuntu.md
@@ -67,10 +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`.
+> 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 %}
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/index.md b/app/_src/gateway/support/index.md
index 699ea36bba0b..6bd0417d2aba 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="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" %}
{% 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 %}