From 0e80373e0eca6b4c6afc2ba9643662a4d6322d66 Mon Sep 17 00:00:00 2001
From: Johannes Beck <mail@johannes-beck.name>
Date: Sun, 10 Mar 2024 14:32:26 +0100
Subject: [PATCH] Move activemq to own namespace

---
 etc/k8s/activemq-artemis-deployment.yaml      |  2 +-
 etc/k8s/activemq-artemis-ns.yaml              |  7 +++++++
 etc/k8s/activemq-artemis-pvc.yaml             |  2 +-
 etc/k8s/activemq-artemis-secret.yaml          |  2 +-
 etc/k8s/activemq-artemis-service-monitor.yaml |  2 +-
 etc/k8s/activemq-artemis-service.yaml         |  2 +-
 etc/k8s/wildfly-deployment.yaml               |  6 +++---
 etc/k8s/wildfly-secret.yaml                   | 12 ++++++++++++
 8 files changed, 27 insertions(+), 8 deletions(-)
 create mode 100644 etc/k8s/activemq-artemis-ns.yaml
 create mode 100644 etc/k8s/wildfly-secret.yaml

diff --git a/etc/k8s/activemq-artemis-deployment.yaml b/etc/k8s/activemq-artemis-deployment.yaml
index 9ba85049..dfb75377 100644
--- a/etc/k8s/activemq-artemis-deployment.yaml
+++ b/etc/k8s/activemq-artemis-deployment.yaml
@@ -4,7 +4,7 @@ metadata:
   labels:
     app: activemq-artemis
   name: activemq-artemis
-  namespace: stomp-test
+  namespace: activemq-artemis
 spec:
   replicas: 1
   selector:
diff --git a/etc/k8s/activemq-artemis-ns.yaml b/etc/k8s/activemq-artemis-ns.yaml
new file mode 100644
index 00000000..9f78cc5a
--- /dev/null
+++ b/etc/k8s/activemq-artemis-ns.yaml
@@ -0,0 +1,7 @@
+apiVersion: v1
+kind: Namespace
+metadata:
+  name: activemq-artemis
+spec:
+  finalizers:
+  - kubernetes
diff --git a/etc/k8s/activemq-artemis-pvc.yaml b/etc/k8s/activemq-artemis-pvc.yaml
index 37b9afe5..9c2fc3a9 100644
--- a/etc/k8s/activemq-artemis-pvc.yaml
+++ b/etc/k8s/activemq-artemis-pvc.yaml
@@ -4,7 +4,7 @@ metadata:
   labels:
     app: activemq-artemis
   name: activemq-artemis
-  namespace: stomp-test
+  namespace: activemq-artemis
 spec:
   accessModes:
   - ReadWriteOnce
diff --git a/etc/k8s/activemq-artemis-secret.yaml b/etc/k8s/activemq-artemis-secret.yaml
index 4a47664d..e5ddc3b4 100644
--- a/etc/k8s/activemq-artemis-secret.yaml
+++ b/etc/k8s/activemq-artemis-secret.yaml
@@ -8,5 +8,5 @@ metadata:
   labels:
     app: activemq-artemis
   name: activemq-artemis
-  namespace: stomp-test
+  namespace: activemq-artemis
 type: Opaque
diff --git a/etc/k8s/activemq-artemis-service-monitor.yaml b/etc/k8s/activemq-artemis-service-monitor.yaml
index 63f1ce2d..a8e86618 100644
--- a/etc/k8s/activemq-artemis-service-monitor.yaml
+++ b/etc/k8s/activemq-artemis-service-monitor.yaml
@@ -4,7 +4,7 @@ metadata:
   name: activemq-artemis
   labels:
     app: activemq-artemis
-  namespace: stomp-test
+  namespace: activemq-artemis
 spec:
   selector:
     matchLabels:
diff --git a/etc/k8s/activemq-artemis-service.yaml b/etc/k8s/activemq-artemis-service.yaml
index b30c084a..28fdc31f 100644
--- a/etc/k8s/activemq-artemis-service.yaml
+++ b/etc/k8s/activemq-artemis-service.yaml
@@ -4,7 +4,7 @@ metadata:
   labels:
     app: activemq-artemis
   name: activemq-artemis
-  namespace: stomp-test
+  namespace: activemq-artemis
 spec:
   type: ClusterIP
   ports:
diff --git a/etc/k8s/wildfly-deployment.yaml b/etc/k8s/wildfly-deployment.yaml
index 04d43b3b..d0a4371a 100644
--- a/etc/k8s/wildfly-deployment.yaml
+++ b/etc/k8s/wildfly-deployment.yaml
@@ -55,17 +55,17 @@ spec:
         - name: ETCD_SERVER
           value: etcd.x1
         - name: ACTIVEMQ_SERVER
-          value: activemq-artemis
+          value: activemq-artemis.activemq-artemis
         - name: ARTEMIS_USER
           valueFrom:
             secretKeyRef:
               key: artemis-user
-              name: activemq-artemis
+              name: wildfly
         - name: ARTEMIS_PASSWORD
           valueFrom:
             secretKeyRef:
               key: artemis-password
-              name: activemq-artemis
+              name: wildfly
         - name: KUBERNETES_NAMESPACE
           valueFrom:
             fieldRef:
diff --git a/etc/k8s/wildfly-secret.yaml b/etc/k8s/wildfly-secret.yaml
new file mode 100644
index 00000000..12c5cf58
--- /dev/null
+++ b/etc/k8s/wildfly-secret.yaml
@@ -0,0 +1,12 @@
+apiVersion: v1
+data:
+  # user and password "artemis", do not commit real credentials
+  artemis-user: YXJ0ZW1pcw==
+  artemis-password: YXJ0ZW1pcw==
+kind: Secret
+metadata:
+  labels:
+    app: wildfly
+  name: wildfly
+  namespace: stomp-test
+type: Opaque