[#557] Add expose mode

The expose mode affects how the internal services for acceptors, connectors and console are exposed. Currently the supported modes are `route` and `ingress`. Default is `route` on OpenShift and `ingress` on Kubernetes. * `route` mode uses OpenShift Routes to expose the internal service. * `ingress` mode uses Kubernetes Nginx Ingress to expose the internal service with TLS passthrough.
arkmq-org · Feb 16, 2024 · 6e33b73 · 6e33b73
1 parent ee789cb
commit 6e33b73
Show file tree

Hide file tree

Showing 11 changed files with 468 additions and 27 deletions.
diff --git a/api/v1beta1/activemqartemis_types.go b/api/v1beta1/activemqartemis_types.go
@@ -448,6 +448,17 @@ type StorageType struct {
 	StorageClassName string `json:"storageClassName,omitempty"`
 }
 
+// +kubebuilder:validation:Enum=ingress;route
+type ExposeMode string
+
+var ExposeModes = struct {
+	Ingress ExposeMode
+	Route   ExposeMode
+}{
+	Ingress: "ingress",
+	Route:   "route",
+}
+
 type AcceptorType struct {
 	// The acceptor name
 	//+operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Name",xDescriptors={"urn:alm:descriptor:com.tectonic.ui:text"}
@@ -488,6 +499,9 @@ type AcceptorType struct {
 	// Whether or not to expose this acceptor
 	//+operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Expose",xDescriptors={"urn:alm:descriptor:com.tectonic.ui:booleanSwitch"}
 	Expose bool `json:"expose,omitempty"`
+	// Mode to expose the acceptor. Currently the supported modes are `route` and `ingress`. Default is `route` on OpenShift and `ingress` on Kubernetes. \n\n* `route` mode uses OpenShift Routes to expose the acceptor.\n* `ingress` mode uses Kubernetes Nginx Ingress to expose the acceptor with TLS passthrough.\n"
+	//+operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Expose Mode",xDescriptors={"urn:alm:descriptor:com.tectonic.ui:text"}
+	ExposeMode *ExposeMode `json:"exposeMode,omitempty"`
 	// To indicate which kind of routing type to use.
 	//+operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Anycast Prefix",xDescriptors={"urn:alm:descriptor:com.tectonic.ui:text"}
 	AnycastPrefix string `json:"anycastPrefix,omitempty"`
@@ -566,6 +580,9 @@ type ConnectorType struct {
 	// Whether or not to expose this connector
 	//+operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Expose",xDescriptors={"urn:alm:descriptor:com.tectonic.ui:booleanSwitch"}
 	Expose bool `json:"expose,omitempty"`
+	// Mode to expose the connector. Currently the supported modes are `route` and `ingress`. Default is `route` on OpenShift and `ingress` on Kubernetes. \n\n* `route` mode uses OpenShift Routes to expose the connector.\n* `ingress` mode uses Kubernetes Nginx Ingress to expose the connector with TLS passthrough.\n"
+	//+operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Expose Mode",xDescriptors={"urn:alm:descriptor:com.tectonic.ui:text"}
+	ExposeMode *ExposeMode `json:"exposeMode,omitempty"`
 	// Provider used for the keystore; "SUN", "SunJCE", etc. Default is null
 	//+operator-sdk:csv:customresourcedefinitions:type=spec,displayName="KeyStore Provider",xDescriptors={"urn:alm:descriptor:com.tectonic.ui:text"}
 	KeyStoreProvider string `json:"keyStoreProvider,omitempty"`
@@ -587,6 +604,9 @@ type ConsoleType struct {
 	// Whether or not to expose this port
 	//+operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Expose",xDescriptors={"urn:alm:descriptor:com.tectonic.ui:booleanSwitch"}
 	Expose bool `json:"expose,omitempty"`
+	// Mode to expose the console. Currently the supported modes are `route` and `ingress`. Default is `route` on OpenShift and `ingress` on Kubernetes. \n\n* `route` mode uses OpenShift Routes to expose the console.\n* `ingress` mode uses Kubernetes Nginx Ingress to expose the console with TLS passthrough.\n"
+	//+operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Expose Mode",xDescriptors={"urn:alm:descriptor:com.tectonic.ui:text"}
+	ExposeMode *ExposeMode `json:"exposeMode,omitempty"`
 	// Whether or not to enable SSL on this port
 	//+operator-sdk:csv:customresourcedefinitions:type=spec,displayName="SSL Enabled",xDescriptors={"urn:alm:descriptor:com.tectonic.ui:booleanSwitch"}
 	SSLEnabled bool `json:"sslEnabled,omitempty"`
@@ -729,10 +749,13 @@ const (
 	ValidConditionMissingResourcesReason = "MissingDependentResources"
 	ValidConditionInvalidVersionReason   = "SpecVersionInvalid"
 
-	ValidConditionPDBNonNilSelectorReason     = "PodDisruptionBudgetNonNilSelector"
-	ValidConditionFailedReservedLabelReason   = "ReservedLabelReference"
-	ValidConditionFailedExtraMountReason      = "InvalidExtraMount"
-	ValidConditionFailedDuplicateAcceptorPort = "DuplicateAcceptorPort"
+	ValidConditionPDBNonNilSelectorReason              = "PodDisruptionBudgetNonNilSelector"
+	ValidConditionFailedReservedLabelReason            = "ReservedLabelReference"
+	ValidConditionFailedExtraMountReason               = "InvalidExtraMount"
+	ValidConditionFailedDuplicateAcceptorPort          = "DuplicateAcceptorPort"
+	ValidConditionFailedAcceptorWithInvalidExposeMode  = "AcceptorWithInvalidExposeMode"
+	ValidConditionFailedConnectorWithInvalidExposeMode = "ConnectorWithInvalidExposeMode"
+	ValidConditionFailedConsoleWithInvalidExposeMode   = "ConsoelWithInvalidExposeMode"
 
 	ReadyConditionType      = "Ready"
 	ReadyConditionReason    = "ResourceReady"

diff --git a/api/v1beta1/zz_generated.deepcopy.go b/api/v1beta1/zz_generated.deepcopy.go
diff --git a/bundle/manifests/activemq-artemis-operator.clusterserviceversion.yaml b/bundle/manifests/activemq-artemis-operator.clusterserviceversion.yaml
@@ -514,6 +514,15 @@ spec:
         path: acceptors[0].expose
         x-descriptors:
         - urn:alm:descriptor:com.tectonic.ui:booleanSwitch
+      - description: Mode to expose the acceptor. Currently the supported modes are
+          `route` and `ingress`. Default is `route` on OpenShift and `ingress` on
+          Kubernetes. \n\n* `route` mode uses OpenShift Routes to expose the acceptor.\n*
+          `ingress` mode uses Kubernetes Nginx Ingress to expose the acceptor with
+          TLS passthrough.\n"
+        displayName: Expose Mode
+        path: acceptors[0].exposeMode
+        x-descriptors:
+        - urn:alm:descriptor:com.tectonic.ui:text
       - description: 'Host for Ingress and Route resources of the acceptor. It supports
           the following variables: $(CR_NAME), $(CR_NAMESPACE), $(BROKER_ORDINAL),
           $(ITEM_NAME), $(RES_NAME) and $(INGRESS_DOMAIN). Default is $(CR_NAME)-$(ITEM_NAME)-$(BROKER_ORDINAL)-svc-$(RES_TYPE).$(INGRESS_DOMAIN)'
@@ -1033,6 +1042,15 @@ spec:
         path: connectors[0].expose
         x-descriptors:
         - urn:alm:descriptor:com.tectonic.ui:booleanSwitch
+      - description: Mode to expose the connector. Currently the supported modes are
+          `route` and `ingress`. Default is `route` on OpenShift and `ingress` on
+          Kubernetes. \n\n* `route` mode uses OpenShift Routes to expose the connector.\n*
+          `ingress` mode uses Kubernetes Nginx Ingress to expose the connector with
+          TLS passthrough.\n"
+        displayName: Expose Mode
+        path: connectors[0].exposeMode
+        x-descriptors:
+        - urn:alm:descriptor:com.tectonic.ui:text
       - description: Hostname or IP to connect to
         displayName: Host
         path: connectors[0].host
@@ -1127,6 +1145,15 @@ spec:
         path: console.expose
         x-descriptors:
         - urn:alm:descriptor:com.tectonic.ui:booleanSwitch
+      - description: Mode to expose the console. Currently the supported modes are
+          `route` and `ingress`. Default is `route` on OpenShift and `ingress` on
+          Kubernetes. \n\n* `route` mode uses OpenShift Routes to expose the console.\n*
+          `ingress` mode uses Kubernetes Nginx Ingress to expose the console with
+          TLS passthrough.\n"
+        displayName: Expose Mode
+        path: console.exposeMode
+        x-descriptors:
+        - urn:alm:descriptor:com.tectonic.ui:text
       - description: 'Host for Ingress and Route resources of the acceptor. It supports
           the following variables: $(CR_NAME), $(CR_NAMESPACE), $(BROKER_ORDINAL),
           $(ITEM_NAME), $(RES_NAME) and $(INGRESS_DOMAIN). Default is $(CR_NAME)-$(ITEM_NAME)-$(BROKER_ORDINAL)-svc-$(RES_TYPE).$(INGRESS_DOMAIN)'

diff --git a/bundle/manifests/broker.amq.io_activemqartemises.yaml b/bundle/manifests/broker.amq.io_activemqartemises.yaml
@@ -62,6 +62,16 @@ spec:
                     expose:
                       description: Whether or not to expose this acceptor
                       type: boolean
+                    exposeMode:
+                      description: Mode to expose the acceptor. Currently the supported
+                        modes are `route` and `ingress`. Default is `route` on OpenShift
+                        and `ingress` on Kubernetes. \n\n* `route` mode uses OpenShift
+                        Routes to expose the acceptor.\n* `ingress` mode uses Kubernetes
+                        Nginx Ingress to expose the acceptor with TLS passthrough.\n"
+                      enum:
+                      - ingress
+                      - route
+                      type: string
                     ingressHost:
                       description: 'Host for Ingress and Route resources of the acceptor.
                         It supports the following variables: $(CR_NAME), $(CR_NAMESPACE),
@@ -475,6 +485,16 @@ spec:
                     expose:
                       description: Whether or not to expose this connector
                       type: boolean
+                    exposeMode:
+                      description: Mode to expose the connector. Currently the supported
+                        modes are `route` and `ingress`. Default is `route` on OpenShift
+                        and `ingress` on Kubernetes. \n\n* `route` mode uses OpenShift
+                        Routes to expose the connector.\n* `ingress` mode uses Kubernetes
+                        Nginx Ingress to expose the connector with TLS passthrough.\n"
+                      enum:
+                      - ingress
+                      - route
+                      type: string
                     host:
                       description: Hostname or IP to connect to
                       type: string
@@ -547,6 +567,16 @@ spec:
                   expose:
                     description: Whether or not to expose this port
                     type: boolean
+                  exposeMode:
+                    description: Mode to expose the console. Currently the supported
+                      modes are `route` and `ingress`. Default is `route` on OpenShift
+                      and `ingress` on Kubernetes. \n\n* `route` mode uses OpenShift
+                      Routes to expose the console.\n* `ingress` mode uses Kubernetes
+                      Nginx Ingress to expose the console with TLS passthrough.\n"
+                    enum:
+                    - ingress
+                    - route
+                    type: string
                   ingressHost:
                     description: 'Host for Ingress and Route resources of the acceptor.
                       It supports the following variables: $(CR_NAME), $(CR_NAMESPACE),

diff --git a/config/crd/bases/broker.amq.io_activemqartemises.yaml b/config/crd/bases/broker.amq.io_activemqartemises.yaml
@@ -63,6 +63,16 @@ spec:
                     expose:
                       description: Whether or not to expose this acceptor
                       type: boolean
+                    exposeMode:
+                      description: Mode to expose the acceptor. Currently the supported
+                        modes are `route` and `ingress`. Default is `route` on OpenShift
+                        and `ingress` on Kubernetes. \n\n* `route` mode uses OpenShift
+                        Routes to expose the acceptor.\n* `ingress` mode uses Kubernetes
+                        Nginx Ingress to expose the acceptor with TLS passthrough.\n"
+                      enum:
+                      - ingress
+                      - route
+                      type: string
                     ingressHost:
                       description: 'Host for Ingress and Route resources of the acceptor.
                         It supports the following variables: $(CR_NAME), $(CR_NAMESPACE),
@@ -476,6 +486,16 @@ spec:
                     expose:
                       description: Whether or not to expose this connector
                       type: boolean
+                    exposeMode:
+                      description: Mode to expose the connector. Currently the supported
+                        modes are `route` and `ingress`. Default is `route` on OpenShift
+                        and `ingress` on Kubernetes. \n\n* `route` mode uses OpenShift
+                        Routes to expose the connector.\n* `ingress` mode uses Kubernetes
+                        Nginx Ingress to expose the connector with TLS passthrough.\n"
+                      enum:
+                      - ingress
+                      - route
+                      type: string
                     host:
                       description: Hostname or IP to connect to
                       type: string
@@ -548,6 +568,16 @@ spec:
                   expose:
                     description: Whether or not to expose this port
                     type: boolean
+                  exposeMode:
+                    description: Mode to expose the console. Currently the supported
+                      modes are `route` and `ingress`. Default is `route` on OpenShift
+                      and `ingress` on Kubernetes. \n\n* `route` mode uses OpenShift
+                      Routes to expose the console.\n* `ingress` mode uses Kubernetes
+                      Nginx Ingress to expose the console with TLS passthrough.\n"
+                    enum:
+                    - ingress
+                    - route
+                    type: string
                   ingressHost:
                     description: 'Host for Ingress and Route resources of the acceptor.
                       It supports the following variables: $(CR_NAME), $(CR_NAMESPACE),

diff --git a/config/manifests/bases/activemq-artemis-operator.clusterserviceversion.yaml b/config/manifests/bases/activemq-artemis-operator.clusterserviceversion.yaml
@@ -288,6 +288,15 @@ spec:
         path: acceptors[0].expose
         x-descriptors:
         - urn:alm:descriptor:com.tectonic.ui:booleanSwitch
+      - description: Mode to expose the acceptor. Currently the supported modes are
+          `route` and `ingress`. Default is `route` on OpenShift and `ingress` on
+          Kubernetes. \n\n* `route` mode uses OpenShift Routes to expose the acceptor.\n*
+          `ingress` mode uses Kubernetes Nginx Ingress to expose the acceptor with
+          TLS passthrough.\n"
+        displayName: Expose Mode
+        path: acceptors[0].exposeMode
+        x-descriptors:
+        - urn:alm:descriptor:com.tectonic.ui:text
       - description: 'Host for Ingress and Route resources of the acceptor. It supports
           the following variables: $(CR_NAME), $(CR_NAMESPACE), $(BROKER_ORDINAL),
           $(ITEM_NAME), $(RES_NAME) and $(INGRESS_DOMAIN). Default is $(CR_NAME)-$(ITEM_NAME)-$(BROKER_ORDINAL)-svc-$(RES_TYPE).$(INGRESS_DOMAIN)'
@@ -807,6 +816,15 @@ spec:
         path: connectors[0].expose
         x-descriptors:
         - urn:alm:descriptor:com.tectonic.ui:booleanSwitch
+      - description: Mode to expose the connector. Currently the supported modes are
+          `route` and `ingress`. Default is `route` on OpenShift and `ingress` on
+          Kubernetes. \n\n* `route` mode uses OpenShift Routes to expose the connector.\n*
+          `ingress` mode uses Kubernetes Nginx Ingress to expose the connector with
+          TLS passthrough.\n"
+        displayName: Expose Mode
+        path: connectors[0].exposeMode
+        x-descriptors:
+        - urn:alm:descriptor:com.tectonic.ui:text
       - description: Hostname or IP to connect to
         displayName: Host
         path: connectors[0].host
@@ -901,6 +919,15 @@ spec:
         path: console.expose
         x-descriptors:
         - urn:alm:descriptor:com.tectonic.ui:booleanSwitch
+      - description: Mode to expose the console. Currently the supported modes are
+          `route` and `ingress`. Default is `route` on OpenShift and `ingress` on
+          Kubernetes. \n\n* `route` mode uses OpenShift Routes to expose the console.\n*
+          `ingress` mode uses Kubernetes Nginx Ingress to expose the console with
+          TLS passthrough.\n"
+        displayName: Expose Mode
+        path: console.exposeMode
+        x-descriptors:
+        - urn:alm:descriptor:com.tectonic.ui:text
       - description: 'Host for Ingress and Route resources of the acceptor. It supports
           the following variables: $(CR_NAME), $(CR_NAMESPACE), $(BROKER_ORDINAL),
           $(ITEM_NAME), $(RES_NAME) and $(INGRESS_DOMAIN). Default is $(CR_NAME)-$(ITEM_NAME)-$(BROKER_ORDINAL)-svc-$(RES_TYPE).$(INGRESS_DOMAIN)'