From 86dae3c442a44c9decbbab04ce27157b89953e15 Mon Sep 17 00:00:00 2001 From: Nell Jerram Date: Thu, 26 Mar 2026 16:10:59 +0000 Subject: [PATCH 1/5] Update instructions for installing etcd3gw, for OpenStack --- .../getting-started/openstack/installation/redhat.mdx | 2 +- .../getting-started/openstack/installation/ubuntu.mdx | 11 ++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/calico/getting-started/openstack/installation/redhat.mdx b/calico/getting-started/openstack/installation/redhat.mdx index b0bd64e863..ea217c4f41 100644 --- a/calico/getting-started/openstack/installation/redhat.mdx +++ b/calico/getting-started/openstack/installation/redhat.mdx @@ -58,7 +58,7 @@ These steps are detailed in this section. EOF ``` -1. Install version 1.0.1 of the `etcd3gw` Python package. This is +1. Install the `etcd3gw` Python package. This is needed by $[prodname]'s OpenStack driver and DHCP agent. ``` diff --git a/calico/getting-started/openstack/installation/ubuntu.mdx b/calico/getting-started/openstack/installation/ubuntu.mdx index b17fe116b0..f6ba87f810 100644 --- a/calico/getting-started/openstack/installation/ubuntu.mdx +++ b/calico/getting-started/openstack/installation/ubuntu.mdx @@ -58,9 +58,14 @@ These steps are detailed in this section. apt-get update ``` -1. Install version 1.0.1 of the `etcd3gw` Python package. This is - needed by $[prodname]'s OpenStack driver and DHCP agent. - +1. Install the `etcd3gw` Python package. This is needed by $[prodname]'s + OpenStack driver and DHCP agent. On Ubuntu 22.04 (Noble) and later use the + version included in the Ubuntu archive: + ``` + apt-get install -y python3-etcd3gw + ``` + On Ubuntu 20.04 (Jammy) or earlier etcd3gw is either too old in the Ubuntu + archive, or not available at all, so instead install from PyPI: ``` apt-get install -y python3-pip pip3 install etcd3gw==2.4.0 From a31551e5ea301595ef9787a7ffecfb7ae138af2d Mon Sep 17 00:00:00 2001 From: Nell Jerram Date: Thu, 26 Mar 2026 16:18:23 +0000 Subject: [PATCH 2/5] Fix Ubuntu version numbers Kudos to Copilot for spotting! --- calico/getting-started/openstack/installation/ubuntu.mdx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/calico/getting-started/openstack/installation/ubuntu.mdx b/calico/getting-started/openstack/installation/ubuntu.mdx index f6ba87f810..78664d5ba7 100644 --- a/calico/getting-started/openstack/installation/ubuntu.mdx +++ b/calico/getting-started/openstack/installation/ubuntu.mdx @@ -59,12 +59,12 @@ These steps are detailed in this section. ``` 1. Install the `etcd3gw` Python package. This is needed by $[prodname]'s - OpenStack driver and DHCP agent. On Ubuntu 22.04 (Noble) and later use the + OpenStack driver and DHCP agent. On Ubuntu 24.04 (Noble) and later use the version included in the Ubuntu archive: ``` apt-get install -y python3-etcd3gw ``` - On Ubuntu 20.04 (Jammy) or earlier etcd3gw is either too old in the Ubuntu + On Ubuntu 22.04 (Jammy) or earlier etcd3gw is either too old in the Ubuntu archive, or not available at all, so instead install from PyPI: ``` apt-get install -y python3-pip From fb094871fac18aa91b73177fece9e3fabf3ee933 Mon Sep 17 00:00:00 2001 From: Nell Jerram Date: Thu, 26 Mar 2026 16:36:52 +0000 Subject: [PATCH 3/5] Update calico/getting-started/openstack/installation/ubuntu.mdx Co-authored-by: Christopher Tauchen --- calico/getting-started/openstack/installation/ubuntu.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/calico/getting-started/openstack/installation/ubuntu.mdx b/calico/getting-started/openstack/installation/ubuntu.mdx index 78664d5ba7..196f222c30 100644 --- a/calico/getting-started/openstack/installation/ubuntu.mdx +++ b/calico/getting-started/openstack/installation/ubuntu.mdx @@ -64,7 +64,7 @@ These steps are detailed in this section. ``` apt-get install -y python3-etcd3gw ``` - On Ubuntu 22.04 (Jammy) or earlier etcd3gw is either too old in the Ubuntu + On Ubuntu 22.04 (Jammy) or earlier, etcd3gw is either too old in the Ubuntu archive, or not available at all, so instead install from PyPI: ``` apt-get install -y python3-pip From 00cb03843b661f0a918bf456f64f7718ddc3819b Mon Sep 17 00:00:00 2001 From: Nell Jerram Date: Thu, 26 Mar 2026 16:37:27 +0000 Subject: [PATCH 4/5] Update calico/getting-started/openstack/installation/ubuntu.mdx Co-authored-by: Christopher Tauchen --- calico/getting-started/openstack/installation/ubuntu.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/calico/getting-started/openstack/installation/ubuntu.mdx b/calico/getting-started/openstack/installation/ubuntu.mdx index 196f222c30..c88deb6d5f 100644 --- a/calico/getting-started/openstack/installation/ubuntu.mdx +++ b/calico/getting-started/openstack/installation/ubuntu.mdx @@ -61,7 +61,7 @@ These steps are detailed in this section. 1. Install the `etcd3gw` Python package. This is needed by $[prodname]'s OpenStack driver and DHCP agent. On Ubuntu 24.04 (Noble) and later use the version included in the Ubuntu archive: - ``` + ```bash apt-get install -y python3-etcd3gw ``` On Ubuntu 22.04 (Jammy) or earlier, etcd3gw is either too old in the Ubuntu From 2ddfdd35fe9d78908c7e5d7d3603354d832b3ba5 Mon Sep 17 00:00:00 2001 From: Nell Jerram Date: Thu, 26 Mar 2026 16:37:43 +0000 Subject: [PATCH 5/5] Update calico/getting-started/openstack/installation/ubuntu.mdx Co-authored-by: Christopher Tauchen --- calico/getting-started/openstack/installation/ubuntu.mdx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/calico/getting-started/openstack/installation/ubuntu.mdx b/calico/getting-started/openstack/installation/ubuntu.mdx index c88deb6d5f..58dbcc1501 100644 --- a/calico/getting-started/openstack/installation/ubuntu.mdx +++ b/calico/getting-started/openstack/installation/ubuntu.mdx @@ -59,7 +59,7 @@ These steps are detailed in this section. ``` 1. Install the `etcd3gw` Python package. This is needed by $[prodname]'s - OpenStack driver and DHCP agent. On Ubuntu 24.04 (Noble) and later use the + OpenStack driver and DHCP agent. On Ubuntu 24.04 (Noble) and later, use the version included in the Ubuntu archive: ```bash apt-get install -y python3-etcd3gw