support restricted option, jolokia agent, rbac, read only root, minimal

api/v1beta1/activemqartemis_types.go

@@ -71,6 +71,10 @@ type ActiveMQArtemisSpec struct {
 	// Specifies the template for various resources that the operator controls
 	//+operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Resource Templates"
 	ResourceTemplates []ResourceTemplate `json:"resourceTemplates,omitempty"`
+
+	// Restricted deployment, mtls jolokia agent with RBAC
+	//+operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Restricted"
+	Restricted *bool `json:"restricted,omitempty"`
 }
 
 type AddressSettingsType struct {

bundle/manifests/activemq-artemis-operator.clusterserviceversion.yaml

@@ -1495,6 +1495,9 @@ spec:
           all resources
         displayName: Selector
         path: resourceTemplates[0].selector
+      - description: Restricted deployment, mtls jolokia agent with RBAC
+        displayName: Restricted
+        path: restricted
       - description: Specifies the upgrades (deprecated in favour of Version)
         displayName: Upgrades
         path: upgrades

bundle/manifests/broker.amq.io_activemqartemises.yaml

@@ -4823,6 +4823,9 @@ spec:
                       type: object
                   type: object
                 type: array
+              restricted:
+                description: Restricted deployment, mtls jolokia agent with RBAC
+                type: boolean
               upgrades:
                 description: Specifies the upgrades (deprecated in favour of Version)
                 properties:

config/crd/bases/broker.amq.io_activemqartemises.yaml

@@ -4824,6 +4824,9 @@ spec:
                       type: object
                   type: object
                 type: array
+              restricted:
+                description: Restricted deployment, mtls jolokia agent with RBAC
+                type: boolean
               upgrades:
                 description: Specifies the upgrades (deprecated in favour of Version)
                 properties:

config/manifests/bases/activemq-artemis-operator.clusterserviceversion.yaml

@@ -1227,6 +1227,9 @@ spec:
           all resources
         displayName: Selector
         path: resourceTemplates[0].selector
+      - description: Restricted deployment, mtls jolokia agent with RBAC
+        displayName: Restricted
+        path: restricted
       - description: Specifies the upgrades (deprecated in favour of Version)
         displayName: Upgrades
         path: upgrades

controllers/activemqartemis_controller.go

@@ -173,7 +173,7 @@ func (r *ActiveMQArtemisReconciler) Reconcile(ctx context.Context, request ctrl.
 
 		err = reconciler.Process(customResource, *namer, r.Client, r.Scheme)
 
-		if ProcessBrokerStatus(customResource, r.Client, r.Scheme) {
+		if reconciler.ProcessBrokerStatus(customResource, r.Client, r.Scheme) {
 			requeueRequest = true
 		}
 	}

controllers/activemqartemis_controller_cert_manager_test.go

@@ -48,7 +48,7 @@ const (
 	rootCertNamespce     = "cert-manager"
 	rootCertSecretName   = "artemis-root-cert-secret"
 	caIssuerName         = "broker-ca-issuer"
-	caPemTrustStoreName  = "ca-truststore.pem"
+	caPemTrustStoreName  = "ca.pem"
 	caTrustStorePassword = "changeit"
 )
 
@@ -57,7 +57,7 @@ var (
 	rootIssuer   = &cmv1.ClusterIssuer{}
 	rootCert     = &cmv1.Certificate{}
 	caIssuer     = &cmv1.ClusterIssuer{}
-	caBundleName = "ca-bundle"
+	caBundleName = "operator-ca"
 )
 
 type ConnectorConfig struct {

controllers/activemqartemis_controller_test.go

@@ -7497,7 +7497,7 @@ var _ = Describe("artemis controller", func() {
 							Name:      secretName,
 							Namespace: defaultNamespace,
 						}
-						secret, err := secrets.RetriveSecret(namespaceName, secretName, make(map[string]string), k8sClient)
+						secret, err := secrets.RetriveSecret(namespaceName, make(map[string]string), k8sClient)
 						g.Expect(err).To(BeNil())
 						data := secret.Data[envVar.ValueFrom.SecretKeyRef.Key]
 						//the value is a string of acceptors in xml format:
@@ -7552,7 +7552,7 @@ var _ = Describe("artemis controller", func() {
 							Name:      secretName,
 							Namespace: defaultNamespace,
 						}
-						secret, err := secrets.RetriveSecret(namespaceName, secretName, make(map[string]string), k8sClient)
+						secret, err := secrets.RetriveSecret(namespaceName, make(map[string]string), k8sClient)
 						g.Expect(err).To(BeNil())
 						data := secret.Data[envVar.ValueFrom.SecretKeyRef.Key]
 						//the value is a string of acceptors in xml format:
@@ -7616,7 +7616,7 @@ var _ = Describe("artemis controller", func() {
 							Name:      secretName,
 							Namespace: defaultNamespace,
 						}
-						secret, err := secrets.RetriveSecret(namespaceName, secretName, make(map[string]string), k8sClient)
+						secret, err := secrets.RetriveSecret(namespaceName, make(map[string]string), k8sClient)
 						g.Expect(err).To(BeNil())
 						data := secret.Data[envVar.ValueFrom.SecretKeyRef.Key]
 						//the value is a string of acceptors in xml format:
@@ -7679,12 +7679,12 @@ var _ = Describe("artemis controller", func() {
 							Name:      secretName,
 							Namespace: defaultNamespace,
 						}
-						secret, err := secrets.RetriveSecret(namespaceName, secretName, make(map[string]string), k8sClient)
+						secret, err := secrets.RetriveSecret(namespaceName, make(map[string]string), k8sClient)
 						g.Expect(err).To(BeNil())
 						data := secret.Data[envVar.ValueFrom.SecretKeyRef.Key]
 						By("Checking data:" + string(data))
 						g.Expect(strings.Contains(string(data), "ACCEPTOR_IP:61666")).To(BeTrue())
-						checkSecretHasCorrectKeyValue(g, secretName, namespaceName, envVar.ValueFrom.SecretKeyRef.Key, "keyStoreProvider=SunJCE")
+						checkSecretHasCorrectKeyValue(g, namespaceName, envVar.ValueFrom.SecretKeyRef.Key, "keyStoreProvider=SunJCE")
 					}
 				}
 
@@ -7742,7 +7742,7 @@ var _ = Describe("artemis controller", func() {
 						//<acceptor name="new-acceptor">...</acceptor><another one>...
 						//we need to locate our target acceptor and do the check
 						//we use the port as a clue
-						checkSecretHasCorrectKeyValue(g, secretName, namespaceName, envVar.ValueFrom.SecretKeyRef.Key, "trustStoreType=JCEKS")
+						checkSecretHasCorrectKeyValue(g, namespaceName, envVar.ValueFrom.SecretKeyRef.Key, "trustStoreType=JCEKS")
 						found = true
 					}
 				}
@@ -7789,7 +7789,7 @@ var _ = Describe("artemis controller", func() {
 							Namespace: defaultNamespace,
 						}
 
-						secret, err := secrets.RetriveSecret(namespaceName, secretName, make(map[string]string), k8sClient)
+						secret, err := secrets.RetriveSecret(namespaceName, make(map[string]string), k8sClient)
 						g.Expect(err).Should(BeNil())
 
 						data := secret.Data[envVar.ValueFrom.SecretKeyRef.Key]
@@ -7848,7 +7848,7 @@ var _ = Describe("artemis controller", func() {
 						//<acceptor name="new-acceptor">...</acceptor><another one>...
 						//we need to locate our target acceptor and do the check
 						//we use the port as a clue
-						checkSecretHasCorrectKeyValue(g, secretName, namespaceName, envVar.ValueFrom.SecretKeyRef.Key, "trustStoreProvider=SUN")
+						checkSecretHasCorrectKeyValue(g, namespaceName, envVar.ValueFrom.SecretKeyRef.Key, "trustStoreProvider=SUN")
 					}
 				}
 			}, timeout, interval).Should(Succeed())