Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[minor] Add manage onlineUpgrade support for gitops + skip deprovision tasks based on edition #1391

Merged
merged 5 commits into from
Dec 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion image/cli/mascli/functions/gitops_suite_app_config
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ Maximo Manage:
masdev-manage-d-sbNascsn: <<base64 encoded content of masdev-manage-dsbNasc-sn.xml>>

--mas-app-global-secrets-yaml ${COLOR_YELLOW}MAS_APP_GLOBAL_SECRETS_YAML${TEXT_RESET} yaml file location containing secret key/values that will be added to the Manage encryption secret

--manage-update-schedule ${COLOR_YELLOW}MANAGE_UPDATE_SCHEDULE${TEXT_RESET} cron based schedule to indicate when manage will do the offline update when the onlineUpgrade is set in the ManageWorkspace CR. Optional as default is "0 0 * * *"

Secrets Manager:
--secrets-path ${COLOR_YELLOW}SECRETS_PATH${TEXT_RESET} Secrets Manager path
Expand Down Expand Up @@ -183,6 +183,9 @@ function gitops_suite_app_config_noninteractive() {
--mas-app-global-secrets-yaml)
export MAS_APP_GLOBAL_SECRETS_YAML=$1 && shift
;;
--manage-update-schedule)
export MANAGE_UPDATE_SCHEDULE=$1 && shift
;;

# Automatic GitHub Push
-P|--github-push)
Expand Down Expand Up @@ -331,6 +334,7 @@ function gitops_suite_app_config() {
echo_reset_dim "Application WS Spec Yaml file ........... ${COLOR_MAGENTA}${MAS_APPWS_SPEC_YAML}"
echo_reset_dim "Combined additional server configs ...... ${COLOR_MAGENTA}${MAS_APP_SERVER_BUNDLES_COMBINED_ADD_SERVER_CONFIG_YAML}"
echo_reset_dim "Global Secrets (Manage) ................. ${COLOR_MAGENTA}${MAS_APP_GLOBAL_SECRETS_YAML}"
echo_reset_dim "Manage Update Schedule ................. ${COLOR_MAGENTA}${MANAGE_UPDATE_SCHEDULE}"

if [[ -n "$MAS_APPWS_SPEC_YAML" ]] && [[ -s "$MAS_APPWS_SPEC_YAML" ]]; then
echo_reset_dim "Using Default Application Spec ........ ${COLOR_MAGENTA}False"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,16 @@ db2_logs_storage_accessmode: {{DB2_LOGS_STORAGE_ACCESSMODE}}
db2_audit_logs_storage_class: {{DB2_AUDIT_LOGS_STORAGE_CLASS}}
db2_audit_logs_storage_size: {{DB2_AUDIT_LOGS_STORAGE_SIZE}}
db2_audit_logs_storage_accessmode: {{DB2_AUDIT_LOGS_STORAGE_ACCESSMODE}}
{% if DB2_TEMP_STORAGE_CLASS %}
db2_temp_storage_class: {{DB2_TEMP_STORAGE_CLASS}}
db2_temp_storage_size: {{DB2_TEMP_STORAGE_SIZE}}
db2_temp_storage_accessmode: {{DB2_TEMP_STORAGE_ACCESSMODE}}
{% endif %}
{% if DB2_ARCHIVELOGS_STORAGE_CLASS %}
db2_archivelogs_storage_class: {{DB2_ARCHIVELOGS_STORAGE_CLASS}}
db2_archivelogs_storage_size: {{DB2_ARCHIVELOGS_STORAGE_SIZE}}
db2_archivelogs_storage_accessmode: {{DB2_ARCHIVELOGS_STORAGE_ACCESSMODE}}
{% endif %}
db2_cpu_requests: {{DB2_CPU_REQUESTS}}
db2_cpu_limits: {{DB2_CPU_LIMITS}}
db2_memory_requests: {{DB2_MEMORY_REQUESTS}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,10 @@ manage_logging_access_secret_key: <path:{{ SECRETS_PATH }}:{{ MANAGE_LOGGING_SEC
{{ MAS_APP_GLOBAL_SECRETS | indent(2) }}
{%- endif %}

{%- if MANAGE_UPDATE_SCHEDULE is defined and MANAGE_UPDATE_SCHEDULE !='' %}
manage_update_schedule: {{ MANAGE_UPDATE_SCHEDULE }}
{%- endif %}

{{ MAS_APPWS_SPEC | indent(2) }}

{% if MAS_MANUAL_CERT_MGMT == 'true' %}
Expand Down
66 changes: 64 additions & 2 deletions tekton/src/pipelines/gitops/gitops-mas-apps.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -355,6 +355,9 @@ spec:
- name: mas_app_global_secrets_yaml_manage
type: string
default: ""
- name: manage_update_schedule
type: string
default: ""

- name: mas_app_channel_monitor
type: string
Expand Down Expand Up @@ -704,7 +707,7 @@ spec:
- name: configs
workspace: configs
- name: shared-gitops-configs
workspace: shared-gitops-configs
workspace: shared-gitops-configs
taskRef:
kind: Task
name: gitops-jdbc-config
Expand Down Expand Up @@ -1395,6 +1398,9 @@ spec:
- input: "$(params.monitor_workspace_action)"
operator: in
values: ["deactivate", ""]
- input: "$(params.mas_edition)"
operator: in
values: ["standard", "premium"]

# 1.2 Monitor App Deprovision
- name: gitops-deprovision-mas-app-install-monitor
Expand All @@ -1420,6 +1426,9 @@ spec:
- input: "$(params.mas_app_channel_monitor)"
operator: in
values: [""]
- input: "$(params.mas_edition)"
operator: in
values: ["standard", "premium"]

# 2. Predict Deprovision
# -------------------------------------------------------------------------
Expand Down Expand Up @@ -1447,6 +1456,9 @@ spec:
- input: "$(params.predict_workspace_action)"
operator: in
values: ["deactivate", ""]
- input: "$(params.mas_edition)"
operator: in
values: ["standard", "premium"]

# 2.2 Predict App
- name: gitops-deprovision-mas-app-install-predict
Expand All @@ -1472,6 +1484,9 @@ spec:
- input: "$(params.mas_app_channel_predict)"
operator: in
values: [""]
- input: "$(params.mas_edition)"
operator: in
values: ["standard", "premium"]

# 3. Visualinspection Deprovision
# -------------------------------------------------------------------------
Expand Down Expand Up @@ -1499,6 +1514,9 @@ spec:
- input: "$(params.visualinspection_workspace_action)"
operator: in
values: ["deactivate", ""]
- input: "$(params.mas_edition)"
operator: in
values: ["essentials-inspection", "standard", "premium"]

# 3.2 Visualinspection App
- name: gitops-deprovision-mas-app-install-visualinspection
Expand All @@ -1524,6 +1542,9 @@ spec:
- input: "$(params.mas_app_channel_visualinspection)"
operator: in
values: [""]
- input: "$(params.mas_edition)"
operator: in
values: ["essentials-inspection", "standard", "premium"]

# 4. Optimizer Deprovision
# -------------------------------------------------------------------------
Expand Down Expand Up @@ -1551,6 +1572,9 @@ spec:
- input: "$(params.optimizer_workspace_action)"
operator: in
values: ["deactivate", ""]
- input: "$(params.mas_edition)"
operator: in
values: ["essentials-maintenance", "standard", "premium"]

# 4.2 Optimizer App
- name: gitops-deprovision-mas-app-install-optimizer
Expand All @@ -1576,6 +1600,9 @@ spec:
- input: "$(params.mas_app_channel_optimizer)"
operator: in
values: [""]
- input: "$(params.mas_edition)"
operator: in
values: ["essentials-maintenance", "standard", "premium"]

# 5. Assist Deprovision
# -------------------------------------------------------------------------
Expand Down Expand Up @@ -1603,6 +1630,9 @@ spec:
- input: "$(params.assist_workspace_action)"
operator: in
values: ["deactivate", ""]
- input: "$(params.mas_edition)"
operator: in
values: ["standard", "premium"]

# 5.2 Assist App
- name: gitops-deprovision-mas-app-install-assist
Expand All @@ -1628,6 +1658,9 @@ spec:
- input: "$(params.mas_app_channel_assist)"
operator: in
values: [""]
- input: "$(params.mas_edition)"
operator: in
values: ["standard", "premium"]

# 6. Manage Deprovision
# -------------------------------------------------------------------------
Expand Down Expand Up @@ -1659,6 +1692,9 @@ spec:
- input: "$(params.manage_workspace_action)"
operator: in
values: ["deactivate", ""]
- input: "$(params.mas_edition)"
operator: in
values: ["essentials-maintenance", "standard", "premium"]

# 6.2 Manage App
- name: gitops-deprovision-mas-app-install-manage
Expand All @@ -1684,7 +1720,9 @@ spec:
- input: "$(params.mas_app_channel_manage)"
operator: in
values: [""]

- input: "$(params.mas_edition)"
operator: in
values: ["essentials-maintenance", "standard", "premium"]

# 6.3 Manage Database
- name: gitops-deprovision-db2u-database-manage
Expand All @@ -1710,6 +1748,9 @@ spec:
- input: "$(params.mas_app_channel_manage)"
operator: in
values: [""]
- input: "$(params.mas_edition)"
operator: in
values: ["essentials-maintenance", "standard", "premium"]

# 6.4 Manage JDBC Config
- name: gitops-delete-jdbc-config-manage
Expand Down Expand Up @@ -1748,6 +1789,9 @@ spec:
- input: "$(params.mas_app_channel_manage)"
operator: in
values: [""]
- input: "$(params.mas_edition)"
operator: in
values: ["essentials-maintenance", "standard", "premium"]

# 7. IoT Deprovision
# -------------------------------------------------------------------------
Expand Down Expand Up @@ -1777,6 +1821,9 @@ spec:
- input: "$(params.iot_workspace_action)"
operator: in
values: ["deactivate", ""]
- input: "$(params.mas_edition)"
operator: in
values: ["standard", "premium"]

# 7.2 IoT App
- name: gitops-deprovision-mas-app-install-iot
Expand All @@ -1802,6 +1849,9 @@ spec:
- input: "$(params.mas_app_channel_iot)"
operator: in
values: [""]
- input: "$(params.mas_edition)"
operator: in
values: ["standard", "premium"]

# 7.3 IoT Database
- name: gitops-deprovision-db2u-database-iot
Expand All @@ -1827,6 +1877,9 @@ spec:
- input: "$(params.mas_app_channel_iot)"
operator: in
values: [""]
- input: "$(params.mas_edition)"
operator: in
values: ["standard", "premium"]

# 8. Deprovision Kafka config
# -------------------------------------------------------------------------
Expand All @@ -1851,6 +1904,9 @@ spec:
- input: "$(params.mas_app_channel_iot)"
operator: in
values: [""]
- input: "$(params.mas_edition)"
operator: in
values: ["standard", "premium"]

# 9. Deprovision Objectstorage config
# -------------------------------------------------------------------------
Expand All @@ -1876,6 +1932,9 @@ spec:
- input: "$(params.mas_app_channel_assist)$(params.mas_app_channel_visualinspection)"
operator: in
values: [""]
- input: "$(params.mas_edition)"
operator: in
values: ["essentials-inspection", "standard", "premium"]

# 10. Deprovision Watson Studio config
# -------------------------------------------------------------------------
Expand All @@ -1900,3 +1959,6 @@ spec:
- input: "$(params.mas_app_channel_predict)"
operator: in
values: [""]
- input: "$(params.mas_edition)"
operator: in
values: ["standard", "premium"]
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@
value: $(params.ingress)
- name: run_sanity_test
value: $(params.run_sanity_test)
- name: manage_update_schedule
value: $(params.manage_update_schedule)
taskRef:
name: gitops-suite-app-config
kind: Task
Expand Down
5 changes: 5 additions & 0 deletions tekton/src/tasks/gitops/gitops-suite-app-config.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,9 @@ spec:
- name: run_sanity_test
type: string
default: "false"
- name: manage_update_schedule
type: string
default: ""

stepTemplate:
name: gitops-suite-app-config
Expand Down Expand Up @@ -136,6 +139,8 @@ spec:
value: $(params.ingress)
- name: RUN_SANITY_TEST
value: $(params.run_sanity_test)
- name: MANAGE_UPDATE_SCHEDULE
value: $(params.manage_update_schedule)
envFrom:
- configMapRef:
name: environment-properties
Expand Down
Loading