Skip to content

Commit

Permalink
Merge pull request #2900 from EnterpriseDB/release/2022-07-06
Browse files Browse the repository at this point in the history
Release: 2022-07-06
  • Loading branch information
drothery-edb authored Jul 6, 2022
2 parents 6a89e47 + 4bfe19f commit b019a3b
Show file tree
Hide file tree
Showing 53 changed files with 1,020 additions and 698 deletions.
58 changes: 38 additions & 20 deletions install_template/config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,33 @@ products:
- name: CentOS 7
arch: x86_64
supported versions: [42.x.x]
- name: CentOS 7
- name: RHEL 8
arch: ppc64le
supported versions: [42.x.x]
- name: AlmaLinux 8 or Rocky Linux 8
arch: x86_64
supported versions: [42.x.x]
- name: RHEL 7 or OL 7
- name: RHEL 7
arch: x86_64
supported versions: [42.x.x]
- name: RHEL 7 or OL 7
- name: RHEL 7
arch: ppc64le
supported versions: [42.x.x]
- name: RHEL 8 or OL 8
- name: RHEL 8
arch: x86_64
supported versions: [42.x.x]
- name: Ubuntu 18.04 or Debian 9
- name: Debian 9
arch: x86_64
supported versions: [42.x.x]
- name: Ubuntu 20.04 or Debian 10
supported versions: [42.3.3.1]
- name: Debian 10
arch: x86_64
supported versions: [42.x.x]
supported versions: [42.3.3.1]
- name: Ubuntu 18.04
arch: x86_64
supported versions: [42.3.3.1]
- name: Ubuntu 20.04
arch: x86_64
supported versions: [42.3.3.1]
- name: SLES 12
arch: x86_64
supported versions: [42.3.3.1]
Expand Down Expand Up @@ -80,25 +86,31 @@ products:
- name: CentOS 7
arch: x86_64
supported versions: [14.1.0.1]
- name: CentOS 7
- name: RHEL 8
arch: ppc64le
supported versions: [14.1.0.1]
- name: AlmaLinux 8 or Rocky Linux 8
arch: x86_64
supported versions: [14.1.0.1]
- name: RHEL 7 or OL 7
- name: RHEL 7
arch: x86_64
supported versions: [14.1.0.1]
- name: RHEL 7 or OL 7
- name: RHEL 7
arch: ppc64le
supported versions: [14.1.0.1]
- name: RHEL 8 or OL 8
- name: RHEL 8
arch: x86_64
supported versions: [14.1.0.1]
- name: Ubuntu 18.04 or Debian 9
- name: Debian 9
arch: x86_64
supported versions: [14.1.0.1]
- name: Ubuntu 20.04 or Debian 10
- name: Debian 10
arch: x86_64
supported versions: [14.1.0.1]
- name: Ubuntu 18.04
arch: x86_64
supported versions: [14.1.0.1]
- name: Ubuntu 20.04
arch: x86_64
supported versions: [14.1.0.1]
- name: SLES 12
Expand All @@ -118,25 +130,31 @@ products:
- name: CentOS 7
arch: x86_64
supported versions: [13.1.0.2]
- name: CentOS 7
- name: RHEL 8
arch: ppc64le
supported versions: [13.1.0.2]
- name: AlmaLinux 8 or Rocky Linux 8
arch: x86_64
supported versions: [13.1.0.2]
- name: RHEL 7 or OL 7
- name: RHEL 7
arch: x86_64
supported versions: [13.1.0.2]
- name: RHEL 7 or OL 7
- name: RHEL 7
arch: ppc64le
supported versions: [13.1.0.2]
- name: RHEL 8 or OL 8
- name: RHEL 8
arch: x86_64
supported versions: [13.1.0.2]
- name: Ubuntu 18.04 or Debian 9
- name: Debian 9
arch: x86_64
supported versions: [13.1.0.2]
- name: Ubuntu 20.04 or Debian 10
- name: Debian 10
arch: x86_64
supported versions: [13.1.0.2]
- name: Ubuntu 18.04
arch: x86_64
supported versions: [13.1.0.2]
- name: Ubuntu 20.04
arch: x86_64
supported versions: [13.1.0.2]
- name: SLES 12
Expand Down
32 changes: 30 additions & 2 deletions install_template/deploy.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,8 @@ const moveDoc = async (product, platform, version) => {
sles_12_x86_64: "06",
"ubuntu_20.04_x86_64": "07",
"ubuntu_18.04_x86_64": "07a",
debian_10_x86_64: "07b",
debian_9_x86_64: "08",
debian_10_x86_64: "08",
debian_9_x86_64: "08a",
rhel_8_ppc64le: "09",
rhel_7_ppc64le: "10",
sles_15_ppc64le: "11",
Expand All @@ -105,6 +105,10 @@ const moveDoc = async (product, platform, version) => {
prefix["sles_12_x86_64"] = "04";
prefix["sles_15_ppc64le"] = "09";
prefix["sles_12_ppc64le"] = "10";
prefix["ubuntu_20.04_x86_64"] = "05";
prefix["ubuntu_18.04_x86_64"] = "05a";
prefix["debian_10_x86_64"] = "05b";
prefix["debian_9_x86_64"] = "06";
break;
}

Expand Down Expand Up @@ -184,6 +188,14 @@ const moveDoc = async (product, platform, version) => {
(ctx) => `jdbc_connector/42.3.3.1/04_installing_and_configuring_the_jdbc_connector/01_installing_the_connector_with_an_rpm_package/${fmtArchPath(ctx)}/${prefix[plat]}_jdbc42_sles12_${fmtArchFilename(ctx)}.mdx`),
when({product: {name: "EDB JDBC Connector"}, platform: {name: "SLES 15"}},
(ctx) => `jdbc_connector/42.3.3.1/04_installing_and_configuring_the_jdbc_connector/01_installing_the_connector_with_an_rpm_package/${fmtArchPath(ctx)}/${prefix[plat]}_jdbc42_sles15_${fmtArchFilename(ctx)}.mdx`),
when({product: {name: "EDB JDBC Connector"}, platform: {name: "Debian 9"}},
(ctx) => `jdbc_connector/42.3.3.1/04_installing_and_configuring_the_jdbc_connector/01_installing_the_connector_with_an_rpm_package/${fmtArchPath(ctx)}/${prefix[plat]}_jdbc42_deb9_${fmtArchFilename(ctx)}.mdx`),
when({product: {name: "EDB JDBC Connector"}, platform: {name: "Debian 10"}},
(ctx) => `jdbc_connector/42.3.3.1/04_installing_and_configuring_the_jdbc_connector/01_installing_the_connector_with_an_rpm_package/${fmtArchPath(ctx)}/${prefix[plat]}_jdbc42_deb10_${fmtArchFilename(ctx)}.mdx`),
when({product: {name: "EDB JDBC Connector"}, platform: {name: "Ubuntu 18.04"}},
(ctx) => `jdbc_connector/42.3.3.1/04_installing_and_configuring_the_jdbc_connector/01_installing_the_connector_with_an_rpm_package/${fmtArchPath(ctx)}/${prefix[plat]}_jdbc42_ubuntu18_${fmtArchFilename(ctx)}.mdx`),
when({product: {name: "EDB JDBC Connector"}, platform: {name: "Ubuntu 20.04"}},
(ctx) => `jdbc_connector/42.3.3.1/04_installing_and_configuring_the_jdbc_connector/01_installing_the_connector_with_an_rpm_package/${fmtArchPath(ctx)}/${prefix[plat]}_jdbc42_ubuntu20_${fmtArchFilename(ctx)}.mdx`),
when({product: {name: "Migration Toolkit"}, platform: {name: "SLES 12"}},
(ctx) => `migration_toolkit/55/05_installing_mtk/install_on_linux/${fmtArchPath(ctx)}/${prefix[plat]}_mtk55_sles12_${fmtArchFilename(ctx)}.mdx`),
when({product: {name: "Migration Toolkit"}, platform: {name: "SLES 15"}},
Expand All @@ -208,10 +220,26 @@ const moveDoc = async (product, platform, version) => {
(ctx) => `ocl_connector/${ctx.product.version}/04_open_client_library/01_installing_and_configuring_the_ocl_connector/install_on_linux_using_edb_repo/${fmtArchPath(ctx)}/${prefix[plat]}_ocl_connector14_sles12_${fmtArchFilename(ctx)}.mdx`),
when({product: {name: "EDB OCL Connector"}, platform: {name: "SLES 15"}},
(ctx) => `ocl_connector/${ctx.product.version}/04_open_client_library/01_installing_and_configuring_the_ocl_connector/install_on_linux_using_edb_repo/${fmtArchPath(ctx)}/${prefix[plat]}_ocl_connector14_sles15_${fmtArchFilename(ctx)}.mdx`),
when({product: {name: "EDB OCL Connector"}, platform: {name: "Debian 9"}},
(ctx) => `ocl_connector/${ctx.product.version}/04_open_client_library/01_installing_and_configuring_the_ocl_connector/install_on_linux_using_edb_repo/${fmtArchPath(ctx)}/${prefix[plat]}_ocl_connector14_deb9_${fmtArchFilename(ctx)}.mdx`),
when({product: {name: "EDB OCL Connector"}, platform: {name: "Debian 10"}},
(ctx) => `ocl_connector/${ctx.product.version}/04_open_client_library/01_installing_and_configuring_the_ocl_connector/install_on_linux_using_edb_repo/${fmtArchPath(ctx)}/${prefix[plat]}_ocl_connector14_deb10_${fmtArchFilename(ctx)}.mdx`),
when({product: {name: "EDB OCL Connector"}, platform: {name: "Ubuntu 18.04"}},
(ctx) => `ocl_connector/${ctx.product.version}/04_open_client_library/01_installing_and_configuring_the_ocl_connector/install_on_linux_using_edb_repo/${fmtArchPath(ctx)}/${prefix[plat]}_ocl_connector14_ubuntu18_${fmtArchFilename(ctx)}.mdx`),
when({product: {name: "EDB OCL Connector"}, platform: {name: "Ubuntu 20.04"}},
(ctx) => `ocl_connector/${ctx.product.version}/04_open_client_library/01_installing_and_configuring_the_ocl_connector/install_on_linux_using_edb_repo/${fmtArchPath(ctx)}/${prefix[plat]}_ocl_connector14_ubuntu20_${fmtArchFilename(ctx)}.mdx`),
when({product: {name: "EDB ODBC Connector"}, platform: {name: "SLES 12"}},
(ctx) => `odbc_connector/13/03_installing_edb_odbc/01_installing_linux/${fmtArchPath(ctx)}/${prefix[plat]}_odbc13_sles12_${fmtArchFilename(ctx)}.mdx`),
when({product: {name: "EDB ODBC Connector"}, platform: {name: "SLES 15"}},
(ctx) => `odbc_connector/13/03_installing_edb_odbc/01_installing_linux/${fmtArchPath(ctx)}/${prefix[plat]}_odbc13_sles15_${fmtArchFilename(ctx)}.mdx`),
when({product: {name: "EDB ODBC Connector"}, platform: {name: "Debian 9"}},
(ctx) => `odbc_connector/13/03_installing_edb_odbc/01_installing_linux/${fmtArchPath(ctx)}/${prefix[plat]}_odbc13_deb9_${fmtArchFilename(ctx)}.mdx`),
when({product: {name: "EDB ODBC Connector"}, platform: {name: "Debian 10"}},
(ctx) => `odbc_connector/13/03_installing_edb_odbc/01_installing_linux/${fmtArchPath(ctx)}/${prefix[plat]}_odbc13_deb10_${fmtArchFilename(ctx)}.mdx`),
when({product: {name: "EDB ODBC Connector"}, platform: {name: "Ubuntu 18.04"}},
(ctx) => `odbc_connector/13/03_installing_edb_odbc/01_installing_linux/${fmtArchPath(ctx)}/${prefix[plat]}_odbc13_ubuntu18_${fmtArchFilename(ctx)}.mdx`),
when({product: {name: "EDB ODBC Connector"}, platform: {name: "Ubuntu 20.04"}},
(ctx) => `odbc_connector/13/03_installing_edb_odbc/01_installing_linux/${fmtArchPath(ctx)}/${prefix[plat]}_odbc13_ubuntu20_${fmtArchFilename(ctx)}.mdx`),
when({product: {name: "EDB pgBouncer", version: 1.16}, platform: {name: "SLES 12"}},
(ctx) => `pgbouncer/1.16/01_installation/install_on_linux/${fmtArchPath(ctx)}/${prefix[plat]}_pgbouncer_sles12_${fmtArchFilename(ctx)}.mdx`),
when({product: {name: "EDB pgBouncer", version: 1.16}, platform: {name: "SLES 15"}},
Expand Down
4 changes: 2 additions & 2 deletions install_template/templates/platformBase/debian.njk
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ apt-get update
```
{% endblock prerequisites %}

{% block installCommand %}
{% block installCommand %}{% block odbcconnector %}
```shell
apt-get install {{ packageName }}
```
{% endblock installCommand %}
{% endblock odbcconnector %}{% endblock installCommand %}
4 changes: 2 additions & 2 deletions install_template/templates/platformBase/ubuntu.njk
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ apt-get update
```
{% endblock prerequisites %}

{% block installCommand %}
{% block installCommand %}{% block odbcconnector %}
```shell
apt-get install {{ packageName }}
```
{% endblock installCommand %}
{% endblock odbcconnector %}{% endblock installCommand %}
12 changes: 1 addition & 11 deletions install_template/templates/products/edb-jdbc-connector/base.njk
Original file line number Diff line number Diff line change
@@ -1,13 +1,3 @@
{% extends "platformBase/" + platformBaseTemplate + '.njk' %}
{% set packageName %}edb-jdbc{% endset %}
{% block postinstallMenu %}- [Initial configuration](#initial-configuration){% endblock postinstallMenu %}
{% block postinstall %}
## Initial configuration

To make the JDBC driver available to Java, you must either copy the appropriate java `.jar` file for the JDBC version that you are using to your `$java_home/jre/lib/ext` directory or append the location of the `.jar` file to the `CLASSPATH` environment variable.

Note that if you choose to append the location of the `jar` file to the `CLASSPATH` environment variable, you must include the complete pathname:

`/usr/edb/jdbc/edb-jdbc18.jar`

{% endblock postinstall %}
{% block postinstallMenu %}- [Initial configuration](#initial-configuration){% endblock postinstallMenu %}
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
{% extends "products/edb-jdbc-connector/base.njk" %}
{% extends "products/edb-jdbc-connector/sles.njk" %}
{% set platformBaseTemplate = "sles-12" %}
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
{% extends "products/edb-jdbc-connector/base.njk" %}
{% extends "products/edb-jdbc-connector/sles.njk" %}
{% set platformBaseTemplate = "sles-12" %}
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
{% extends "products/edb-jdbc-connector/base.njk" %}
{% extends "products/edb-jdbc-connector/sles.njk" %}
{% set platformBaseTemplate = "sles-15" %}
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{% extends "products/edb-jdbc-connector/base.njk" %}
{% extends "products/edb-jdbc-connector/sles.njk" %}
{% set platformBaseTemplate = "sles-15" %}
{% set includePPC = true %}
11 changes: 11 additions & 0 deletions install_template/templates/products/edb-jdbc-connector/sles.njk
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{% extends "products/edb-jdbc-connector/base.njk" %}
{% block postinstall %}
## Initial configuration

To make the JDBC driver available to Java, you must either copy the appropriate java `.jar` file for the JDBC version that you are using to your `$java_home/jre/lib/ext` directory or append the location of the `.jar` file to the `CLASSPATH` environment variable.

Note that if you choose to append the location of the `jar` file to the `CLASSPATH` environment variable, you must include the complete pathname:

`/usr/edb/jdbc/edb-jdbc18.jar`

{% endblock postinstall %}
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
{% extends "products/edb-jdbc-connector/debian-10.njk" %}
{% extends "products/edb-jdbc-connector/base.njk" %}
{% set platformBaseTemplate = "Ubuntu-18.04" %}
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
{% extends "products/edb-jdbc-connector/debian-10.njk" %}
{% extends "products/edb-jdbc-connector/base.njk" %}
{% set platformBaseTemplate = "Ubuntu-20.04" %}
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
{% extends "products/edb-ocl-connector/base.njk" %}
{% extends "products/edb-ocl-connector/debian.njk" %}
{% set platformBaseTemplate = "debian-10" %}
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
{% extends "products/edb-ocl-connector/base.njk" %}
{% extends "products/edb-ocl-connector/debian.njk" %}
{% set platformBaseTemplate = "debian-9" %}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{% extends "products/edb-ocl-connector/base.njk" %}
{% block odbcconnector %}
```shell
apt-get install {{ packageName }}
apt-get install {{ packageName }}-dev
```
{% endblock odbcconnector %}
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
{% extends "products/edb-ocl-connector/debian-10.njk" %}
{% extends "products/edb-ocl-connector/ubuntu.njk" %}
{% set platformBaseTemplate = "ubuntu-20.04" %}
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
{% extends "products/edb-ocl-connector/debian-10.njk" %}
{% extends "products/edb-ocl-connector/ubuntu.njk" %}
{% set platformBaseTemplate = "ubuntu-20.04" %}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{% extends "products/edb-ocl-connector/base.njk" %}
{% block odbcconnector %}
```shell
apt-get install {{ packageName }}
apt-get install {{ packageName }}-dev
```
{% endblock odbcconnector %}
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
{% extends "products/edb-odbc-connector/base.njk" %}
{% extends "products/edb-odbc-connector/debian.njk" %}
{% set platformBaseTemplate = "debian-10" %}
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
{% extends "products/edb-odbc-connector/base.njk" %}
{% extends "products/edb-odbc-connector/debian.njk" %}
{% set platformBaseTemplate = "debian-9" %}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{% extends "products/edb-odbc-connector/base.njk" %}
{% block odbcconnector %}
```shell
apt-get install {{ packageName }}
apt-get install {{ packageName }}-dev
```
{% endblock odbcconnector %}
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
{% extends "products/edb-odbc-connector/debian-10.njk" %}
{% extends "products/edb-odbc-connector/ubuntu.njk" %}
{% set platformBaseTemplate = "ubuntu-18.04" %}
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
{% extends "products/edb-odbc-connector/debian-10.njk" %}
{% extends "products/edb-odbc-connector/ubuntu.njk" %}
{% set platformBaseTemplate = "ubuntu-20.04" %}
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{% extends "products/edb-odbc-connector/base.njk" %}
{% block odbcconnector %}
```shell
apt-get install {{ packageName }}
apt-get install {{ packageName }}-dev
```
{% endblock odbcconnector %}
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ EDB provides a shell script, called [`biganimal-csp-preflight`](https://github.c
| `-h` or `--help`| Displays the command help. |
| `-i` or `--instance-type` | Azure VM instance type for the BigAnimal cluster. The `help` command provides a list of possible VM instance types. Choose the instance type that best suits your application and workload. Choose an instance type in the memory optimized ESv3 or ESv4 series for large data sets. Choose from the compute optimized FSv2 series for compute-bound applications. Choose from the general purpose DSv3 or DSv4 series if you don't require memory or compute optimization. See [Sizes for virtual machines in Azure](https://docs.microsoft.com/en-us/azure/virtual-machines/sizes) for information to help you choose the appropriate instance type. |
| `-a` or `--high-availability` | *DEPRECATED* - Enables high availability for the cluster. Replaced with `-x` or `--cluster-architecture` command.|
| `-x` or `--cluster-architecture` | Defines the cluster architecture and can be [ single | ha | eha ]. See [Supported cluster types](/biganimal/release/overview/02_high_availability) for more information.|
| `-x` or `--cluster-architecture` | Defines the cluster architecture and can be `single`, `ha`, or `eha`. See [Supported cluster types](/biganimal/release/overview/02_high_availability) for more information.|
| `-e` or `--endpoint` | Type of network endpoint for the BigAnimal cluster, either `public` or `private`. See [Cluster networking architecture](/biganimal/release/getting_started/creating_a_cluster/01_cluster_networking) for more information. |
| `-r` or `--activate-region` | Specifies region activation if no clusters currently exist in the region. |
| `--onboard` | Checks if the user and subscription are correctly configured.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ EDB provides a shell script, called [biganimal-csp-preflight](https://github.com
| `-h` or `--help`| Displays the command help. |
| `-i` or `--instance-type` | AWS instance type for the BigAnimal cluster. The help command provides a list of possible VM instance types. Choose the instance type that best suits your application and workload. Choose an instance type in the memory optimized R5, R5B, or R6I series for large data sets. Choose from the compute-optimized C5 or C6I series for compute-bound applications. Choose from the general purpose M5 or M6I series if you don't require memory or compute optimization.|
| `-a` or `--high-availability` | *DEPRECATED* - Enables high availability for the cluster. See [Supported cluster types(../../overview/02_high_availability) for more information.|
| `-x` or `--cluster-architecture` | Defines the Cluster architecture and can be [ single | ha | eha ]. See [Supported cluster types](/biganimal/release/overview/02_high_availability) for more information.|
| `-x` or `--cluster-architecture` | Defines the Cluster architecture and can be `single`, `ha`, or `eha`. See [Supported cluster types](/biganimal/release/overview/02_high_availability) for more information.|
| `-e` or `--endpoint` | Type of network endpoint for the BigAnimal cluster, either `public` or `private`. See [Cluster networking architecture](../creating_a_cluster/01_cluster_networking) for more information. |
| `-r` or `--activate-region` | Specifies region activation if no clusters currently exist in the region. |
| `--onboard` | Checks if the user and subscription are correctly configured.
Expand Down
Loading

0 comments on commit b019a3b

Please sign in to comment.