From 2068c10df4333e73ad4c5665d6e0a044a12929a0 Mon Sep 17 00:00:00 2001 From: Harshit Singhvi Date: Tue, 11 Jan 2022 14:11:45 +0000 Subject: [PATCH 1/2] Changes for 4.2.14 --- .circleci/config.yml | 4 ++-- Chart.yaml | 4 ++-- deployment-scenarios/cluster-restore.yaml | 4 ++-- tools/backup/Chart.yaml | 4 ++-- tools/backup/Dockerfile | 4 ++-- tools/backup/values.yaml | 2 +- tools/restore/Dockerfile | 2 +- values.yaml | 4 ++-- 8 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index d105ed9f..1e7af625 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -293,13 +293,13 @@ jobs: echo "MATCH (n) RETURN count(n) as n;" | kubectl run -i --rm cypher-shell \ --namespace $NAMESPACE \ - --image=neo4j:4.3.10-enterprise --restart=Never \ + --image=neo4j:4.2.14-enterprise --restart=Never \ --command -- ./bin/cypher-shell -u neo4j -p "$NEO4J_PASSWORD" \ -a bolt://$NAME_RESTORE-neo4j.$NAMESPACE.svc.cluster.local 2>&1 | tee restore-result.log echo "MATCH (n) RETURN count(n) as n;" | kubectl run -i --rm cypher-shell \ --namespace $NAMESPACE \ - --image=neo4j:4.3.10-enterprise --restart=Never \ + --image=neo4j:4.2.14-enterprise --restart=Never \ --command -- ./bin/cypher-shell -u neo4j -p "$NEO4J_PASSWORD" \ -a neo4j://$NAME_RESTORE-neo4j.$NAMESPACE.svc.cluster.local 2>&1 | tee restore-result.log cp restore-result.log $BUILD_ARTIFACTS/ diff --git a/Chart.yaml b/Chart.yaml index 3a529808..39bd2f0d 100644 --- a/Chart.yaml +++ b/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 name: neo4j home: https://www.neo4j.com -version: 4.3.10 -appVersion: 4.3.10 +version: 4.2.14 +appVersion: 4.2.14 description: Neo4j is the world's leading graph database keywords: - graph diff --git a/deployment-scenarios/cluster-restore.yaml b/deployment-scenarios/cluster-restore.yaml index 9b65bef3..38b79fce 100644 --- a/deployment-scenarios/cluster-restore.yaml +++ b/deployment-scenarios/cluster-restore.yaml @@ -7,7 +7,7 @@ core: restore: enabled: true image: gcr.io/neo4j-helm/restore - imageTag: 4.3.10 + imageTag: 4.2.14 secretName: neo4j-gcp-credentials #neo4j-aws-credentials database: neo4j,system cloudProvider: gcp #aws @@ -20,7 +20,7 @@ readReplica: restore: enabled: true image: gcr.io/neo4j-helm/restore - imageTag: 4.3.10 + imageTag: 4.2.14 secretName: neo4j-gcp-credentials #neo4j-aws-credentials database: neo4j,system cloudProvider: gcp #aws diff --git a/tools/backup/Chart.yaml b/tools/backup/Chart.yaml index 584cde41..1fb11b4c 100644 --- a/tools/backup/Chart.yaml +++ b/tools/backup/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 name: neo4j-backup home: https://www.neo4j.com -version: 4.3.10 -appVersion: 4.3.10 +version: 4.2.14 +appVersion: 4.2.14 description: Neo4j Backup Utility keywords: - graph diff --git a/tools/backup/Dockerfile b/tools/backup/Dockerfile index 457a6f64..18e56681 100644 --- a/tools/backup/Dockerfile +++ b/tools/backup/Dockerfile @@ -2,7 +2,7 @@ FROM launcher.gcr.io/google/debian9 RUN apt-get update && apt-get install -y bash curl wget gnupg apt-transport-https apt-utils lsb-release \ && rm -rf /var/lib/apt/lists/* RUN wget -O - https://debian.neo4j.com/neotechnology.gpg.key | apt-key add - -RUN echo 'deb https://debian.neo4j.com stable 4.3' | tee -a /etc/apt/sources.list.d/neo4j.list +RUN echo 'deb https://debian.neo4j.com stable 4.2' | tee -a /etc/apt/sources.list.d/neo4j.list RUN curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | apt-key add - RUN echo "deb https://packages.cloud.google.com/apt cloud-sdk-$(lsb_release -c -s) main" | tee -a /etc/apt/sources.list.d/google-cloud-sdk.list RUN echo "deb https://httpredir.debian.org/debian stretch-backports main" | tee -a /etc/apt/sources.list.d/stretch-backports.list @@ -11,7 +11,7 @@ RUN echo "deb https://httpredir.debian.org/debian stretch-backports main" | tee RUN echo "neo4j-enterprise neo4j/question select I ACCEPT" | debconf-set-selections RUN echo "neo4j-enterprise neo4j/license note" | debconf-set-selections -RUN apt-get update && apt-get install -y neo4j-enterprise=1:4.3.10 google-cloud-sdk unzip less \ +RUN apt-get update && apt-get install -y neo4j-enterprise=1:4.2.14 google-cloud-sdk unzip less \ && rm -rf /var/lib/apt/lists/* RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip" && unzip awscliv2.zip && ./aws/install && rm awscliv2.zip RUN curl -sL https://aka.ms/InstallAzureCLIDeb | bash diff --git a/tools/backup/values.yaml b/tools/backup/values.yaml index efc7f477..deffd9bd 100644 --- a/tools/backup/values.yaml +++ b/tools/backup/values.yaml @@ -1,5 +1,5 @@ image: gcr.io/neo4j-helm/backup -imageTag: 4.3.10 +imageTag: 4.2.14 podLabels: {} podAnnotations: {} neo4jaddr: holder-neo4j.default.svc.cluster.local:6362 diff --git a/tools/restore/Dockerfile b/tools/restore/Dockerfile index b4321818..b2d86b41 100644 --- a/tools/restore/Dockerfile +++ b/tools/restore/Dockerfile @@ -1,4 +1,4 @@ -FROM neo4j:4.3.10-enterprise +FROM neo4j:4.2.14-enterprise RUN apt-get update \ && apt-get install -y curl wget gnupg apt-transport-https apt-utils lsb-release unzip less \ && rm -rf /var/lib/apt/lists/* diff --git a/values.yaml b/values.yaml index 84810d5a..52777401 100644 --- a/values.yaml +++ b/values.yaml @@ -7,7 +7,7 @@ name: "neo4j" # Specs for the Neo4j docker image image: "neo4j" -imageTag: "4.3.10-enterprise" +imageTag: "4.2.14-enterprise" imagePullPolicy: "IfNotPresent" # imagePullSecret: registry-secret acceptLicenseAgreement: "no" @@ -159,7 +159,7 @@ core: restore: enabled: false image: gcr.io/neo4j-helm/restore - imageTag: 4.3.10 + imageTag: 4.2.14 secretName: null database: neo4j,system cloudProvider: gcp From 861e2b072e126f9fefd1cca7ac24e18af8290088 Mon Sep 17 00:00:00 2001 From: Harshit Singhvi Date: Tue, 11 Jan 2022 14:42:45 +0000 Subject: [PATCH 2/2] Updated index.yaml with 4.2.14 --- index.yaml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/index.yaml b/index.yaml index 240abfd1..e7cf65c5 100644 --- a/index.yaml +++ b/index.yaml @@ -2,6 +2,16 @@ apiVersion: v1 generated: 2021-04-29T21:17:54.857071000+02:00 entries: neo4j-backup: + - created: 2022-01-11T14:42:18.605919000+00:00 + description: Neo4j 4.2.14 + digest: 68712ec8dc89d377c4ab1ffa2042160b86c89c66223e183aba8a94d039ae4057 + home: https://github.com/neo4j-contrib/neo4j-helm + name: neo4j + sources: + - https://github.com/neo4j-contrib/neo4j-helm + urls: + - https://github.com/neo4j-contrib/neo4j-helm/releases/download/4.2.14/neo4j-backup-4.2.14.tgz + version: 4.2.14 - created: 2022-01-11T10:51:43.629720000+00:00 description: Neo4j 4.3.10 digest: 8a0f450c89313b529a9e2838229e15b973bcffd0cb94e72923fdc18b6a2fe576 @@ -233,6 +243,16 @@ entries: - https://github.com/neo4j-contrib/neo4j-helm/releases/download/4.0.5-1/neo4j-backup-4.0.5-1.tgz version: 4.0.4-1 neo4j: + - created: 2022-01-11T14:42:18.605919000+00:00 + description: Neo4j 4.2.14 + digest: 3dbc2c6ab01e33252da5569b0682255fec2a215d418e38947ed0ddd336ec5bc4 + home: https://github.com/neo4j-contrib/neo4j-helm + name: neo4j + sources: + - https://github.com/neo4j-contrib/neo4j-helm + urls: + - https://github.com/neo4j-contrib/neo4j-helm/releases/download/4.2.14/neo4j-4.2.14.tgz + version: 4.2.14 - created: 2022-01-11T10:51:43.629720000+00:00 description: Neo4j 4.3.10 digest: 7e548b310219fbfd8ee8a10a123120a09d43657810e07e477b2a9014e050e576