From ad6cc11c36e81b116c376f58b4f1f0bda0ac7e33 Mon Sep 17 00:00:00 2001
From: Dark <75368248+Andrei-Shulika@users.noreply.github.com>
Date: Thu, 7 Dec 2023 10:19:34 +0100
Subject: [PATCH] 2.2.0 th2 5144 th2 5132 (#478)

* th2-5144 changes

---------

Co-authored-by: andrey.shulika <andrey.shulika@exactprosystems.com>
---
 .github/workflows/lint-unit-test-chart.yaml   | 2 +-
 README.md                                     | 7 ++++++-
 chart/Chart.yaml                              | 2 +-
 chart/templates/configs/_infraMgr-config.yaml | 9 +++++++++
 chart/values.yaml                             | 9 +++++++--
 5 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/lint-unit-test-chart.yaml b/.github/workflows/lint-unit-test-chart.yaml
index 31424ba0..f3216e7d 100644
--- a/.github/workflows/lint-unit-test-chart.yaml
+++ b/.github/workflows/lint-unit-test-chart.yaml
@@ -33,7 +33,7 @@ jobs:
           python-version: 3.8
 
       - name: Set up chart-testing
-        uses: helm/chart-testing-action@v2.4.0
+        uses: helm/chart-testing-action@v2.6.1
       
       - name: run unit test
         run: |
diff --git a/README.md b/README.md
index 0dd68645..699a01b1 100644
--- a/README.md
+++ b/README.md
@@ -277,7 +277,12 @@ rabbitmq:
 #    # authentication password
 #    # when using token auth for GitLab it should be equal to token itself
 #    # when using token auth for GitHub it should be equal to empty string
-
+#  #required, default pass for admin user is "th2"
+#  #you can setup your own list of users with passwords generated by https://bcrypt-generator.com/. Recomended rounds more than 10.
+#  http:
+#    adminAccounts:
+#      admin: $2a$10$MAPTPX12NwxtwBxRB47ZHODCUWwgwKqdMPzNtmRUZ.NH.5UBrR5u2
+#
 # required if http(s) access to gitlab/github repositories is used
 #converter:
 #  git:
diff --git a/chart/Chart.yaml b/chart/Chart.yaml
index 46502c76..de22b035 100644
--- a/chart/Chart.yaml
+++ b/chart/Chart.yaml
@@ -16,7 +16,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 2.1.0
+version: 2.2.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/chart/templates/configs/_infraMgr-config.yaml b/chart/templates/configs/_infraMgr-config.yaml
index d4f3e646..378b5abd 100644
--- a/chart/templates/configs/_infraMgr-config.yaml
+++ b/chart/templates/configs/_infraMgr-config.yaml
@@ -32,6 +32,15 @@ data:
       httpAuthUsername: "${HTTPS_AUTH_USERNAME}"
       httpAuthPassword: "${HTTPS_AUTH_PASSWORD}"
 
+    behaviour:
+      permittedToRemoveNamespace: {{ .Values.infraMgr.behaviour.permittedToRemoveNamespace }}
+
+    http:
+      adminAccounts:
+      {{- with .Values.infraMgr.http.adminAccounts }}
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
+
     rabbitmq:
       vhostName: {{ .Values.rabbitmq.rabbitmqVhost | quote }}
       secret: {{ default .Values.infraMgr.rabbitmq.secret .Values.rabbitmq.fullnameOverride }}
diff --git a/chart/values.yaml b/chart/values.yaml
index c9753087..54b83908 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -1,6 +1,6 @@
 ---
 # Default values for th2-infra.
-
+# default pass for admin user - "th2", used in infrMgr
 # -- Registries are attached as pull secrets to pods
 registries: {}
 #   myregistry.com:
@@ -130,7 +130,12 @@ infraMgr:
     port: 9752
   image:
     repository: ghcr.io/th2-net/th2-infra-mgr
-    tag: 2.3.7
+    tag: 2.4.0-TH2-5132-7057309681-d1796c6
+  behaviour:
+    permittedToRemoveNamespace: true
+  http:
+    adminAccounts:
+      admin: $2a$10$MAPTPX12NwxtwBxRB47ZHODCUWwgwKqdMPzNtmRUZ.NH.5UBrR5u2
   git:
     secretName: infra-mgr
     sshDir: /home/service/keys