Merge branch 'release-v2.2.0' into release-v2.2.0-5020-ingress-refact…

…oring

.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: |

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:

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

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 }}

chart/templates/rbac-infra-mgr.yaml

@@ -1,4 +1,4 @@
-
+{{- if and .Values.infraMgr.rbac.create -}}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
@@ -35,14 +35,6 @@ rules:
       - servicemonitors
     verbs: ["*"]
 ---
-
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: infra-mgr-service
-  annotations:
-  {{- include "common-annotations" . | nindent 4  }}
----
 kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
@@ -57,4 +49,12 @@ subjects:
   - kind: ServiceAccount
     name: infra-mgr-service
     namespace: {{ .Release.Namespace }}
+{{ end }}
+
 ---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: infra-mgr-service
+  annotations:
+  {{- include "common-annotations" . | nindent 4  }}

chart/templates/rbac-infra-operator.yaml

@@ -1,4 +1,4 @@
----
+{{- if and .Values.infraOperator.rbac.create -}}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:
@@ -30,14 +30,6 @@ rules:
       - customresourcedefinitions
     verbs: ["*"]
 ---
-
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  name: infra-operator-service
-  annotations:
-  {{- include "common-annotations" . | nindent 4  }}
----
 kind: ClusterRoleBinding
 apiVersion: rbac.authorization.k8s.io/v1
 metadata:
@@ -52,3 +44,12 @@ subjects:
   - kind: ServiceAccount
     name: infra-operator-service
     namespace: {{ .Release.Namespace }}
+{{ end }}
+
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: infra-operator-service
+  annotations:
+  {{- include "common-annotations" . | nindent 4  }}

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:
@@ -87,6 +87,8 @@ infraRepo:
     tag: '2.1.0@sha256:4bf425dd957330aaeac52772144f58d303b065da82253c88b7280a316ed88823'
 
 infraOperator:
+  rbac:
+    create: true
   prometheusConfiguration:
     enabled: true
     port: 9752
@@ -125,12 +127,19 @@ infraOperator:
     javaToolOptions: "-XX:+ExitOnOutOfMemoryError -XX:+UseContainerSupport -XX:MaxRAMPercentage=85"
 
 infraMgr:
+  rbac:
+    create: true
   prometheusConfiguration:
     enabled: true
     port: 9752
   image:
     repository: ghcr.io/th2-net/th2-infra-mgr
-    tag: 2.3.7-th2-5018-validator-5867911343-991f81b
+    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