IBMStockTrader · jwalcorn · Jun 23, 2022 · Mar 18, 2022 · Mar 18, 2022 · Mar 18, 2022
diff --git a/bundle/manifests/operators.ibm.com_stocktraders.yaml b/bundle/manifests/operators.ibm.com_stocktraders.yaml
@@ -456,20 +456,27 @@ spec:
                     type: string
                 type: object
               mq:
-                description: IBM MQ settings (optional)
+                description: MQ settings (optional)
                 properties:
+                  kind:
+                    description: Kind of MQ Provider
+                    enum:
+                      - ibm-mq
+                      - amazon-mq-apache-mq
+                    type: string
                   channel:
                     description: Channel
                     type: string
+                  url:
+                    description: >-
+                      Connection string with protocol(s) and port
+                    type: string
                   host:
                     description: Host name (or IP address)
                     type: string
                   id:
                     description: User ID
                     type: string
-                  kind:
-                    description: MQ vendor
-                    type: string
                   password:
                     description: Password
                     format: password

diff --git a/bundle/manifests/operators_v1_stocktrader.yaml b/bundle/manifests/operators_v1_stocktrader.yaml
@@ -187,6 +187,7 @@ spec:
   mq:
     kind: ibm-mq
     host: mqtrader1-mqtrader1
+    url: ssl://mqtrader-amazonaws.com:61617
     port: 1414
     id: app
     password: pwd

diff --git a/bundle/manifests/stocktrader-operator.clusterserviceversion.yaml b/bundle/manifests/stocktrader-operator.clusterserviceversion.yaml
@@ -245,6 +245,7 @@ metadata:
             "mq": {
               "kind": "ibm-mq",
               "host": "mqtrader1-mqtrader1",
+              "url": "ssl://mqtrader-amazonaws.com:61617",
               "port": 1414,
               "id": "app",
               "password": "pwd",
@@ -1335,7 +1336,7 @@ spec:
 
           # Section for MQ settings
           - path: mq
-            displayName: IBM MQ settings
+            displayName: MQ settings
           - path: mq.kind
             description: This controls which JMS resource adapter (.rar file) gets loaded and how it is configured
             displayName: Select the appropriate MQ vendor for point-to-point messaging
@@ -1348,6 +1349,12 @@ spec:
             x-descriptors:
               - urn:alm:descriptor:com.tectonic.ui:text
               - urn:alm:descriptor:com.tectonic.ui:fieldGroup:mq
+          - path: mq.url
+            description: Connection string for MQ
+            displayName: MQ connection string [ssl:// or failover://(ssl://..)]
+            x-descriptors:
+              - urn:alm:descriptor:com.tectonic.ui:text
+              - urn:alm:descriptor:com.tectonic.ui:fieldGroup:mq
           - path: mq.port
             description: Use the local port number (not the node port or Ingress port) if using an intra-cluster deployment of MQ
             displayName: Port number for MQ

diff --git a/config/crd/bases/operators.ibm.com_stocktraders.yaml b/config/crd/bases/operators.ibm.com_stocktraders.yaml
@@ -456,13 +456,18 @@ spec:
                     type: string
                 type: object
               mq:
-                description: IBM MQ settings (optional)
+                description: MQ settings (optional)
                 properties:
                   channel:
                     description: Channel
                     type: string
+                  url:
+                    description: >-
+                      Connection string with protocol(s) and port
+                    type: string
                   host:
-                    description: Host name (or IP address)
+                    description: >-
+                      Host name, connection string, or IP address
                     type: string
                   id:
                     description: User ID

diff --git a/config/manifests/bases/stocktrader-operator.clusterserviceversion.yaml b/config/manifests/bases/stocktrader-operator.clusterserviceversion.yaml
@@ -243,7 +243,6 @@ metadata:
               "url": "http://odmtrader1-ibm-odm-dev:9060/DecisionService/rest/ICP_Trader_Dev_1/determineLoyalty"
             },
             "mq": {
-              "kind": "ibm-mq",
               "host": "mqtrader1-mqtrader1",
               "port": 1414,
               "id": "app",
@@ -1335,7 +1334,7 @@ spec:
 
           # Section for MQ settings
           - path: mq
-            displayName: IBM MQ settings
+            displayName: MQ settings
           - path: mq.kind
             description: This controls which JMS resource adapter (.rar file) gets loaded and how it is configured
             displayName: Select the appropriate MQ vendor for point-to-point messaging
@@ -1348,6 +1347,12 @@ spec:
             x-descriptors:
               - urn:alm:descriptor:com.tectonic.ui:text
               - urn:alm:descriptor:com.tectonic.ui:fieldGroup:mq
+          - path: mq.url
+            description: Connection string for MQ
+            displayName: MQ connection string [ssl:// or failover://(ssl://..)]
+            x-descriptors:
+              - urn:alm:descriptor:com.tectonic.ui:text
+              - urn:alm:descriptor:com.tectonic.ui:fieldGroup:mq
           - path: mq.port
             description: Use the local port number (not the node port or Ingress port) if using an intra-cluster deployment of MQ
             displayName: Port number for MQ

diff --git a/config/samples/operators_v1_stocktrader.yaml b/config/samples/operators_v1_stocktrader.yaml
@@ -188,6 +188,7 @@ spec:
     kind: ibm-mq
     host: mqtrader1-mqtrader1
     port: 1414
+    url: ssl://mqtrader-amazonaws.com:61617
     id: app
     password: pwd
     queueManager: stocktrader

diff --git a/helm-charts/stocktrader/templates/account.yaml b/helm-charts/stocktrader/templates/account.yaml
@@ -59,6 +59,18 @@ spec:
         sidecar.istio.io/inject: 'true'
 {{- end }}
     spec:
+      affinity:
+        podAntiAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+            - weight: 1
+              podAffinityTerm:
+                labelSelector:
+                  matchExpressions:
+                    - key: app
+                      operator: In
+                      values:
+                        - account
+                topologyKey: "kubernetes.io/hostname"
 {{- if .Values.global.pullSecret }}
       imagePullSecrets:
       - name: {{ tpl .Values.global.pullSecretName . }}
@@ -146,6 +158,11 @@ spec:
               configMapKeyRef:
                 name: {{ tpl .Values.global.configMapName . }}
                 key: mq.kind
+          - name: MQ_URL
+            valueFrom:
+              configMapKeyRef:
+                name: {{ tpl .Values.global.configMapName . }}
+                key: mq.url
           - name: MQ_HOST
             valueFrom:
               configMapKeyRef:
@@ -288,6 +305,49 @@ spec:
 {{- if .Values.account.autoscale }}
 ---
 #Deploy the autoscaler
+{{- if .Capabilities.APIVersions.Has "autoscaling/v2" }}
+apiVersion: autoscaling/v2
+kind: HorizontalPodAutoscaler
+metadata:
+  name: {{ .Release.Name }}-account-hpa
+  labels:
+    app: stock-trader
+spec:
+  behavior:
+    scaleUp:
+      stabilizationWindowSeconds: 0
+      selectPolicy: Min
+      policies:
+        - type: Pods
+          value: 1
+          periodSeconds: 15
+    scaleDown:
+      stabilizationWindowSeconds: 300
+      selectPolicy: Max
+      policies:
+        - type: Percent
+          value: 100
+          periodSeconds: 120
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: {{ .Release.Name }}-account
+  minReplicas: {{ .Values.account.replicas }}
+  maxReplicas: {{ .Values.account.maxReplicas }}
+  metrics:
+    - type: Resource
+      resource:
+        name: cpu
+        target:
+          type: Utilization
+          averageUtilization: {{ .Values.account.cpuThreshold }}
+    - type: Resource
+      resource:
+        name: memory
+        target:
+          type: Utilization
+          averageUtilization: 80
+{{- else }}
 apiVersion: autoscaling/v2beta2
 kind: HorizontalPodAutoscaler
 metadata:
@@ -316,7 +376,14 @@ spec:
     name: {{ .Release.Name }}-account
   minReplicas: {{ .Values.account.replicas }}
   maxReplicas: {{ .Values.account.maxReplicas }}
-  targetCPUUtilizationPercentage: {{ .Values.account.cpuThreshold }}
+  metrics:
+    - type: Resource
+      resource:
+        name: cpu
+        target:
+          type: Utilization
+          averageUtilization: {{ .Values.account.cpuThreshold }}
+{{- end }}
 {{- end }}
 ---
 #Deploy the service

diff --git a/helm-charts/stocktrader/templates/broker-query.yaml b/helm-charts/stocktrader/templates/broker-query.yaml
@@ -53,6 +53,18 @@ spec:
         sidecar.istio.io/inject: 'true'
 {{- end }}
     spec:
+      affinity:
+        podAntiAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+            - weight: 1
+              podAffinityTerm:
+                labelSelector:
+                  matchExpressions:
+                    - key: app
+                      operator: In
+                      values:
+                        - broker-query
+                topologyKey: "kubernetes.io/hostname"
 {{- if .Values.global.pullSecret }}
       imagePullSecrets:
       - name: {{ tpl .Values.global.pullSecretName . }}
@@ -192,6 +204,49 @@ spec:
 {{- if .Values.brokerCQRS.autoscale }}
 ---
 #Deploy the autoscaler
+{{- if .Capabilities.APIVersions.Has "autoscaling/v2" }}
+apiVersion: autoscaling/v2
+kind: HorizontalPodAutoscaler
+metadata:
+  name: {{ .Release.Name }}-broker-query-hpa
+  labels:
+    app: stock-trader
+spec:
+  behavior:
+    scaleUp:
+      stabilizationWindowSeconds: 0
+      selectPolicy: Min
+      policies:
+        - type: Pods
+          value: 1
+          periodSeconds: 15
+    scaleDown:
+      stabilizationWindowSeconds: 300
+      selectPolicy: Max
+      policies:
+        - type: Percent
+          value: 100
+          periodSeconds: 120
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: {{ .Release.Name }}-broker-query
+  minReplicas: {{ .Values.brokerCQRS.replicas }}
+  maxReplicas: {{ .Values.brokerCQRS.maxReplicas }}
+  metrics:
+    - type: Resource
+      resource:
+        name: cpu
+        target:
+          type: Utilization
+          averageUtilization: {{ .Values.brokerCQRS.cpuThreshold }}
+    - type: Resource
+      resource:
+        name: memory
+        target:
+          type: Utilization
+          averageUtilization: 80
+{{- else }}
 apiVersion: autoscaling/v2beta2
 kind: HorizontalPodAutoscaler
 metadata:
@@ -220,7 +275,14 @@ spec:
     name: {{ .Release.Name }}-broker-query
   minReplicas: {{ .Values.brokerCQRS.replicas }}
   maxReplicas: {{ .Values.brokerCQRS.maxReplicas }}
-  targetCPUUtilizationPercentage: {{ .Values.brokerCQRS.cpuThreshold }}
+  metrics:
+    - type: Resource
+      resource:
+        name: cpu
+        target:
+          type: Utilization
+          averageUtilization: {{ .Values.brokerCQRS.cpuThreshold }}
+{{- end }}
 {{- end }}
 ---
 #Deploy the service

diff --git a/helm-charts/stocktrader/templates/broker.yaml b/helm-charts/stocktrader/templates/broker.yaml
@@ -42,6 +42,18 @@ spec:
         sidecar.istio.io/inject: 'true'
 {{- end }}
     spec:
+      affinity:
+        podAntiAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+            - weight: 1
+              podAffinityTerm:
+                labelSelector:
+                  matchExpressions:
+                    - key: app
+                      operator: In
+                      values:
+                        - broker
+                topologyKey: "kubernetes.io/hostname"
 {{- if .Values.global.pullSecret }}
       imagePullSecrets:
       - name: {{ tpl .Values.global.pullSecretName . }}
@@ -158,6 +170,49 @@ spec:
 {{- if .Values.broker.autoscale }}
 ---
 #Deploy the autoscaler
+{{- if .Capabilities.APIVersions.Has "autoscaling/v2" }}
+apiVersion: autoscaling/v2
+kind: HorizontalPodAutoscaler
+metadata:
+  name: {{ .Release.Name }}-broker-hpa
+  labels:
+    app: stock-trader
+spec:
+  behavior:
+    scaleUp:
+      stabilizationWindowSeconds: 0
+      selectPolicy: Min
+      policies:
+        - type: Pods
+          value: 1
+          periodSeconds: 15
+    scaleDown:
+      stabilizationWindowSeconds: 300
+      selectPolicy: Max
+      policies:
+        - type: Percent
+          value: 100
+          periodSeconds: 120
+  scaleTargetRef:
+    apiVersion: apps/v1
+    kind: Deployment
+    name: {{ .Release.Name }}-broker
+  minReplicas: {{ .Values.broker.replicas }}
+  maxReplicas: {{ .Values.broker.maxReplicas }}
+  metrics:
+    - type: Resource
+      resource:
+        name: cpu
+        target:
+          type: Utilization
+          averageUtilization: {{ .Values.broker.cpuThreshold }}
+    - type: Resource
+      resource:
+        name: memory
+        target:
+          type: Utilization
+          averageUtilization: 80
+{{- else }}
 apiVersion: autoscaling/v2beta2
 kind: HorizontalPodAutoscaler
 metadata:
@@ -186,7 +241,14 @@ spec:
     name: {{ .Release.Name }}-broker
   minReplicas: {{ .Values.broker.replicas }}
   maxReplicas: {{ .Values.broker.maxReplicas }}
-  targetCPUUtilizationPercentage: {{ .Values.broker.cpuThreshold }}
+  metrics:
+    - type: Resource
+      resource:
+        name: cpu
+        target:
+          type: Utilization
+          averageUtilization: {{ .Values.broker.cpuThreshold }}
+{{- end }}
 {{- end }}
 ---
 #Deploy the service