From ce93d6426355b352f3d2f21c9c97a82150e5a7bf Mon Sep 17 00:00:00 2001 From: Yannick Struyf Date: Tue, 20 Feb 2024 14:38:47 +0100 Subject: [PATCH 1/2] Update Nutanix provider support details for unstacked etcd topology --- .../clustermgmt/etcd-backup-restore/bottlerocket-etcd-backup.md | 2 +- .../en/docs/clustermgmt/etcd-backup-restore/etcdbackup.md | 2 +- .../clustermgmt/etcd-backup-restore/ubuntu-rhel-etcd-backup.md | 2 +- docs/content/en/docs/getting-started/optional/etcd.md | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/content/en/docs/clustermgmt/etcd-backup-restore/bottlerocket-etcd-backup.md b/docs/content/en/docs/clustermgmt/etcd-backup-restore/bottlerocket-etcd-backup.md index 6a482c022ee5..d0bee71b84b6 100644 --- a/docs/content/en/docs/clustermgmt/etcd-backup-restore/bottlerocket-etcd-backup.md +++ b/docs/content/en/docs/clustermgmt/etcd-backup-restore/bottlerocket-etcd-backup.md @@ -9,7 +9,7 @@ description: > How to backup and restore External etcd on Bottlerocket OS --- {{% alert title="Note" color="warning" %}} -External etcd topology is supported for vSphere, CloudStack and Snow clusters, but not yet for Bare Metal or Nutanix clusters. +External etcd topology is supported for vSphere, CloudStack, Snow and Nutanix clusters, but not yet for Bare Metal clusters. {{% /alert %}} This guide requires some common shell tools such as: diff --git a/docs/content/en/docs/clustermgmt/etcd-backup-restore/etcdbackup.md b/docs/content/en/docs/clustermgmt/etcd-backup-restore/etcdbackup.md index 604eb75ff99d..c81d4868d798 100644 --- a/docs/content/en/docs/clustermgmt/etcd-backup-restore/etcdbackup.md +++ b/docs/content/en/docs/clustermgmt/etcd-backup-restore/etcdbackup.md @@ -6,7 +6,7 @@ description: > How to Backup and Restore External ETCD --- {{% alert title="Note" color="warning" %}} -External ETCD topology is supported for vSphere, CloudStack and Snow clusters, but not yet for Bare Metal or Nutanix clusters. +External ETCD topology is supported for vSphere, CloudStack, Snow and Nutanix clusters, but not yet for Bare Metal clusters. {{% /alert %}} This page contains steps for backing up a cluster by taking an ETCD snapshot, and restoring the cluster from a snapshot. diff --git a/docs/content/en/docs/clustermgmt/etcd-backup-restore/ubuntu-rhel-etcd-backup.md b/docs/content/en/docs/clustermgmt/etcd-backup-restore/ubuntu-rhel-etcd-backup.md index 2c572205cf65..03f4791cb73c 100644 --- a/docs/content/en/docs/clustermgmt/etcd-backup-restore/ubuntu-rhel-etcd-backup.md +++ b/docs/content/en/docs/clustermgmt/etcd-backup-restore/ubuntu-rhel-etcd-backup.md @@ -10,7 +10,7 @@ description: > --- {{% alert title="Note" color="warning" %}} -External etcd topology is supported for vSphere, CloudStack and Snow clusters, but not yet for Bare Metal or Nutanix clusters. +External etcd topology is supported for vSphere, CloudStack, Snow and Nutanix clusters, but not yet for Bare Metal clusters. {{% /alert %}} This page contains steps for backing up a cluster by taking an etcd snapshot, and restoring the cluster from a snapshot. These steps are for an EKS Anywhere cluster provisioned using the external etcd topology (selected by default) with Ubuntu OS. diff --git a/docs/content/en/docs/getting-started/optional/etcd.md b/docs/content/en/docs/getting-started/optional/etcd.md index d4ea38f91b5d..b3e4c6eb6633 100644 --- a/docs/content/en/docs/getting-started/optional/etcd.md +++ b/docs/content/en/docs/getting-started/optional/etcd.md @@ -13,7 +13,7 @@ description: > #### Provider support details | | vSphere | Bare Metal | Nutanix | CloudStack | Snow | |:--------------:|:-------:|:----------:|:-------:|:----------:|:----:| -| **Supported?** | ✓ | | | ✓ | ✓ | +| **Supported?** | ✓ | | ✓ | ✓ | ✓ | There are two types of etcd topologies for configuring a Kubernetes cluster: From 34e76e8de005ebc769b92ea7485635c1c02f4c56 Mon Sep 17 00:00:00 2001 From: Yannick Struyf Date: Tue, 20 Feb 2024 17:42:26 +0100 Subject: [PATCH 2/2] Update Nutanix spec with external etcd configuration fields --- .../getting-started/nutanix/nutanix-spec.md | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/docs/content/en/docs/getting-started/nutanix/nutanix-spec.md b/docs/content/en/docs/getting-started/nutanix/nutanix-spec.md index 4b1e18c947aa..efbdabdd17da 100644 --- a/docs/content/en/docs/getting-started/nutanix/nutanix-spec.md +++ b/docs/content/en/docs/getting-started/nutanix/nutanix-spec.md @@ -47,6 +47,11 @@ spec: datacenterRef: kind: NutanixDatacenterConfig name: nutanix-cluster + externalEtcdConfiguration: + count: 3 + machineGroupRef: + kind: NutanixMachineConfig + name: mgmt-etcd kubernetesVersion: "1.28" workerNodeGroupConfigurations: - count: 1 @@ -102,6 +107,34 @@ spec: --- apiVersion: anywhere.eks.amazonaws.com/v1alpha1 kind: NutanixMachineConfig +metadata: + name: mgmt-etcd + namespace: default +spec: + cluster: + name: nx-cluster-01 + type: name + image: + name: eksa-ubuntu-2004-kube-v1.28 + type: name + memorySize: 4Gi + osFamily: ubuntu + subnet: + name: vm-network + type: name + systemDiskSize: 40Gi + project: + type: name + name: my-project + users: + - name: eksa + sshAuthorizedKeys: + - ssh-rsa AAAA… + vcpuSockets: 2 + vcpusPerSocket: 1 +--- +apiVersion: anywhere.eks.amazonaws.com/v1alpha1 +kind: NutanixMachineConfig metadata: name: mgmt-machine namespace: default @@ -176,6 +209,12 @@ Maximum number of nodes for this node group’s autoscaling configuration. ### workerNodeGroupConfigurations.kubernetesVersion The Kubernetes version you want to use for this worker node group. Supported values: 1.28, 1.27, 1.26, 1.25, 1.24 +### externalEtcdConfiguration.count +Number of etcd members + +### externalEtcdConfiguration.machineGroupRef +Refers to the Kubernetes object with Nutanix specific configuration for your etcd members. See `NutanixMachineConfig` fields below. + ### datacenterRef Refers to the Kubernetes object with Nutanix environment specific configuration. See `NutanixDatacenterConfig` fields below.