From bb43336d66feee032ff54adf6abd945bad97600e Mon Sep 17 00:00:00 2001 From: Andi Skrgat Date: Thu, 28 Nov 2024 09:53:06 +0100 Subject: [PATCH] Upgrade to 2.22 (#81) * Upgrade to 2.22 --------- Co-authored-by: antejavor --- charts/memgraph-high-availability/Chart.yaml | 4 ++-- charts/memgraph-high-availability/README.md | 3 +-- .../memgraph-high-availability/templates/NOTES.txt | 4 ++-- charts/memgraph-high-availability/values.yaml | 7 +------ charts/memgraph/Chart.yaml | 4 ++-- charts/memgraph/templates/tests/test-connection.yaml | 2 +- docker-compose/docker-compose.yml | 12 ++++++------ 7 files changed, 15 insertions(+), 21 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/README.md b/charts/memgraph-high-availability/README.md index abeea7f..1f83353 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 (HA) 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](https://memgraph.com/docs/database-management/enabling-memgraph-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". -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: diff --git a/charts/memgraph-high-availability/templates/NOTES.txt b/charts/memgraph-high-availability/templates/NOTES.txt index 64581a7..035bdac 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 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 setup requires the proper enterprise license to work since HA is an enterprise feature. diff --git a/charts/memgraph-high-availability/values.yaml b/charts/memgraph-high-availability/values.yaml index ec04309..1fc3b4d 100644 --- a/charts/memgraph-high-availability/values.yaml +++ b/charts/memgraph-high-availability/values.yaml @@ -1,7 +1,7 @@ memgraph: image: repository: memgraph/memgraph - tag: 2.18.1 + tag: 2.22.0 pullPolicy: IfNotPresent env: MEMGRAPH_ENTERPRISE_LICENSE: "" @@ -53,7 +53,6 @@ sysctlInitContainer: data: - id: "0" args: - - "--experimental-enabled=high-availability" - "--management-port=10000" - "--bolt-port=7687" - "--also-log-to-stderr" @@ -62,7 +61,6 @@ data: - id: "1" args: - - "--experimental-enabled=high-availability" - "--management-port=10000" - "--bolt-port=7687" - "--also-log-to-stderr" @@ -72,7 +70,6 @@ data: coordinators: - id: "1" args: - - "--experimental-enabled=high-availability" - "--coordinator-id=1" - "--coordinator-port=12000" - "--management-port=10000" @@ -85,7 +82,6 @@ coordinators: - id: "2" args: - - "--experimental-enabled=high-availability" - "--coordinator-id=2" - "--coordinator-port=12000" - "--management-port=10000" @@ -98,7 +94,6 @@ coordinators: - id: "3" 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..df1a3ac 100644 --- a/charts/memgraph/Chart.yaml +++ b/charts/memgraph/Chart.yaml @@ -2,8 +2,8 @@ apiVersion: v2 name: memgraph home: https://memgraph.com/ type: application -version: 0.1.7 -appVersion: "2.21.0" +version: 0.1.8 +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: - | 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