Skip to content
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
4 changes: 2 additions & 2 deletions .secrets.baseline

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions image/cli/mascli/functions/gitops_db2u_database
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ IBM DB2U:
--skip-backup-notification ${COLOR_YELLOW}SKIP_BACKUP_NOTIFICATION${TEXT_RESET} Flag to track if slack and icd backup notifications are needed.
--mas-annotations ${COLOR_YELLOW}MAS_ANNOTATIONS${TEXT_RESET} MAS Annotations
--auto-backup ${COLOR_YELLOW}AUTO_BACKUP${TEXT_RESET} Flag whether to install the Auto DB2 backup feature or not
--db2-audit-retention-days ${COLOR_YELLOW}DB2_AUDIT_RETENTION_DAYS${TEXT_RESET} Number of days to retain DB2 audit logs
--manually-set-enhanced-hadr ${COLOR_YELLOW}MANUALLY_SET_ENHANCED_HADR${TEXT_RESET} Flag to indicate whether enhanced HADR was configured manually
--allow-list ${COLOR_YELLOW}ALLOW_LIST${TEXT_RESET} List of IPs or CIDR range that will be whitelisted
--facilities-db2-schema ${COLOR_YELLOW}FACILITIES_DB2_SCHEMA${TEXT_RESET} TRIRIGA schema name for Facilities (default: TRIDATA)
Expand Down Expand Up @@ -302,6 +303,9 @@ function gitops_db2u_database_noninteractive() {
--auto-backup)
export AUTO_BACKUP=$1 && shift
;;
--db2-audit-retention-days)
export DB2_AUDIT_RETENTION_DAYS=$1 && shift
;;
--skip-backup-notification)
export SKIP_BACKUP_NOTIFICATION=$1 && shift
;;
Expand Down Expand Up @@ -633,6 +637,7 @@ DB2_WORKLOAD: '${DB2_WORKLOAD}'"
echo_reset_dim "is-replica-task ............................... ${COLOR_MAGENTA}${IS_REPLICA_TASK}"
echo_reset_dim "mas-annotations ............................... ${COLOR_MAGENTA}${MAS_ANNOTATIONS}"
echo_reset_dim "auto-backup ................................... ${COLOR_MAGENTA}${AUTO_BACKUP}"
echo_reset_dim "db2-audit-retention-days ...................... ${COLOR_MAGENTA}${DB2_AUDIT_RETENTION_DAYS}"
echo_reset_dim "skip-backup-notification ...................... ${COLOR_MAGENTA}${SKIP_BACKUP_NOTIFICATION}"
echo_reset_dim "manually-set-enhanced-hadr .................... ${COLOR_MAGENTA}${MANUALLY_SET_ENHANCED_HADR}"
echo_reset_dim "allow-list .................................... ${COLOR_MAGENTA}${ALLOW_LIST}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,9 @@ storage_class_definitions:
{% endif %}

auto_backup: {{ AUTO_BACKUP }}
{% if DB2_AUDIT_RETENTION_DAYS is defined and DB2_AUDIT_RETENTION_DAYS != '' %}
db2_audit_retention_days: {{ DB2_AUDIT_RETENTION_DAYS }}
{% endif %}
{% if BACKUP %}
db2_backup_bucket_name: <path:{{ SECRETS_PATH }}:{{ DB2_BACKUP_BUCKET_NAME }}>
db2_backup_bucket_endpoint: <path:{{ SECRETS_PATH }}:{{ DB2_BACKUP_BUCKET_ENDPOINT }}>
Expand Down
24 changes: 24 additions & 0 deletions tekton/src/pipelines/gitops/gitops-mas-apps.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -246,6 +246,9 @@ spec:
- name: auto_backup_manage
type: string
default: ""
- name: db2_audit_retention_days_manage
type: string
default: ""

- name: db2_meta_storage_class_iot
type: string
Expand Down Expand Up @@ -355,6 +358,9 @@ spec:
- name: auto_backup_iot
type: string
default: ""
- name: db2_audit_retention_days_iot
type: string
default: ""

- name: db2_meta_storage_class_monitor
type: string
Expand Down Expand Up @@ -464,6 +470,9 @@ spec:
- name: auto_backup_monitor
type: string
default: ""
- name: db2_audit_retention_days_monitor
type: string
default: ""

- name: db2_meta_storage_class_facilities
type: string
Expand Down Expand Up @@ -573,6 +582,9 @@ spec:
- name: auto_backup_facilities
type: string
default: ""
- name: db2_audit_retention_days_facilities
type: string
default: ""
- name: facilities_db2_schema
type: string
default: "TRIDATA"
Expand Down Expand Up @@ -1182,6 +1194,8 @@ spec:
value: $(params.db2_backup_notify_slack_url_iot)
- name: auto_backup
value: $(params.auto_backup_iot)
- name: db2_audit_retention_days
value: $(params.db2_audit_retention_days_iot)
- name: allow_list
value: $(params.allow_list)

Expand Down Expand Up @@ -1384,6 +1398,8 @@ spec:
value: $(params.db2_backup_notify_slack_url_monitor)
- name: auto_backup
value: $(params.auto_backup_monitor)
- name: db2_audit_retention_days
value: $(params.db2_audit_retention_days_monitor)
- name: allow_list
value: $(params.allow_list)

Expand Down Expand Up @@ -1592,6 +1608,8 @@ spec:
value: $(params.manually_set_enhanced_hadr_manage)
- name: auto_backup
value: $(params.auto_backup_manage)
- name: db2_audit_retention_days
value: $(params.db2_audit_retention_days_manage)
- name: allow_list
value: $(params.allow_list)

Expand Down Expand Up @@ -1758,6 +1776,8 @@ spec:
value: $(params.db2_backup_notify_slack_url_manage)
- name: auto_backup
value: $(params.auto_backup_manage)
- name: db2_audit_retention_days
value: $(params.db2_audit_retention_days_manage)
- name: replica_db
value: $(params.replica_db_manage)
- name: manually_set_enhanced_hadr
Expand Down Expand Up @@ -1933,6 +1953,8 @@ spec:
value: $(params.manually_set_enhanced_hadr_facilities)
- name: auto_backup
value: $(params.auto_backup_facilities)
- name: db2_audit_retention_days
value: $(params.db2_audit_retention_days_facilities)
- name: facilities_db2_schema
value: $(params.facilities_db2_schema)

Expand Down Expand Up @@ -2099,6 +2121,8 @@ spec:
value: $(params.db2_backup_notify_slack_url_facilities)
- name: auto_backup
value: $(params.auto_backup_facilities)
- name: db2_audit_retention_days
value: $(params.db2_audit_retention_days_facilities)
- name: replica_db
value: $(params.replica_db_facilities)
- name: manually_set_enhanced_hadr
Expand Down
5 changes: 5 additions & 0 deletions tekton/src/tasks/gitops/gitops-db2u-database.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,9 @@ spec:
- name: auto_backup
type: string
default: ""
- name: db2_audit_retention_days
type: string
default: ""
- name: replica_db
type: string
default: "false"
Expand Down Expand Up @@ -250,6 +253,8 @@ spec:
value: $(params.db2_backup_notify_slack_url)
- name: AUTO_BACKUP
value: $(params.auto_backup)
- name: DB2_AUDIT_RETENTION_DAYS
value: $(params.db2_audit_retention_days)
- name: REPLICA_DB
value: $(params.replica_db)
- name: IS_REPLICA_TASK
Expand Down
Loading