Fix Test Suite

README.adoc

@@ -109,7 +109,7 @@ oc label secret/mycluster-amq-broker-all-secret app.kubernetes.io/managed-by=Hel
 
 . Extract Client TrustStore
 +
-`oc extract secret/mycluster-amq-broker-all-secret --keys=client.ts`
+`oc extract secret/mycluster-amq-broker-all-secret --keys=client.ts`
 
 . Extract AMQ Endpoint
 
@@ -205,7 +205,7 @@ NOTE: You cannot create more than one broker deployment in a given OpenShift pro
 . [install/upgrade] Create kind: ActiveMQArtemis and ActiveMQArtemisAddress
 . [install/upgrade] Create Config Map with custom broker xml.
 . [post-install hook] Shutdown the AMQ Broker Operator
-. [post-install hook] Adoptthe AMQ Broker resource to Helm:
+. [post-install hook] Adopt the AMQ Broker resource to Helm:
 +
 [source,yaml]
 ------

amq-broker/templates/post-install.yaml

@@ -19,7 +19,7 @@ spec:
     spec:
       serviceAccountName: {{ include "amq-broker.serviceAccountName" . }}
       restartPolicy: Never
-      {{- if .Values.pki.self -}}
+      {{ if .Values.pki.self -}}
       initContainers:
       - name: keytool
         image: "{{ .Values.keytool.image.repository }}:{{ .Values.keytool.image.tag }}"

amq-broker/templates/tests/artemis-consumer.yaml

@@ -1,5 +1,6 @@
 {{- range $index, $acceptor := .Values.acceptors }}
 {{- with $ }}
+---
 apiVersion: v1
 kind: Pod
 metadata:
@@ -48,7 +49,7 @@ spec:
           {{ end }}
   {{- if $acceptor.sslEnabled }}
     volumeMounts:
-    - name: {{ .name }}
+    - name: {{ $acceptor.name }}
       mountPath: /opt/pki/{{ .name }} 
   volumes:
   - name: {{ $acceptor.name }}

amq-broker/templates/tests/artemis-producer.yaml

@@ -1,5 +1,6 @@
 {{- range $index, $acceptor := .Values.acceptors }}
 {{- with $ }}
+---
 apiVersion: v1
 kind: Pod
 metadata:
@@ -9,7 +10,7 @@ metadata:
   annotations:
     "helm.sh/hook": test
     "helm.sh/hook-delete-policy": hook-succeeded
-    "helm.sh/hook-weight": "{{ $index }}"
+    "helm.sh/hook-weight": "{{ sub $index 1 }}"
 spec:
   containers:
   - name: artemis-producer
@@ -48,7 +49,7 @@ spec:
           {{ end }}
   {{- if $acceptor.sslEnabled }}
     volumeMounts:
-    - name: {{ .name }}
+    - name: {{ $acceptor.name }}
       mountPath: /opt/pki/{{ .name }} 
   volumes:
   - name: {{ $acceptor.name }}

amq-broker/values.yaml

@@ -86,5 +86,5 @@ bridges: []
 
 diverts: []
 
-clusterDomain: apps-crc.testing
+clusterDomain: apps.dev.openlab.red