Merge branch 'main' into lidoCsmControl

stereum-dev · Dec 9, 2024 · 5c60534 · 5c60534
2 parents 2e6ee10 + a497df5
commit 5c60534
Show file tree

Hide file tree

Showing 123 changed files with 1,393 additions and 1,611 deletions.
diff --git a/.github/workflows/electron.yaml b/.github/workflows/electron.yaml
@@ -15,6 +15,11 @@ jobs:
       - name: Check out Git repository
         uses: actions/checkout@v3
 
+      - name: Ensure Node Version
+        uses: actions/setup-node@v4
+        with:
+          node-version: 22
+
       - name: Set Version from package.json
         id: variables
         run: |
@@ -56,6 +61,10 @@ jobs:
       - name: macOS build args
         if: matrix.os == 'macos-latest'
         run: echo "BUILD_ARGS=--universal" >> $GITHUB_ENV
+
+      - name: Install Dependencies
+        run: |
+          cd launcher && npm i
 
       - name: Build Electron app
         uses: samuelmeuli/action-electron-builder@v1

diff --git a/.github/workflows/test-molecule.yml b/.github/workflows/test-molecule.yml
@@ -22,11 +22,11 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: "3.9"
+          python-version: "3.10"
       - name: Install depencencies
         run: |
-          pip install ansible==5.10.0
-          pip install molecule==5.0.1
+          pip install ansible==10.3.0
+          pip install molecule==24.8.0
           pip install "molecule[docker.lint]"
           pip install molecule-docker
           pip install molecule-hetznercloud
@@ -35,8 +35,8 @@ jobs:
           ansible-galaxy collection install community.docker
       - name: Install dependency for pipx
         run: |
-          /opt/pipx/venvs/ansible-core/bin/python -m pip install ansible==5.10.0
-          /opt/pipx/venvs/ansible-core/bin/python -m pip install molecule==5.0.1
+          /opt/pipx/venvs/ansible-core/bin/python -m pip install ansible==10.3.0
+          /opt/pipx/venvs/ansible-core/bin/python -m pip install molecule==24.8.0
           /opt/pipx/venvs/ansible-core/bin/python -m pip install "molecule[docker.lint]"
           /opt/pipx/venvs/ansible-core/bin/python -m pip install molecule-docker
           /opt/pipx/venvs/ansible-core/bin/python -m pip install molecule-hetznercloud
@@ -68,10 +68,9 @@ jobs:
       matrix:
         tests:
           [
-            { role: "update-changes", test: "215" },
-            { role: "update-changes", test: "221" },
             { role: "update-changes", test: "222" },
             { role: "update-changes", test: "223" },
+            { role: "update-changes", test: "224" },
           ]
       fail-fast: false
     concurrency: molecule-test-${{ matrix.tests.role }}-${{ matrix.tests.test }}
@@ -81,11 +80,11 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: "3.9"
+          python-version: "3.10"
       - name: Install depencencies
         run: |
-          pip install ansible==5.10.0
-          pip install molecule==5.0.1
+          pip install ansible==10.3.0
+          pip install molecule==24.8.0
           pip install "molecule[docker.lint]"
           pip install molecule-docker
           pip install molecule-hetznercloud
@@ -94,8 +93,8 @@ jobs:
           ansible-galaxy collection install community.docker
       - name: Install dependency for pipx
         run: |
-          /opt/pipx/venvs/ansible-core/bin/python -m pip install ansible==5.10.0
-          /opt/pipx/venvs/ansible-core/bin/python -m pip install molecule==5.0.1
+          /opt/pipx/venvs/ansible-core/bin/python -m pip install ansible==10.3.0
+          /opt/pipx/venvs/ansible-core/bin/python -m pip install molecule==24.8.0
           /opt/pipx/venvs/ansible-core/bin/python -m pip install "molecule[docker.lint]"
           /opt/pipx/venvs/ansible-core/bin/python -m pip install molecule-docker
           /opt/pipx/venvs/ansible-core/bin/python -m pip install molecule-hetznercloud
@@ -134,11 +133,11 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: "3.9"
+          python-version: "3.10"
       - name: Install depencencies
         run: |
-          pip install ansible==5.10.0
-          pip install molecule==5.0.1
+          pip install ansible==10.3.0
+          pip install molecule==24.8.0
           pip install "molecule[docker.lint]"
           pip install molecule-docker
           pip install molecule-hetznercloud
@@ -147,8 +146,8 @@ jobs:
           ansible-galaxy collection install community.docker
       - name: Install dependency for pipx
         run: |
-          /opt/pipx/venvs/ansible-core/bin/python -m pip install ansible==5.10.0
-          /opt/pipx/venvs/ansible-core/bin/python -m pip install molecule==5.0.1
+          /opt/pipx/venvs/ansible-core/bin/python -m pip install ansible==10.3.0
+          /opt/pipx/venvs/ansible-core/bin/python -m pip install molecule==24.8.0
           /opt/pipx/venvs/ansible-core/bin/python -m pip install "molecule[docker.lint]"
           /opt/pipx/venvs/ansible-core/bin/python -m pip install molecule-docker
           /opt/pipx/venvs/ansible-core/bin/python -m pip install molecule-hetznercloud
@@ -187,11 +186,11 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: "3.9"
+          python-version: "3.10"
       - name: Install depencencies
         run: |
-          pip install ansible==5.10.0
-          pip install molecule==5.0.1
+          pip install ansible==10.3.0
+          pip install molecule==24.8.0
           pip install "molecule[docker.lint]"
           pip install molecule-docker
           pip install molecule-hetznercloud
@@ -200,8 +199,8 @@ jobs:
           ansible-galaxy collection install community.docker
       - name: Install dependency for pipx
         run: |
-          /opt/pipx/venvs/ansible-core/bin/python -m pip install ansible==5.10.0
-          /opt/pipx/venvs/ansible-core/bin/python -m pip install molecule==5.0.1
+          /opt/pipx/venvs/ansible-core/bin/python -m pip install ansible==10.3.0
+          /opt/pipx/venvs/ansible-core/bin/python -m pip install molecule==24.8.0
           /opt/pipx/venvs/ansible-core/bin/python -m pip install "molecule[docker.lint]"
           /opt/pipx/venvs/ansible-core/bin/python -m pip install molecule-docker
           /opt/pipx/venvs/ansible-core/bin/python -m pip install molecule-hetznercloud
@@ -240,11 +239,11 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: "3.9"
+          python-version: "3.10"
       - name: Install depencencies
         run: |
-          pip install ansible==5.10.0
-          pip install molecule==5.0.1
+          pip install ansible==10.3.0
+          pip install molecule==24.8.0
           pip install "molecule[docker.lint]"
           pip install molecule-docker
           pip install molecule-hetznercloud
@@ -253,8 +252,8 @@ jobs:
           ansible-galaxy collection install community.docker
       - name: Install dependency for pipx
         run: |
-          /opt/pipx/venvs/ansible-core/bin/python -m pip install ansible==5.10.0
-          /opt/pipx/venvs/ansible-core/bin/python -m pip install molecule==5.0.1
+          /opt/pipx/venvs/ansible-core/bin/python -m pip install ansible==10.3.0
+          /opt/pipx/venvs/ansible-core/bin/python -m pip install molecule==24.8.0
           /opt/pipx/venvs/ansible-core/bin/python -m pip install "molecule[docker.lint]"
           /opt/pipx/venvs/ansible-core/bin/python -m pip install molecule-docker
           /opt/pipx/venvs/ansible-core/bin/python -m pip install molecule-hetznercloud
@@ -293,11 +292,11 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: "3.9"
+          python-version: "3.10"
       - name: Install depencencies
         run: |
-          pip install ansible==5.10.0
-          pip install molecule==5.0.1
+          pip install ansible==10.3.0
+          pip install molecule==24.8.0
           pip install "molecule[docker.lint]"
           pip install molecule-docker
           pip install molecule-hetznercloud
@@ -306,8 +305,8 @@ jobs:
           ansible-galaxy collection install community.docker
       - name: Install dependency for pipx
         run: |
-          /opt/pipx/venvs/ansible-core/bin/python -m pip install ansible==5.10.0
-          /opt/pipx/venvs/ansible-core/bin/python -m pip install molecule==5.0.1
+          /opt/pipx/venvs/ansible-core/bin/python -m pip install ansible==10.3.0
+          /opt/pipx/venvs/ansible-core/bin/python -m pip install molecule==24.8.0
           /opt/pipx/venvs/ansible-core/bin/python -m pip install "molecule[docker.lint]"
           /opt/pipx/venvs/ansible-core/bin/python -m pip install molecule-docker
           /opt/pipx/venvs/ansible-core/bin/python -m pip install molecule-hetznercloud
@@ -352,8 +351,8 @@ jobs:
   #         python-version: '3.9'
   #     - name: Install depencencies
   #       run: |
-  #         pip install ansible==5.10.0
-  #         pip install molecule==5.0.1
+  #         pip install ansible==10.3.0
+  #         pip install molecule==24.8.0
   #         pip install "molecule[docker.lint]"
   #         pip install molecule-docker
   #         pip install molecule-hetznercloud
@@ -362,8 +361,8 @@ jobs:
   #         ansible-galaxy collection install community.docker
   #     - name: Install dependency for pipx
   #       run: |
-  #         /opt/pipx/venvs/ansible-core/bin/python -m pip install ansible==5.10.0
-  #         /opt/pipx/venvs/ansible-core/bin/python -m pip install molecule==5.0.1
+  #         /opt/pipx/venvs/ansible-core/bin/python -m pip install ansible==10.3.0
+  #         /opt/pipx/venvs/ansible-core/bin/python -m pip install molecule==24.8.0
   #         /opt/pipx/venvs/ansible-core/bin/python -m pip install "molecule[docker.lint]"
   #         /opt/pipx/venvs/ansible-core/bin/python -m pip install molecule-docker
   #         /opt/pipx/venvs/ansible-core/bin/python -m pip install molecule-hetznercloud
@@ -402,11 +401,11 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: "3.9"
+          python-version: "3.10"
       - name: Install depencencies
         run: |
-          pip install ansible==5.10.0
-          pip install molecule==5.0.1
+          pip install ansible==10.3.0
+          pip install molecule==24.8.0
           pip install "molecule[docker.lint]"
           pip install molecule-docker
           pip install molecule-hetznercloud
@@ -415,8 +414,8 @@ jobs:
           ansible-galaxy collection install community.docker
       - name: Install dependency for pipx
         run: |
-          /opt/pipx/venvs/ansible-core/bin/python -m pip install ansible==5.10.0
-          /opt/pipx/venvs/ansible-core/bin/python -m pip install molecule==5.0.1
+          /opt/pipx/venvs/ansible-core/bin/python -m pip install ansible==10.3.0
+          /opt/pipx/venvs/ansible-core/bin/python -m pip install molecule==24.8.0
           /opt/pipx/venvs/ansible-core/bin/python -m pip install "molecule[docker.lint]"
           /opt/pipx/venvs/ansible-core/bin/python -m pip install molecule-docker
           /opt/pipx/venvs/ansible-core/bin/python -m pip install molecule-hetznercloud
@@ -508,11 +507,11 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: "3.9"
+          python-version: "3.10"
       - name: Install depencencies
         run: |
-          pip install ansible==5.10.0
-          pip install molecule==5.0.1
+          pip install ansible==10.3.0
+          pip install molecule==24.8.0
           pip install "molecule[docker.lint]"
           pip install molecule-docker
           pip install molecule-hetznercloud
@@ -521,8 +520,8 @@ jobs:
           ansible-galaxy collection install community.docker
       - name: Install dependency for pipx
         run: |
-          /opt/pipx/venvs/ansible-core/bin/python -m pip install ansible==5.10.0
-          /opt/pipx/venvs/ansible-core/bin/python -m pip install molecule==5.0.1
+          /opt/pipx/venvs/ansible-core/bin/python -m pip install ansible==10.3.0
+          /opt/pipx/venvs/ansible-core/bin/python -m pip install molecule==24.8.0
           /opt/pipx/venvs/ansible-core/bin/python -m pip install "molecule[docker.lint]"
           /opt/pipx/venvs/ansible-core/bin/python -m pip install molecule-docker
           /opt/pipx/venvs/ansible-core/bin/python -m pip install molecule-hetznercloud
@@ -563,11 +562,11 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: "3.9"
+          python-version: "3.10"
       - name: Install depencencies
         run: |
-          pip install ansible==5.10.0
-          pip install molecule==5.0.1
+          pip install ansible==10.3.0
+          pip install molecule==24.8.0
           pip install "molecule[docker.lint]"
           pip install molecule-docker
           pip install molecule-hetznercloud
@@ -576,8 +575,8 @@ jobs:
           ansible-galaxy collection install community.docker
       - name: Install dependency for pipx
         run: |
-          /opt/pipx/venvs/ansible-core/bin/python -m pip install ansible==5.10.0
-          /opt/pipx/venvs/ansible-core/bin/python -m pip install molecule==5.0.1
+          /opt/pipx/venvs/ansible-core/bin/python -m pip install ansible==10.3.0
+          /opt/pipx/venvs/ansible-core/bin/python -m pip install molecule==24.8.0
           /opt/pipx/venvs/ansible-core/bin/python -m pip install "molecule[docker.lint]"
           /opt/pipx/venvs/ansible-core/bin/python -m pip install molecule-docker
           /opt/pipx/venvs/ansible-core/bin/python -m pip install molecule-hetznercloud
@@ -622,11 +621,11 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: "3.9"
+          python-version: "3.10"
       - name: Install depencencies
         run: |
-          pip install ansible==5.10.0
-          pip install molecule==5.0.1
+          pip install ansible==10.3.0
+          pip install molecule==24.8.0
           pip install "molecule[docker.lint]"
           pip install molecule-docker
           pip install molecule-hetznercloud
@@ -635,8 +634,8 @@ jobs:
           ansible-galaxy collection install community.docker
       - name: Install dependency for pipx
         run: |
-          /opt/pipx/venvs/ansible-core/bin/python -m pip install ansible==5.10.0
-          /opt/pipx/venvs/ansible-core/bin/python -m pip install molecule==5.0.1
+          /opt/pipx/venvs/ansible-core/bin/python -m pip install ansible==10.3.0
+          /opt/pipx/venvs/ansible-core/bin/python -m pip install molecule==24.8.0
           /opt/pipx/venvs/ansible-core/bin/python -m pip install "molecule[docker.lint]"
           /opt/pipx/venvs/ansible-core/bin/python -m pip install molecule-docker
           /opt/pipx/venvs/ansible-core/bin/python -m pip install molecule-hetznercloud
@@ -682,11 +681,11 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: "3.9"
+          python-version: "3.10"
       - name: Install depencencies
         run: |
-          pip install ansible==5.10.0
-          pip install molecule==5.0.1
+          pip install ansible==10.3.0
+          pip install molecule==24.8.0
           pip install "molecule[docker.lint]"
           pip install molecule-docker
           pip install molecule-hetznercloud
@@ -695,8 +694,8 @@ jobs:
           ansible-galaxy collection install community.docker
       - name: Install dependency for pipx
         run: |
-          /opt/pipx/venvs/ansible-core/bin/python -m pip install ansible==5.10.0
-          /opt/pipx/venvs/ansible-core/bin/python -m pip install molecule==5.0.1
+          /opt/pipx/venvs/ansible-core/bin/python -m pip install ansible==10.3.0
+          /opt/pipx/venvs/ansible-core/bin/python -m pip install molecule==24.8.0
           /opt/pipx/venvs/ansible-core/bin/python -m pip install "molecule[docker.lint]"
           /opt/pipx/venvs/ansible-core/bin/python -m pip install molecule-docker
           /opt/pipx/venvs/ansible-core/bin/python -m pip install molecule-hetznercloud

diff --git a/controls/roles/manage-service/molecule/notifications/converge.yml b/controls/roles/manage-service/molecule/notifications/converge.yml
@@ -2,19 +2,19 @@
 - name: Converge
   hosts: all
   vars_files:
-  - ../../../../defaults/stereum_defaults.yaml
+    - ../../../../defaults/stereum_defaults.yaml
   vars:
     grafana_service: 62aa1873-7b62-410b-ae8e-2cd8615165b9
     notification_service: 1738844e-3164-47de-85a8-ac7d07f2ee31
 
   tasks:
     # notification service
     - block:
-      - set_fact:
-          stereum: "{{ stereum_static | combine(stereum_args, recursive=True) }}"
-      - name: "Include manage-service"
-        include_role:
-          name: "manage-service"
+        - set_fact:
+            stereum: "{{ stereum_static | combine(stereum_args, recursive=True) }}"
+        - name: "Include manage-service"
+          include_role:
+            name: "manage-service"
       vars:
         stereum_args:
           manage_service:
@@ -33,13 +33,14 @@
               user: "2000"
               volumes:
                 - "/opt/app/services/{{ notification_service }}/qrcode:/opt/app/qrcode/"
+              network: prater
     # grafana service
     - block:
-      - set_fact:
-          stereum: "{{ stereum_static | combine(stereum_args, recursive=True) }}"
-      - name: "Include manage-service"
-        include_role:
-          name: "manage-service"
+        - set_fact:
+            stereum: "{{ stereum_static | combine(stereum_args, recursive=True) }}"
+        - name: "Include manage-service"
+          include_role:
+            name: "manage-service"
       vars:
         stereum_args:
           manage_service:
@@ -57,3 +58,4 @@
                 - "/opt/app/services/{{ grafana_service }}/grafana/provisioning:/etc/grafana/provisioning"
                 - "/opt/app/services/{{ grafana_service }}/grafana/data:/var/lib/grafana"
                 - "/opt/app/services/{{ grafana_service }}/grafana:/etc/grafana"
+              network: prater