feat: updated openbao to 2.1

Signed-off-by: melody <[email protected]>
edgexfoundry · Dec 13, 2024 · b27c6ac · b27c6ac
1 parent f9601a6
commit b27c6ac
Show file tree

Hide file tree

Showing 19 changed files with 367 additions and 368 deletions.
diff --git a/compose-builder/.env b/compose-builder/.env
@@ -43,8 +43,7 @@ DEVICE_ONVIFCAM_VERSION=latest
 DEVICE_USBCAM_VERSION=latest
 DEVICE_S7_VERSION=latest
 
-# Lock on OpenBao 2.0 (last MPL-2.0 version)
-BAO_VERSION=2.0
+BAO_VERSION=2.1
 POSTGRES_VERSION=16.3-alpine3.20
 KUIPER_VERSION=v1.14.0-alpha.2
 MOSQUITTO_VERSION=2.0

diff --git a/docker-compose-arm64.yml b/docker-compose-arm64.yml
@@ -24,7 +24,7 @@
 #
 # From the compose-builder folder use `make build` to regenerate all standard compose files variations
 #
-# Generated with: Docker Compose version v2.29.2
+# Generated with: Docker Compose version v2.29.7
 name: edgex
 services:
   app-rules-engine:
@@ -889,7 +889,7 @@ services:
     deploy:
       resources:
         limits:
-          memory: "4190235525120"
+          memory: "2108837330944"
     entrypoint:
       - /edgex-init/secretstore_wait_install.sh
     environment:
@@ -912,8 +912,8 @@ services:
       STAGEGATE_SECRETSTORESETUP_TOKENS_READYPORT: "54322"
       STAGEGATE_WAITFOR_TIMEOUT: 60s
     hostname: edgex-secret-store
-    image: openbao/openbao:2.0
-    memswap_limit: "4190235525120"
+    image: openbao/openbao:2.1
+    memswap_limit: "2108837330944"
     networks:
       edgex-network: null
     ports:
@@ -1189,12 +1189,12 @@ services:
         source: kuiper-connections
         target: /tmp/kuiper-connections
         volume: {}
-  support-scheduler:
+  support-notifications:
     command:
-      - /support-scheduler
+      - /support-notifications
       - --registry
       - -cp=keeper.http://edgex-core-keeper:59890
-    container_name: edgex-support-scheduler
+    container_name: edgex-support-notifications
     depends_on:
       core-common-config-bootstrapper:
         condition: service_started
@@ -1217,7 +1217,7 @@ services:
       EDGEX_SECURITY_SECRET_STORE: "true"
       PROXY_SETUP_HOST: edgex-security-proxy-setup
       SECRETSTORE_HOST: edgex-secret-store
-      SERVICE_HOST: edgex-support-scheduler
+      SERVICE_HOST: edgex-support-notifications
       STAGEGATE_BOOTSTRAPPER_HOST: edgex-security-bootstrapper
       STAGEGATE_BOOTSTRAPPER_STARTPORT: "54321"
       STAGEGATE_DATABASE_HOST: edgex-postgres
@@ -1231,15 +1231,15 @@ services:
       STAGEGATE_SECRETSTORESETUP_HOST: edgex-security-secretstore-setup
       STAGEGATE_SECRETSTORESETUP_TOKENS_READYPORT: "54322"
       STAGEGATE_WAITFOR_TIMEOUT: 60s
-    hostname: edgex-support-scheduler
-    image: nexus3.edgexfoundry.org:10004/support-scheduler-arm64:latest
+    hostname: edgex-support-notifications
+    image: nexus3.edgexfoundry.org:10004/support-notifications-arm64:latest
     networks:
       edgex-network: null
     ports:
       - mode: ingress
         host_ip: 127.0.0.1
-        target: 59863
-        published: "59863"
+        target: 59860
+        published: "59860"
         protocol: tcp
     read_only: true
     restart: always
@@ -1259,18 +1259,18 @@ services:
         read_only: true
         volume: {}
       - type: bind
-        source: /tmp/edgex/secrets/support-scheduler
-        target: /tmp/edgex/secrets/support-scheduler
+        source: /tmp/edgex/secrets/support-notifications
+        target: /tmp/edgex/secrets/support-notifications
         read_only: true
         bind:
           selinux: z
           create_host_path: true
-  support-notifications:
+  support-scheduler:
     command:
-      - /support-notifications
+      - /support-scheduler
       - --registry
       - -cp=keeper.http://edgex-core-keeper:59890
-    container_name: edgex-support-notifications
+    container_name: edgex-support-scheduler
     depends_on:
       core-common-config-bootstrapper:
         condition: service_started
@@ -1293,7 +1293,7 @@ services:
       EDGEX_SECURITY_SECRET_STORE: "true"
       PROXY_SETUP_HOST: edgex-security-proxy-setup
       SECRETSTORE_HOST: edgex-secret-store
-      SERVICE_HOST: edgex-support-notifications
+      SERVICE_HOST: edgex-support-scheduler
       STAGEGATE_BOOTSTRAPPER_HOST: edgex-security-bootstrapper
       STAGEGATE_BOOTSTRAPPER_STARTPORT: "54321"
       STAGEGATE_DATABASE_HOST: edgex-postgres
@@ -1307,15 +1307,15 @@ services:
       STAGEGATE_SECRETSTORESETUP_HOST: edgex-security-secretstore-setup
       STAGEGATE_SECRETSTORESETUP_TOKENS_READYPORT: "54322"
       STAGEGATE_WAITFOR_TIMEOUT: 60s
-    hostname: edgex-support-notifications
-    image: nexus3.edgexfoundry.org:10004/support-notifications-arm64:latest
+    hostname: edgex-support-scheduler
+    image: nexus3.edgexfoundry.org:10004/support-scheduler-arm64:latest
     networks:
       edgex-network: null
     ports:
       - mode: ingress
         host_ip: 127.0.0.1
-        target: 59860
-        published: "59860"
+        target: 59863
+        published: "59863"
         protocol: tcp
     read_only: true
     restart: always
@@ -1335,8 +1335,8 @@ services:
         read_only: true
         volume: {}
       - type: bind
-        source: /tmp/edgex/secrets/support-notifications
-        target: /tmp/edgex/secrets/support-notifications
+        source: /tmp/edgex/secrets/support-scheduler
+        target: /tmp/edgex/secrets/support-scheduler
         read_only: true
         bind:
           selinux: z

diff --git a/docker-compose-no-secty-arm64.yml b/docker-compose-no-secty-arm64.yml
@@ -24,7 +24,7 @@
 #
 # From the compose-builder folder use `make build` to regenerate all standard compose files variations
 #
-# Generated with: Docker Compose version v2.29.2
+# Generated with: Docker Compose version v2.29.7
 name: edgex
 services:
   app-rules-engine:
@@ -462,11 +462,11 @@ services:
         source: kuiper-plugins
         target: /kuiper/plugins
         volume: {}
-  support-scheduler:
+  support-notifications:
     command:
       - --registry
       - -cp=keeper.http://edgex-core-keeper:59890
-    container_name: edgex-support-scheduler
+    container_name: edgex-support-notifications
     depends_on:
       core-common-config-bootstrapper:
         condition: service_started
@@ -479,16 +479,16 @@ services:
         required: true
     environment:
       EDGEX_SECURITY_SECRET_STORE: "false"
-      SERVICE_HOST: edgex-support-scheduler
-    hostname: edgex-support-scheduler
-    image: nexus3.edgexfoundry.org:10004/support-scheduler-arm64:latest
+      SERVICE_HOST: edgex-support-notifications
+    hostname: edgex-support-notifications
+    image: nexus3.edgexfoundry.org:10004/support-notifications-arm64:latest
     networks:
       edgex-network: null
     ports:
       - mode: ingress
         host_ip: 127.0.0.1
-        target: 59863
-        published: "59863"
+        target: 59860
+        published: "59860"
         protocol: tcp
     read_only: true
     restart: always
@@ -502,11 +502,11 @@ services:
         read_only: true
         bind:
           create_host_path: true
-  support-notifications:
+  support-scheduler:
     command:
       - --registry
       - -cp=keeper.http://edgex-core-keeper:59890
-    container_name: edgex-support-notifications
+    container_name: edgex-support-scheduler
     depends_on:
       core-common-config-bootstrapper:
         condition: service_started
@@ -519,16 +519,16 @@ services:
         required: true
     environment:
       EDGEX_SECURITY_SECRET_STORE: "false"
-      SERVICE_HOST: edgex-support-notifications
-    hostname: edgex-support-notifications
-    image: nexus3.edgexfoundry.org:10004/support-notifications-arm64:latest
+      SERVICE_HOST: edgex-support-scheduler
+    hostname: edgex-support-scheduler
+    image: nexus3.edgexfoundry.org:10004/support-scheduler-arm64:latest
     networks:
       edgex-network: null
     ports:
       - mode: ingress
         host_ip: 127.0.0.1
-        target: 59860
-        published: "59860"
+        target: 59863
+        published: "59863"
         protocol: tcp
     read_only: true
     restart: always

diff --git a/docker-compose-no-secty-with-app-sample-arm64.yml b/docker-compose-no-secty-with-app-sample-arm64.yml
@@ -24,7 +24,7 @@
 #
 # From the compose-builder folder use `make build` to regenerate all standard compose files variations
 #
-# Generated with: Docker Compose version v2.29.2
+# Generated with: Docker Compose version v2.29.7
 name: edgex
 services:
   app-rules-engine:
@@ -506,11 +506,11 @@ services:
         source: kuiper-plugins
         target: /kuiper/plugins
         volume: {}
-  support-scheduler:
+  support-notifications:
     command:
       - --registry
       - -cp=keeper.http://edgex-core-keeper:59890
-    container_name: edgex-support-scheduler
+    container_name: edgex-support-notifications
     depends_on:
       core-common-config-bootstrapper:
         condition: service_started
@@ -523,16 +523,16 @@ services:
         required: true
     environment:
       EDGEX_SECURITY_SECRET_STORE: "false"
-      SERVICE_HOST: edgex-support-scheduler
-    hostname: edgex-support-scheduler
-    image: nexus3.edgexfoundry.org:10004/support-scheduler-arm64:latest
+      SERVICE_HOST: edgex-support-notifications
+    hostname: edgex-support-notifications
+    image: nexus3.edgexfoundry.org:10004/support-notifications-arm64:latest
     networks:
       edgex-network: null
     ports:
       - mode: ingress
         host_ip: 127.0.0.1
-        target: 59863
-        published: "59863"
+        target: 59860
+        published: "59860"
         protocol: tcp
     read_only: true
     restart: always
@@ -546,11 +546,11 @@ services:
         read_only: true
         bind:
           create_host_path: true
-  support-notifications:
+  support-scheduler:
     command:
       - --registry
       - -cp=keeper.http://edgex-core-keeper:59890
-    container_name: edgex-support-notifications
+    container_name: edgex-support-scheduler
     depends_on:
       core-common-config-bootstrapper:
         condition: service_started
@@ -563,16 +563,16 @@ services:
         required: true
     environment:
       EDGEX_SECURITY_SECRET_STORE: "false"
-      SERVICE_HOST: edgex-support-notifications
-    hostname: edgex-support-notifications
-    image: nexus3.edgexfoundry.org:10004/support-notifications-arm64:latest
+      SERVICE_HOST: edgex-support-scheduler
+    hostname: edgex-support-scheduler
+    image: nexus3.edgexfoundry.org:10004/support-scheduler-arm64:latest
     networks:
       edgex-network: null
     ports:
       - mode: ingress
         host_ip: 127.0.0.1
-        target: 59860
-        published: "59860"
+        target: 59863
+        published: "59863"
         protocol: tcp
     read_only: true
     restart: always

diff --git a/docker-compose-no-secty-with-app-sample.yml b/docker-compose-no-secty-with-app-sample.yml
@@ -24,7 +24,7 @@
 #
 # From the compose-builder folder use `make build` to regenerate all standard compose files variations
 #
-# Generated with: Docker Compose version v2.29.2
+# Generated with: Docker Compose version v2.29.7
 name: edgex
 services:
   app-rules-engine:
@@ -506,11 +506,11 @@ services:
         source: kuiper-plugins
         target: /kuiper/plugins
         volume: {}
-  support-scheduler:
+  support-notifications:
     command:
       - --registry
       - -cp=keeper.http://edgex-core-keeper:59890
-    container_name: edgex-support-scheduler
+    container_name: edgex-support-notifications
     depends_on:
       core-common-config-bootstrapper:
         condition: service_started
@@ -523,16 +523,16 @@ services:
         required: true
     environment:
       EDGEX_SECURITY_SECRET_STORE: "false"
-      SERVICE_HOST: edgex-support-scheduler
-    hostname: edgex-support-scheduler
-    image: nexus3.edgexfoundry.org:10004/support-scheduler:latest
+      SERVICE_HOST: edgex-support-notifications
+    hostname: edgex-support-notifications
+    image: nexus3.edgexfoundry.org:10004/support-notifications:latest
     networks:
       edgex-network: null
     ports:
       - mode: ingress
         host_ip: 127.0.0.1
-        target: 59863
-        published: "59863"
+        target: 59860
+        published: "59860"
         protocol: tcp
     read_only: true
     restart: always
@@ -546,11 +546,11 @@ services:
         read_only: true
         bind:
           create_host_path: true
-  support-notifications:
+  support-scheduler:
     command:
       - --registry
       - -cp=keeper.http://edgex-core-keeper:59890
-    container_name: edgex-support-notifications
+    container_name: edgex-support-scheduler
     depends_on:
       core-common-config-bootstrapper:
         condition: service_started
@@ -563,16 +563,16 @@ services:
         required: true
     environment:
       EDGEX_SECURITY_SECRET_STORE: "false"
-      SERVICE_HOST: edgex-support-notifications
-    hostname: edgex-support-notifications
-    image: nexus3.edgexfoundry.org:10004/support-notifications:latest
+      SERVICE_HOST: edgex-support-scheduler
+    hostname: edgex-support-scheduler
+    image: nexus3.edgexfoundry.org:10004/support-scheduler:latest
     networks:
       edgex-network: null
     ports:
       - mode: ingress
         host_ip: 127.0.0.1
-        target: 59860
-        published: "59860"
+        target: 59863
+        published: "59863"
         protocol: tcp
     read_only: true
     restart: always