From db3f488c47b3b60251e51dfff02927fc6cdacf01 Mon Sep 17 00:00:00 2001 From: Andi Skrgat Date: Wed, 20 Nov 2024 21:21:08 +0100 Subject: [PATCH 1/3] Upgrade to 2.22 --- charts/memgraph-high-availability/Chart.yaml | 4 ++-- charts/memgraph-high-availability/values.yaml | 7 +------ charts/memgraph/Chart.yaml | 2 +- charts/memgraph/templates/tests/test-connection.yaml | 2 +- 4 files changed, 5 insertions(+), 10 deletions(-) diff --git a/charts/memgraph-high-availability/Chart.yaml b/charts/memgraph-high-availability/Chart.yaml index 4b3594e..180aca3 100644 --- a/charts/memgraph-high-availability/Chart.yaml +++ b/charts/memgraph-high-availability/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 name: memgraph-high-availability description: A Helm chart for Kubernetes with Memgraph High availabiliy capabilites -version: 0.1.3 -appVersion: "2.18.1" +version: 0.1.4 +appVersion: "2.22.0" type: application diff --git a/charts/memgraph-high-availability/values.yaml b/charts/memgraph-high-availability/values.yaml index eb5dcaf..b7ace17 100644 --- a/charts/memgraph-high-availability/values.yaml +++ b/charts/memgraph-high-availability/values.yaml @@ -5,7 +5,7 @@ memgraph: image: repository: memgraph/memgraph - tag: 2.18.1 + tag: 2.22.0 pullPolicy: IfNotPresent env: MEMGRAPH_ENTERPRISE_LICENSE: "" @@ -46,7 +46,6 @@ data: managementPort: 10000 replicationPort: 20000 args: - - "--experimental-enabled=high-availability" - "--management-port=10000" - "--bolt-port=7687" - "--also-log-to-stderr" @@ -58,7 +57,6 @@ data: managementPort: 10000 replicationPort: 20000 args: - - "--experimental-enabled=high-availability" - "--management-port=10000" - "--bolt-port=7687" - "--also-log-to-stderr" @@ -71,7 +69,6 @@ coordinators: managementPort: 10000 coordinatorPort: 12000 args: - - "--experimental-enabled=high-availability" - "--coordinator-id=1" - "--coordinator-port=12000" - "--management-port=10000" @@ -87,7 +84,6 @@ coordinators: managementPort: 10000 coordinatorPort: 12000 args: - - "--experimental-enabled=high-availability" - "--coordinator-id=2" - "--coordinator-port=12000" - "--management-port=10000" @@ -103,7 +99,6 @@ coordinators: managementPort: 10000 coordinatorPort: 12000 args: - - "--experimental-enabled=high-availability" - "--coordinator-id=3" - "--coordinator-port=12000" - "--management-port=10000" diff --git a/charts/memgraph/Chart.yaml b/charts/memgraph/Chart.yaml index 743936f..4b8f46a 100644 --- a/charts/memgraph/Chart.yaml +++ b/charts/memgraph/Chart.yaml @@ -3,7 +3,7 @@ name: memgraph home: https://memgraph.com/ type: application version: 0.1.7 -appVersion: "2.21.0" +appVersion: "2.22.0" description: MemgraphDB Helm Chart keywords: - graph diff --git a/charts/memgraph/templates/tests/test-connection.yaml b/charts/memgraph/templates/tests/test-connection.yaml index a277cba..1649bc6 100644 --- a/charts/memgraph/templates/tests/test-connection.yaml +++ b/charts/memgraph/templates/tests/test-connection.yaml @@ -11,7 +11,7 @@ spec: spec: containers: - name: memgraph-test - image: memgraph/memgraph:2.18.1 + image: memgraph/memgraph:2.22.0 command: ["/bin/sh", "-c"] args: - | From e00e3a466f7d088f1c5d7beef3a46e70e51b0657 Mon Sep 17 00:00:00 2001 From: Andi Skrgat Date: Mon, 25 Nov 2024 09:24:21 +0100 Subject: [PATCH 2/3] Remove experimental enabled --- charts/memgraph-high-availability/README.md | 3 +-- .../memgraph-high-availability/templates/NOTES.txt | 2 +- docker-compose/docker-compose.yml | 12 ++++++------ 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/charts/memgraph-high-availability/README.md b/charts/memgraph-high-availability/README.md index 78e8dd7..e8614df 100644 --- a/charts/memgraph-high-availability/README.md +++ b/charts/memgraph-high-availability/README.md @@ -1,8 +1,7 @@ ## Helm chart for Memgraph high availability cluster (Enterprise) A Helm Chart for deploying Memgraph in [high availability setup](https://memgraph.com/docs/clustering/high-availability). This helm chart requires an enterprise version of Memgraph. -Memgraph HA cluster includes 3 coordinators, 2 data instances by default. The cluster setup is performed via the cluster-setup job. The HA cluster is still work in progress and started with "--experimental-enabled=high-availability". -The cluster is started in the configuration without the node selector, which means that in the current configuration, it is not highly available if the node fails. +Memgraph HA cluster includes 3 coordinators, 2 data instances by default. The cluster setup is performed via the cluster-setup job. The cluster is started in the configuration without the node selector, which means that in the current configuration, it is not highly available if the node fails. ## Installing the Memgraph HA Helm Chart To install the Memgraph HA Helm Chart, follow the steps below: diff --git a/charts/memgraph-high-availability/templates/NOTES.txt b/charts/memgraph-high-availability/templates/NOTES.txt index cf1e705..8452616 100644 --- a/charts/memgraph-high-availability/templates/NOTES.txt +++ b/charts/memgraph-high-availability/templates/NOTES.txt @@ -1,6 +1,6 @@ Thank you for installing the Memgraph High-availability cluster (Enterprise)! 🎉 -Memgraph HA cluster includes 3 coordinators, 2 data instances by default. The cluster setup is performed via the cluster-setup job. The HA cluster is still work in progress and started with "--experimental-enabled=high-availability". +Memgraph HA cluster includes 3 coordinators, 2 data instances by default. The cluster setup is performed via the cluster-setup job. The cluster is started in the configuration without the node selector, which means that in the current configuration, it is not highly available if the node fails. The cluster setup requires the proper enterprise license to work since HA is an enterprise feature. diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml index 0f6702e..7d3ee82 100644 --- a/docker-compose/docker-compose.yml +++ b/docker-compose/docker-compose.yml @@ -16,7 +16,7 @@ services: - ./HA_register.cypher:/tmp/init/HA_register.cypher:ro environment: - MEMGRAPH_HA_CLUSTER_INIT_QUERIES=/tmp/init/HA_register.cypher - command: [ "--init-file=/tmp/init/license.cypher", "--log-level=TRACE", "--data-directory=/tmp/mg_data_coord1", "--log-file=/tmp/coord1.log", "--also-log-to-stderr", "--coordinator-id=1", "--coordinator-port=10111", "--coordinator-hostname=coord1", "--experimental-enabled=high-availability"] + command: [ "--init-file=/tmp/init/license.cypher", "--log-level=TRACE", "--data-directory=/tmp/mg_data_coord1", "--log-file=/tmp/coord1.log", "--also-log-to-stderr", "--coordinator-id=1", "--coordinator-port=10111", "--coordinator-hostname=coord1"] networks: memgraph_ha: ipv4_address: 172.21.0.4 @@ -26,7 +26,7 @@ services: container_name: coord2 volumes: - ./license.cypher:/tmp/init/license.cypher:ro - command: [ "--init-file=/tmp/init/license.cypher", "--log-level=TRACE", "--data-directory=/tmp/mg_data_coord2", "--log-file=/tmp/coord2.log", "--also-log-to-stderr", "--coordinator-id=2", "--coordinator-port=10112", "--coordinator-hostname=coord2", "--experimental-enabled=high-availability"] + command: [ "--init-file=/tmp/init/license.cypher", "--log-level=TRACE", "--data-directory=/tmp/mg_data_coord2", "--log-file=/tmp/coord2.log", "--also-log-to-stderr", "--coordinator-id=2", "--coordinator-port=10112", "--coordinator-hostname=coord2"] networks: memgraph_ha: ipv4_address: 172.21.0.2 @@ -36,7 +36,7 @@ services: container_name: coord3 volumes: - ./license.cypher:/tmp/init/license.cypher:ro - command: [ "--init-file=/tmp/init/license.cypher", "--log-level=TRACE", "--data-directory=/tmp/mg_data_coord3", "--log-file=/tmp/coord3.log", "--also-log-to-stderr", "--coordinator-id=3", "--coordinator-port=10113", "--coordinator-hostname=coord3", "--experimental-enabled=high-availability"] + command: [ "--init-file=/tmp/init/license.cypher", "--log-level=TRACE", "--data-directory=/tmp/mg_data_coord3", "--log-file=/tmp/coord3.log", "--also-log-to-stderr", "--coordinator-id=3", "--coordinator-port=10113", "--coordinator-hostname=coord3"] networks: memgraph_ha: @@ -47,7 +47,7 @@ services: container_name: instance1 volumes: - ./license.cypher:/tmp/init/license.cypher:ro - command: ["--init-file=/tmp/init/license.cypher","--data-recovery-on-startup=true", "--log-level=TRACE", "--data-directory=/tmp/mg_data_instance1", "--log-file=/tmp/instance1.log", "--also-log-to-stderr", "--management-port=10011", "--experimental-enabled=high-availability"] + command: ["--init-file=/tmp/init/license.cypher","--data-recovery-on-startup=true", "--log-level=TRACE", "--data-directory=/tmp/mg_data_instance1", "--log-file=/tmp/instance1.log", "--also-log-to-stderr", "--management-port=10011"] networks: memgraph_ha: ipv4_address: 172.21.0.6 @@ -57,7 +57,7 @@ services: container_name: instance2 volumes: - ./license.cypher:/tmp/init/license.cypher:ro - command: ["--init-file=/tmp/init/license.cypher","--data-recovery-on-startup=true", "--log-level=TRACE", "--data-directory=/tmp/mg_data_instance2", "--log-file=/tmp/instance2.log", "--also-log-to-stderr", "--management-port=10012", "--experimental-enabled=high-availability"] + command: ["--init-file=/tmp/init/license.cypher","--data-recovery-on-startup=true", "--log-level=TRACE", "--data-directory=/tmp/mg_data_instance2", "--log-file=/tmp/instance2.log", "--also-log-to-stderr", "--management-port=10012"] networks: memgraph_ha: ipv4_address: 172.21.0.7 @@ -67,7 +67,7 @@ services: container_name: instance3 volumes: - ./license.cypher:/tmp/init/license.cypher:ro - command: ["--init-file=/tmp/init/license.cypher","--data-recovery-on-startup=true", "--log-level=TRACE", "--data-directory=/tmp/mg_data_instance3", "--log-file=/tmp/instance3.log", "--also-log-to-stderr", "--management-port=10013", "--experimental-enabled=high-availability"] + command: ["--init-file=/tmp/init/license.cypher","--data-recovery-on-startup=true", "--log-level=TRACE", "--data-directory=/tmp/mg_data_instance3", "--log-file=/tmp/instance3.log", "--also-log-to-stderr", "--management-port=10013"] networks: memgraph_ha: ipv4_address: 172.21.0.8 From 44a207ceee2d08ff69d45deeb71ed9e03e590e88 Mon Sep 17 00:00:00 2001 From: antejavor Date: Wed, 27 Nov 2024 15:43:45 +0100 Subject: [PATCH 3/3] Update. --- charts/memgraph-high-availability/README.md | 66 +++++++++---------- .../templates/NOTES.txt | 2 +- charts/memgraph/Chart.yaml | 2 +- 3 files changed, 35 insertions(+), 35 deletions(-) diff --git a/charts/memgraph-high-availability/README.md b/charts/memgraph-high-availability/README.md index e8614df..dc48203 100644 --- a/charts/memgraph-high-availability/README.md +++ b/charts/memgraph-high-availability/README.md @@ -1,7 +1,7 @@ ## Helm chart for Memgraph high availability cluster (Enterprise) A Helm Chart for deploying Memgraph in [high availability setup](https://memgraph.com/docs/clustering/high-availability). This helm chart requires an enterprise version of Memgraph. -Memgraph HA cluster includes 3 coordinators, 2 data instances by default. The cluster setup is performed via the cluster-setup job. The cluster is started in the configuration without the node selector, which means that in the current configuration, it is not highly available if the node fails. +Memgraph HA cluster includes 3 coordinators, 2 data instances by default. The cluster setup is performed via the cluster-setup job. ## Installing the Memgraph HA Helm Chart To install the Memgraph HA Helm Chart, follow the steps below: @@ -25,41 +25,41 @@ helm install memgraph/memgraph-high-availability -f values.yaml The following table lists the configurable parameters of the Memgraph chart and their default values. -| Parameter | Description | Default | -|---------------------------------------------|-----------------------------------------------------------------------------------------------------|-----------------------------------------| -| `memgraph.image.repository` | Memgraph Docker image repository | `memgraph/memgraph` | -| `memgraph.image.tag` | Specific tag for the Memgraph Docker image. Overrides the image tag whose default is chart version. | `2.17.0` | -| `memgraph.image.pullPolicy` | Image pull policy | `IfNotPresent` | -| `memgraph.env.MEMGRAPH_ENTERPRISE_LICENSE` | Memgraph enterprise license | `` | -| `memgraph.env.MEMGRAPH_ORGANIZATION_NAME` | Organization name | `` | -| `memgraph.probes.startup.failureThreshold` | Startup probe failure threshold | `30` | -| `memgraph.probes.startup.periodSeconds` | Startup probe period in seconds | `10` | -| `memgraph.probes.readiness.initialDelaySeconds` | Readiness probe initial delay in seconds | `5` | -| `memgraph.probes.readiness.periodSeconds` | Readiness probe period in seconds | `5` | -| `memgraph.probes.liveness.initialDelaySeconds` | Liveness probe initial delay in seconds | `30` | -| `memgraph.probes.liveness.periodSeconds` | Liveness probe period in seconds | `10` | -| `memgraph.data.volumeClaim.storagePVC` | Enable storage PVC | `true` | -| `memgraph.data.volumeClaim.storagePVCSize` | Size of the storage PVC | `1Gi` | -| `memgraph.data.volumeClaim.logPVC` | Enable log PVC | `false` | -| `memgraph.data.volumeClaim.logPVCSize` | Size of the log PVC | `256Mi` | -| `memgraph.coordinators.volumeClaim.storagePVC` | Enable storage PVC for coordinators | `true` | -| `memgraph.coordinators.volumeClaim.storagePVCSize` | Size of the storage PVC for coordinators | `1Gi` | -| `memgraph.coordinators.volumeClaim.logPVC` | Enable log PVC for coordinators | `false` | -| `memgraph.coordinators.volumeClaim.logPVCSize` | Size of the log PVC for coordinators | `256Mi` | -| `memgraph.affinity.enabled` | Enables affinity so each instance is deployed to unique node | `true` | -| `data` | Configuration for data instances | See `data` section | -| `coordinators` | Configuration for coordinator instances | See `coordinators` section | +| Parameter | Description | Default | +| -------------------------------------------------- | --------------------------------------------------------------------------------------------------- | -------------------------- | +| `memgraph.image.repository` | Memgraph Docker image repository | `memgraph/memgraph` | +| `memgraph.image.tag` | Specific tag for the Memgraph Docker image. Overrides the image tag whose default is chart version. | `2.17.0` | +| `memgraph.image.pullPolicy` | Image pull policy | `IfNotPresent` | +| `memgraph.env.MEMGRAPH_ENTERPRISE_LICENSE` | Memgraph enterprise license | `` | +| `memgraph.env.MEMGRAPH_ORGANIZATION_NAME` | Organization name | `` | +| `memgraph.probes.startup.failureThreshold` | Startup probe failure threshold | `30` | +| `memgraph.probes.startup.periodSeconds` | Startup probe period in seconds | `10` | +| `memgraph.probes.readiness.initialDelaySeconds` | Readiness probe initial delay in seconds | `5` | +| `memgraph.probes.readiness.periodSeconds` | Readiness probe period in seconds | `5` | +| `memgraph.probes.liveness.initialDelaySeconds` | Liveness probe initial delay in seconds | `30` | +| `memgraph.probes.liveness.periodSeconds` | Liveness probe period in seconds | `10` | +| `memgraph.data.volumeClaim.storagePVC` | Enable storage PVC | `true` | +| `memgraph.data.volumeClaim.storagePVCSize` | Size of the storage PVC | `1Gi` | +| `memgraph.data.volumeClaim.logPVC` | Enable log PVC | `false` | +| `memgraph.data.volumeClaim.logPVCSize` | Size of the log PVC | `256Mi` | +| `memgraph.coordinators.volumeClaim.storagePVC` | Enable storage PVC for coordinators | `true` | +| `memgraph.coordinators.volumeClaim.storagePVCSize` | Size of the storage PVC for coordinators | `1Gi` | +| `memgraph.coordinators.volumeClaim.logPVC` | Enable log PVC for coordinators | `false` | +| `memgraph.coordinators.volumeClaim.logPVCSize` | Size of the log PVC for coordinators | `256Mi` | +| `memgraph.affinity.enabled` | Enables affinity so each instance is deployed to unique node | `true` | +| `data` | Configuration for data instances | See `data` section | +| `coordinators` | Configuration for coordinator instances | See `coordinators` section | For the `data` and `coordinators` sections, each item in the list has the following parameters: -| Parameter | Description | Default | -|---------------------------------------------|-----------------------------------------------------------------------------------------------------|-----------------------------------------| -| `id` | ID of the instance | `0` for data, `1` for coordinators | -| `boltPort` | Bolt port of the instance | `7687` | -| `managementPort` | Management port of the data instance | `10000` | -| `replicationPort` (data only) | Replication port of the data instance | `20000` | -| `coordinatorPort` (coordinators only) | Coordinator port of the coordinator instance | `12000` | -| `args` | List of arguments for the instance | See `args` section | +| Parameter | Description | Default | +| ------------------------------------- | -------------------------------------------- | ---------------------------------- | +| `id` | ID of the instance | `0` for data, `1` for coordinators | +| `boltPort` | Bolt port of the instance | `7687` | +| `managementPort` | Management port of the data instance | `10000` | +| `replicationPort` (data only) | Replication port of the data instance | `20000` | +| `coordinatorPort` (coordinators only) | Coordinator port of the coordinator instance | `12000` | +| `args` | List of arguments for the instance | See `args` section | The `args` section contains a list of arguments for the instance. The default values are the same for all instances: diff --git a/charts/memgraph-high-availability/templates/NOTES.txt b/charts/memgraph-high-availability/templates/NOTES.txt index 8452616..c8faf0e 100644 --- a/charts/memgraph-high-availability/templates/NOTES.txt +++ b/charts/memgraph-high-availability/templates/NOTES.txt @@ -1,7 +1,7 @@ Thank you for installing the Memgraph High-availability cluster (Enterprise)! 🎉 Memgraph HA cluster includes 3 coordinators, 2 data instances by default. The cluster setup is performed via the cluster-setup job. -The cluster is started in the configuration without the node selector, which means that in the current configuration, it is not highly available if the node fails. + The cluster setup requires the proper enterprise license to work since HA is an enterprise feature. diff --git a/charts/memgraph/Chart.yaml b/charts/memgraph/Chart.yaml index 4b8f46a..df1a3ac 100644 --- a/charts/memgraph/Chart.yaml +++ b/charts/memgraph/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: memgraph home: https://memgraph.com/ type: application -version: 0.1.7 +version: 0.1.8 appVersion: "2.22.0" description: MemgraphDB Helm Chart keywords: