Skip to content

Commit

Permalink
Merge branch 'master' into pr-mongover
Browse files Browse the repository at this point in the history
  • Loading branch information
whitfiea committed May 14, 2024
2 parents db94052 + 6876e04 commit e498fd7
Show file tree
Hide file tree
Showing 20 changed files with 443 additions and 8 deletions.
6 changes: 6 additions & 0 deletions docs/commands/install.md
Expand Up @@ -345,6 +345,12 @@ Currently supported config files:
- ibm-mas-iot-registry.yml
- ibm-mas-iot-state.yml
- ibm-mas-iot-webui.yml
- ibm-mas-manage
- ibm-mas-manage-manageapp.yml
- ibm-mas-manage-manageworkspace.yml
- ibm-mas-manage-imagestitching.yml
- ibm-mas-manage-slackproxy.yml
- ibm-mas-manage-healthextworkspace.yml

For examples on these config files take a look into the pre-defined configs: [BestEffort](https://github.com/ibm-mas/cli/blob/master/image/cli/mascli/templates/pod-templates/best-effort) and [Guaranteed](https://github.com/ibm-mas/cli/blob/master/image/cli/mascli/templates/pod-templates/guaranteed). More information on podTemplates can be found in our official IBM documentation [here](https://www.ibm.com/docs/en/mas-cd/continuous-delivery?topic=configuring-customizing-workloads).

Expand Down
Expand Up @@ -90,6 +90,11 @@ function install_pipelinerun_prepare() {
--from-file=${MAS_POD_TEMPLATES_DIR:+$MAS_POD_TEMPLATES_DIR/ibm-mas-iot-registry.yml} \
--from-file=${MAS_POD_TEMPLATES_DIR:+$MAS_POD_TEMPLATES_DIR/ibm-mas-iot-state.yml} \
--from-file=${MAS_POD_TEMPLATES_DIR:+$MAS_POD_TEMPLATES_DIR/ibm-mas-iot-webui.yml} \
--from-file=${MAS_POD_TEMPLATES_DIR:+$MAS_POD_TEMPLATES_DIR/ibm-mas-manage-manageapp.yml} \
--from-file=${MAS_POD_TEMPLATES_DIR:+$MAS_POD_TEMPLATES_DIR/ibm-mas-manage-manageworkspace.yml} \
--from-file=${MAS_POD_TEMPLATES_DIR:+$MAS_POD_TEMPLATES_DIR/ibm-mas-manage-imagestitching.yml} \
--from-file=${MAS_POD_TEMPLATES_DIR:+$MAS_POD_TEMPLATES_DIR/ibm-mas-manage-slackproxy.yml} \
--from-file=${MAS_POD_TEMPLATES_DIR:+$MAS_POD_TEMPLATES_DIR/ibm-mas-manage-healthextworkspace.yml} \
--from-file=${MAS_POD_TEMPLATES_DIR:+$MAS_POD_TEMPLATES_DIR/ibm-sls-licenseservice.yml} &>> $LOGFILE
else
# pipeline-pod-templates must exist (otherwise the suite-install step will hang), but can be empty
Expand Down
@@ -0,0 +1,10 @@
# podTemplates
# ===================================================================================
# This list defines the resources for Deployment: Suite.
# The pod gets tested for scaling and affinity.
# The containers that get tested for resources - QoS class of Guaranteed and Burstable.
podTemplates:
- name: healthext-model-engine
containers:
- name: healthext-model-engine
resources: {}
@@ -0,0 +1,10 @@
# podTemplates
# ===================================================================================
# This list defines the resources for Deployment: Suite.
# The pod gets tested for scaling and affinity.
# The containers that get tested for resources - QoS class of Guaranteed and Burstable.
podTemplates:
- name: imagestitching
containers:
- name: image-stitching
resources: {}
@@ -0,0 +1,42 @@
# podTemplates
# ===================================================================================
# This list defines the resources for Deployment: Suite.
# The pod gets tested for scaling and affinity.
# The containers that get tested for resources - QoS class of Guaranteed and Burstable.
podTemplates:
- name: entitymgr-primary-entity
containers:
- name: manager
resources: {}
- name: entitymgr-appstatus
containers:
- name: manager
resources: {}
- name: entitymgr-bdi
containers:
- name: manager
resources: {}
- name: entitymgr-ws
containers:
- name: manager
resources: {}
- name: usersyncagent
containers:
- name: manage-usersyncagent
resources: {}
- name: groupsyncagent
containers:
- name: manage-groupsyncagent
resources: {}
- name: ibm-mas-imagestitching-operator
containers:
- name: imagestitching
resources: {}
- name: ibm-mas-slackproxy-operator
containers:
- name: slackproxy
resources: {}
- name: healthext-entitymgr-ws
containers:
- name: healthext
resources: {}
@@ -0,0 +1,48 @@
# podTemplates
# ===================================================================================
# This list defines the resources for Deployment: Suite.
# The pod gets tested for scaling and affinity.
# The containers that get tested for resources - QoS class of Guaranteed and Burstable.
podTemplates:
- name: monitoragent
containers:
- name: monitoragent
resources: {}
- name: manage-maxinst
containers:
- name: manage-maxinst-maxinst
resources: {}
- name: all
containers:
- name: all
resources: {}
- name: monitoragent
resources: {}
- name: ui
containers:
- name: ui
resources: {}
- name: monitoragent
resources: {}
- name: mea
containers:
- name: mea
resources: {}
- name: monitoragent
resources: {}
- name: rpt
containers:
- name: rpt
resources: {}
- name: monitoragent
resources: {}
- name: cron
containers:
- name: cron
resources: {}
- name: monitoragent
resources: {}
- name: jms
containers:
- name: jms
resources: {}
@@ -0,0 +1,10 @@
# podTemplates
# ===================================================================================
# This list defines the resources for Deployment: Suite.
# The pod gets tested for scaling and affinity.
# The containers that get tested for resources - QoS class of Guaranteed and Burstable.
podTemplates:
- name: slackproxy
containers:
- name: slack-proxy
resources: {}
@@ -0,0 +1,18 @@
# podTemplates
# ===================================================================================
# This list defines the resources for Deployment: Suite.
# The pod gets tested for scaling and affinity.
# The containers that get tested for resources - QoS class of Guaranteed and Burstable.
podTemplates:
- name: healthext-model-engine
containers:
- name: healthext-model-engine
resources:
requests:
cpu: 1000m
ephemeral-storage: 2Gi
memory: 1Gi
limits:
cpu: 1000m
ephemeral-storage: 2Gi
memory: 1Gi
@@ -0,0 +1,16 @@
# podTemplates
# ===================================================================================
# This list defines the resources for Deployment: Suite.
# The pod gets tested for scaling and affinity.
# The containers that get tested for resources - QoS class of Guaranteed and Burstable.
podTemplates:
- name: imagestitching
containers:
- name: image-stitching
resources:
requests:
cpu: 3
memory: 16Gi
limits:
cpu: 3
memory: 16Gi
@@ -0,0 +1,96 @@
# podTemplates
# ===================================================================================
# This list defines the resources for Deployment: Suite.
# The pod gets tested for scaling and affinity.
# The containers that get tested for resources - QoS class of Guaranteed and Burstable.
podTemplates:
- name: entitymgr-primary-entity
containers:
- name: manager
resources:
requests:
cpu: 0.2
memory: 512Mi
limits:
cpu: 0.2
memory: 512Mi
- name: entitymgr-appstatus
containers:
- name: manager
resources:
requests:
cpu: 0.8
memory: 1024Mi
limits:
cpu: 0.8
memory: 1024Mi
- name: entitymgr-bdi
containers:
- name: manager
resources:
requests:
cpu: 0.8
memory: 1024Mi
limits:
cpu: 0.8
memory: 1024Mi
- name: entitymgr-ws
containers:
- name: manager
resources:
requests:
cpu: 0.8
memory: 2Gi
limits:
cpu: 0.8
memory: 2Gi
- name: usersyncagent
containers:
- name: manage-usersyncagent
resources:
requests:
cpu: 0.25
memory: 256Mi
limits:
cpu: 0.25
memory: 256Mi
- name: groupsyncagent
containers:
- name: manage-groupsyncagent
resources:
requests:
cpu: 0.25
memory: 256Mi
limits:
cpu: 0.25
memory: 256Mi
- name: ibm-mas-imagestitching-operator
containers:
- name: imagestitching
resources:
requests:
cpu: 500m
memory: 1024Mi
limits:
cpu: 500m
memory: 1024Mi
- name: ibm-mas-slackproxy-operator
containers:
- name: slackproxy
resources:
requests:
cpu: 1
memory: 1024Mi
limits:
cpu: 1
memory: 1024Mi
- name: healthext-entitymgr-ws
containers:
- name: healthext
resources:
requests:
cpu: 1
memory: 1024Mi
limits:
cpu: 1
memory: 1024Mi

0 comments on commit e498fd7

Please sign in to comment.