From 2326a8ab78f7f9190a2b40eb6ba1f05e64f1a54a Mon Sep 17 00:00:00 2001
From: Harshal Kulkarni <h.kulkarni@tarabutgateway.com>
Date: Thu, 26 Jan 2023 14:32:35 +0400
Subject: [PATCH 1/3] FSD-717 - Harshal - Add ingress for artemis to access
 management console

---
 .../templates/ci-ingress.yaml                 | 27 +++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 stable/activemq-artemis/templates/ci-ingress.yaml

diff --git a/stable/activemq-artemis/templates/ci-ingress.yaml b/stable/activemq-artemis/templates/ci-ingress.yaml
new file mode 100644
index 0000000..5d1416e
--- /dev/null
+++ b/stable/activemq-artemis/templates/ci-ingress.yaml
@@ -0,0 +1,27 @@
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  annotations:
+    cert-manager.io/cluster-issuer: letsencrypt-prod
+    nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
+    nginx.ingress.kubernetes.io/rewrite-target: /
+    nginx.ingress.kubernetes.io/backend-protocol: "HTTP"
+    kubernetes.io/ingress.class: internal-ingress
+  name: {{ include "artemis.fullname" . }}
+  namespace: {{ .Release.Namespace }}
+spec:
+  rules:
+    - host: {{ include "artemis.fullname" . }}.ci.tarabutgateway.io
+      http:
+        paths:
+          - path: /
+            pathType: ImplementationSpecific
+            backend:
+              service:
+                name: {{ include "artemis.fullname" . }}
+                port:
+                  number: 8161
+  tls:
+    - hosts:
+        - {{ include "artemis.fullname" . }}.ci.tarabutgateway.io
+      secretName: {{ .Release.Namespace }}-{{ include "artemis.fullname" . }}-tls-cert
\ No newline at end of file

From 1601080cf661593a3b7492855ac823ff6314f273 Mon Sep 17 00:00:00 2001
From: Harshal Kulkarni <h.kulkarni@tarabutgateway.com>
Date: Fri, 27 Jan 2023 11:03:35 +0400
Subject: [PATCH 2/3] FSD-717 - Harshal - Add environment as a parameter to
 helm chart, which would need to be set during chart installation

---
 stable/activemq-artemis/templates/ci-ingress.yaml | 4 ++--
 stable/activemq-artemis/values.yaml               | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/stable/activemq-artemis/templates/ci-ingress.yaml b/stable/activemq-artemis/templates/ci-ingress.yaml
index 5d1416e..e823e43 100644
--- a/stable/activemq-artemis/templates/ci-ingress.yaml
+++ b/stable/activemq-artemis/templates/ci-ingress.yaml
@@ -11,7 +11,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
 spec:
   rules:
-    - host: {{ include "artemis.fullname" . }}.ci.tarabutgateway.io
+    - host: {{ include "artemis.fullname" . }}.{{ .Values.environment }}.tarabutgateway.io
       http:
         paths:
           - path: /
@@ -23,5 +23,5 @@ spec:
                   number: 8161
   tls:
     - hosts:
-        - {{ include "artemis.fullname" . }}.ci.tarabutgateway.io
+        - {{ include "artemis.fullname" . }}.{{ .Values.environment }}.tarabutgateway.io
       secretName: {{ .Release.Namespace }}-{{ include "artemis.fullname" . }}-tls-cert
\ No newline at end of file
diff --git a/stable/activemq-artemis/values.yaml b/stable/activemq-artemis/values.yaml
index acebbf2..2d5fe56 100644
--- a/stable/activemq-artemis/values.yaml
+++ b/stable/activemq-artemis/values.yaml
@@ -129,3 +129,4 @@ prometheus:
       selector:
         prometheus: kube-prometheus
 
+environment: {}

From 63edb79b9c7a9581ffd605aafb05bbdaaafc1d31 Mon Sep 17 00:00:00 2001
From: Gavin van der Merwe <g.vandermerwe@tarabutgateway.com>
Date: Tue, 7 Feb 2023 14:33:05 +0000
Subject: [PATCH 3/3] Adding dashboard url

---
 stable/activemq-artemis/Chart.yaml                            | 2 +-
 .../templates/{ci-ingress.yaml => ingress.yaml}               | 4 ++--
 stable/activemq-artemis/values.yaml                           | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
 rename stable/activemq-artemis/templates/{ci-ingress.yaml => ingress.yaml} (81%)

diff --git a/stable/activemq-artemis/Chart.yaml b/stable/activemq-artemis/Chart.yaml
index c9f6528..c049bb5 100644
--- a/stable/activemq-artemis/Chart.yaml
+++ b/stable/activemq-artemis/Chart.yaml
@@ -1,5 +1,5 @@
 name: activemq-artemis
-version: 0.3.7
+version: 0.3.8
 appVersion: 2.16.3
 description: a multi-protocol, embeddable, very high performance, clustered, asynchronous messaging system.
 keywords:
diff --git a/stable/activemq-artemis/templates/ci-ingress.yaml b/stable/activemq-artemis/templates/ingress.yaml
similarity index 81%
rename from stable/activemq-artemis/templates/ci-ingress.yaml
rename to stable/activemq-artemis/templates/ingress.yaml
index e823e43..bc1f0c7 100644
--- a/stable/activemq-artemis/templates/ci-ingress.yaml
+++ b/stable/activemq-artemis/templates/ingress.yaml
@@ -11,7 +11,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
 spec:
   rules:
-    - host: {{ include "artemis.fullname" . }}.{{ .Values.environment }}.tarabutgateway.io
+    - host: {{ .Values.dashboardUrl }}
       http:
         paths:
           - path: /
@@ -23,5 +23,5 @@ spec:
                   number: 8161
   tls:
     - hosts:
-        - {{ include "artemis.fullname" . }}.{{ .Values.environment }}.tarabutgateway.io
+        - {{ .Values.dashboardUrl }}
       secretName: {{ .Release.Namespace }}-{{ include "artemis.fullname" . }}-tls-cert
\ No newline at end of file
diff --git a/stable/activemq-artemis/values.yaml b/stable/activemq-artemis/values.yaml
index 2d5fe56..75829ab 100644
--- a/stable/activemq-artemis/values.yaml
+++ b/stable/activemq-artemis/values.yaml
@@ -129,4 +129,4 @@ prometheus:
       selector:
         prometheus: kube-prometheus
 
-environment: {}
+dashboardUrl: artemis.tarabutgateway.io