fix: Optional old GUIs (#113)

aneoconsulting · Nov 17, 2023 · 0de11d5 · 0de11d5
2 parents 6d033c6 + 26b8fae
commit 0de11d5
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 20 deletions.
diff --git a/.github/workflows/linter-helm.yml b/.github/workflows/linter-helm.yml
@@ -3,9 +3,11 @@ on:
   push:
     branches:
       - main
+      - 0.2.x
   pull_request:
     branches:
       - main
+      - 0.2.x
 jobs:
   HelmChartlint:
     name: Lint Helm charts
@@ -28,7 +30,7 @@ jobs:
           check-latest: true
 
       - name: Set up chart-testing
-        uses: helm/chart-testing-action@v2.4.0
+        uses: helm/chart-testing-action@v2.6.0
 
       - name: Run chart-testing (list-changed)
         id: list-changed

diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
@@ -3,9 +3,11 @@ on:
   push:
     branches:
       - main
+      - 0.2.x
   pull_request:
     branches: 
       - main
+      - 0.2.x
 jobs:
   pre-commit:
     name: Pre-commit checks

diff --git a/.github/workflows/terraform-documentation.yml b/.github/workflows/terraform-documentation.yml
@@ -3,9 +3,11 @@ on:
   push:
     branches:
       - main
+      - 0.2.x
   pull_request:
     branches:
       - main
+      - 0.2.x
 
 jobs:
   collectInputs:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,21 @@ All notable changes to this project will be documented in this file.
 
 ## [main](https://github.com/aneoconsulting/ArmoniK.Infra/tree/main) (2023-08-11)
 
+## [0.2.2](https://github.com/aneoconsulting/ArmoniK.Infra/releases/tag/0.2.2) (2023-11-17)
+
+Changed
+-
+
+* fix: Optional old GUIs
+
+## [0.2.1](https://github.com/aneoconsulting/ArmoniK.Infra/releases/tag/0.2.1) (2023-09-13)
+
+Changed
+-
+
+* fix: Variabilize fluentbit hostpath
+
+
 ## [0.2.0](https://github.com/aneoconsulting/ArmoniK.Infra/releases/tag/0.2.0) (2023-09-13)
 
 Changed

diff --git a/armonik/ingress-configmap.tf b/armonik/ingress-configmap.tf
@@ -65,14 +65,13 @@ server {
     location = /admin/fr {
         rewrite ^ $scheme://$http_host/admin/fr/;
     }
-    # Deprecated, must be removed in a new version. Keeped for retrocompatibility
-    location = /old-admin {
-        rewrite ^ $scheme://$http_host/admin-0.8/ permanent;
-    }
-    # Deprecated, must be removed in a new version
-    location = /admin-0.8 {
-        rewrite ^ $scheme://$http_host/admin-0.8/ permanent;
+%{if local.admin_app_url != null~}
+    set $admin_app_upstream ${local.admin_app_url};
+    location /admin/ {
+        proxy_pass $admin_app_upstream$uri$is_args$args;
     }
+%{endif~}
+%{if local.admin_0_9_url != null~}
     # Deprecated, must be removed in a new version
     location = /admin-0.9 {
         rewrite ^ $scheme://$http_host/admin-0.9/$accept_language/;
@@ -89,21 +88,26 @@ server {
     location = /admin-0.9/fr {
         rewrite ^ $scheme://$http_host/admin-0.9/fr/;
     }
-%{if var.admin_gui != null~}
-    set $admin_app_upstream ${local.admin_app_url};
-    set $admin_0_8_upstream ${local.admin_0_8_url};
     set $admin_0_9_upstream ${local.admin_0_9_url};
-    set $admin_api_upstream ${local.admin_api_url};
-    location /admin/ {
-        proxy_pass $admin_app_upstream$uri$is_args$args;
+    # Deprecated, must be removed in a new version
+    location /admin-0.9/ {
+        proxy_pass $admin_0_9_upstream$uri$is_args$args;
+    }
+%{endif~}
+%{if local.admin_0_8_url != null~}
+    # Deprecated, must be removed in a new version. Keeped for retrocompatibility
+    location = /old-admin {
+        rewrite ^ $scheme://$http_host/admin-0.8/ permanent;
     }
     # Deprecated, must be removed in a new version
-    location /admin-0.8/ {
-        proxy_pass $admin_0_8_upstream$uri$is_args$args;
+    location = /admin-0.8 {
+        rewrite ^ $scheme://$http_host/admin-0.8/ permanent;
     }
+    set $admin_0_8_upstream ${local.admin_0_8_url};
+    set $admin_api_upstream ${local.admin_api_url};
     # Deprecated, must be removed in a new version
-    location /admin-0.9/ {
-        proxy_pass $admin_0_9_upstream$uri$is_args$args;
+    location /admin-0.8/ {
+        proxy_pass $admin_0_8_upstream$uri$is_args$args;
     }
     # Deprecated, must be removed in a new version
     location /api {

diff --git a/monitoring/onpremise/fluent-bit/README.md b/monitoring/onpremise/fluent-bit/README.md
@@ -32,7 +32,7 @@ No modules.
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
 | <a name="input_cloudwatch"></a> [cloudwatch](#input\_cloudwatch) | CloudWatch info | `any` | `{}` | no |
-| <a name="input_fluent_bit"></a> [fluent\_bit](#input\_fluent\_bit) | Parameters of Fluent bit | <pre>object({<br>    container_name     = string<br>    image              = string<br>    tag                = string<br>    is_daemonset       = bool<br>    http_server        = string<br>    http_port          = string<br>    read_from_head     = string<br>    read_from_tail     = string<br>    image_pull_secrets = string<br>    parser             = string<br>  })</pre> | n/a | yes |
+| <a name="input_fluent_bit"></a> [fluent\_bit](#input\_fluent\_bit) | Parameters of Fluent bit | <pre>object({<br>    container_name                  = string<br>    image                           = string<br>    tag                             = string<br>    is_daemonset                    = bool<br>    http_server                     = string<br>    http_port                       = string<br>    read_from_head                  = string<br>    read_from_tail                  = string<br>    image_pull_secrets              = string<br>    parser                          = string<br>    fluentbitstate_hostpath         = string #path = "/var/log/fluent-bit/state" --> for GCP | path = "/var/fluent-bit/state" --> for localhost and AWS<br>    varlibdockercontainers_hostpath = string #path = "/var/log/lib/docker/containers" --> for GCP | path = "/var/lib/docker/containers" --> for localhost and AWS<br>    runlogjournal_hostpath          = string #path = "/var/log/run/log/journal" --> for GCP | path = "/run/log/journal" --> for localhost and AWS<br><br><br>  })</pre> | n/a | yes |
 | <a name="input_namespace"></a> [namespace](#input\_namespace) | Namespace of ArmoniK monitoring | `string` | n/a | yes |
 | <a name="input_node_selector"></a> [node\_selector](#input\_node\_selector) | Node selector for Seq | `any` | `{}` | no |
 | <a name="input_s3"></a> [s3](#input\_s3) | S3 for logs | `any` | `{}` | no |

diff --git a/utils/service-ip/outputs.tf b/utils/service-ip/outputs.tf
@@ -15,7 +15,7 @@ output "fqdn" {
 
 output "host" {
   description = "Either the IP or the FQDN of the service"
-  value       = coalesce(local.ip, local.fqdn)
+  value       = try(coalesce(local.ip, local.fqdn), null)
 }
 
 output "ports" {