Make influx init mode configurable (#1157)

apache · Jan 29, 2023 · 1696d47 · 1696d47
1 parent 72f11f1
commit 1696d47
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 5 deletions.
diff --git a/installer/cli/.env b/installer/cli/.env
@@ -35,3 +35,8 @@ COMPOSE_PROJECT_NAME=streampipes
 # 
 # default: activemq
 #SP_MQTT_HOST=mosquitto
+
+
+# For database migration in v0.91.0 - set init mode to 'upgrade' to migrate an existing installation
+SP_INFLUX_INIT_MODE=setup
+#SP_INFLUX_INIT_MODE=upgrade
diff --git a/installer/cli/deploy/standalone/influxdb/docker-compose.yml b/installer/cli/deploy/standalone/influxdb/docker-compose.yml
@@ -26,7 +26,7 @@ services:
       - DOCKER_INFLUXDB_INIT_ADMIN_TOKEN=sp-admin
       - DOCKER_INFLUXDB_INIT_ORG=sp
       - DOCKER_INFLUXDB_INIT_BUCKET=sp
-      - DOCKER_INFLUXDB_INIT_MODE=upgrade
+      - DOCKER_INFLUXDB_INIT_MODE=${SP_INFLUX_INIT_MODE}
     volumes:
       - influxdb:/var/lib/influxdb
       - influxdb2:/var/lib/influxdb2

diff --git a/installer/compose/.env b/installer/compose/.env
@@ -18,3 +18,7 @@ SP_DOCKER_REGISTRY=apachestreampipes
 SP_SUBNET=172.31.0.0/16
 SP_CONSUL_CONTAINER_IP=172.31.0.9
 COMPOSE_PROJECT_NAME=streampipes
+
+# For database migration in v0.91.0 - set init mode to 'upgrade' to migrate an existing installation
+SP_INFLUX_INIT_MODE=setup
+#SP_INFLUX_INIT_MODE=upgrade
diff --git a/installer/compose/docker-compose.full.yml b/installer/compose/docker-compose.full.yml
@@ -161,7 +161,7 @@ services:
       - DOCKER_INFLUXDB_INIT_ADMIN_TOKEN=sp-admin
       - DOCKER_INFLUXDB_INIT_ORG=sp
       - DOCKER_INFLUXDB_INIT_BUCKET=sp
-      - DOCKER_INFLUXDB_INIT_MODE=upgrade
+      - DOCKER_INFLUXDB_INIT_MODE=${SP_INFLUX_INIT_MODE}
     volumes:
       - influxdb:/var/lib/influxdb
       - influxdb2:/var/lib/influxdb2

diff --git a/installer/compose/docker-compose.nats.yml b/installer/compose/docker-compose.nats.yml
@@ -102,7 +102,7 @@ services:
       - DOCKER_INFLUXDB_INIT_ADMIN_TOKEN=sp-admin
       - DOCKER_INFLUXDB_INIT_ORG=sp
       - DOCKER_INFLUXDB_INIT_BUCKET=sp
-      - DOCKER_INFLUXDB_INIT_MODE=upgrade
+      - DOCKER_INFLUXDB_INIT_MODE=${SP_INFLUX_INIT_MODE}
     volumes:
       - influxdb:/var/lib/influxdb
       - influxdb2:/var/lib/influxdb2

diff --git a/installer/compose/docker-compose.yml b/installer/compose/docker-compose.yml
@@ -133,7 +133,7 @@ services:
       - DOCKER_INFLUXDB_INIT_ADMIN_TOKEN=sp-admin
       - DOCKER_INFLUXDB_INIT_ORG=sp
       - DOCKER_INFLUXDB_INIT_BUCKET=sp
-      - DOCKER_INFLUXDB_INIT_MODE=upgrade
+      - DOCKER_INFLUXDB_INIT_MODE=${SP_INFLUX_INIT_MODE}
     volumes:
       - influxdb:/var/lib/influxdb
       - influxdb2:/var/lib/influxdb2

diff --git a/installer/k8s/values.yaml b/installer/k8s/values.yaml
@@ -32,13 +32,15 @@ external:
   zookeeperVersion: 3.4.13
   influxdbVersion: 2.6
 
+# For database migration in v0.91.0 - set init mode to 'upgrade' to migrate an existing installation
+
 influxdb:
   username: "admin"
   password: "sp-admin"
   adminToken: "sp-admin"
   initOrg: "sp"
   initBucket: "sp"
-  initMode: "upgrade"
+  initMode: "setup"