Move activemq to own namespace

kifj · Mar 10, 2024 · 0e80373 · 0e80373
1 parent 5b412a5
commit 0e80373
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 8 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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