db2 rds changes #1839

amitpandey0217 · 2025-10-15T15:53:15Z

This changes include to automate rds instance creations using gitops
https://jsw.ibm.com/browse/MASCORE-10165

mnivedithaa · 2025-10-16T05:44:09Z

image/cli/mascli/functions/gitops_db2rds

+      --secrets-key-seperator ${COLOR_YELLOW}SECRETS_KEY_SEPERATOR${TEXT_RESET}  Secrets Manager key seperator string
+
+IBM DB2RDS:
+      --db2_namespace ${COLOR_YELLOW}DB2_RDS_NAMESPACE${TEXT_RESET}                db2rds namespace


should we just use default value instead of parameterising it?

mnivedithaa · 2025-10-16T05:44:54Z

image/cli/mascli/functions/gitops_db2rds

+  #adding default values # -- db2rds Defaults
+  export DB2_NAMESPACE=${DB2_NAMESPACE}
+  export DB2_INSTANCE_NAME=${DB2_INSTANCE_NAME}
+  export MAS_APP_ID=${MAS_APP_ID}
+  export RDS_ADMIN_DB_NAME=${RDS_ADMIN_DB_NAME}


This is not required as you are already setting the values above.

image/cli/mascli/templates/gitops/appset-configs/cluster/instance/ibm-dbs-rds-databases.yaml.j2

mnivedithaa · 2025-10-16T05:47:14Z

image/cli/mascli/functions/gitops_db2rds

+      --host ${COLOR_YELLOW}DB2_CHANNEL${TEXT_RESET}                               db2rds host
+      --port ${COLOR_YELLOW}DB2_CHANNEL${TEXT_RESET}                               db2rds port
+      --dbname ${COLOR_YELLOW}DB2_CHANNEL${TEXT_RESET}                             db2rds dbname
+      --user ${COLOR_YELLOW}DB2_CHANNEL${TEXT_RESET}                               db2rds user
+      --password ${COLOR_YELLOW}DB2_CHANNEL${TEXT_RESET}                           db2rds password


The env vars here needs to be updated. All are referring to DB2_CHANNEL

mnivedithaa · 2025-10-16T05:47:45Z

image/cli/mascli/functions/gitops_db2rds

+  # TODO: will need to add explicit args to pipeline when we start using this code to deploy to MCSP
+  export REGION=${REGION:-${SM_AWS_REGION}}
+
+  export DB2_INSTALL_PLAN=${DB2_INSTALL_PLAN:-"Automatic"}


This is not required for RDS right?

mnivedithaa · 2025-10-16T05:50:08Z

image/cli/mascli/functions/gitops_db2rds

+  # Define cluster-level secrets used
+  # ---------------------------------------------------------------------------
+  # Note that this cluster-level secret is set up by gitops-cluster
+  SECRETS_PREFIX="${ACCOUNT_ID}${SECRETS_KEY_SEPARATOR}${CLUSTER_ID}-${MAS_INSTANCE_ID}${SECRETS_KEY_SEPARATOR}"


Can we use ${SECRETS_KEY_SEPARATOR} instead of - after ${CLUSTER_ID} to maintain consistency?

we cant use SECRETS_KEY_SEPARATOR as SECRETS_KEY_SEPARATOR is defined as "/"

@amitpandey0217 it should be a slash shouldn't it? the expected secrets path would be aws-dev/cluster1/instance1/ and not aws-dev/cluster1-instance1/

mnivedithaa · 2025-10-16T05:50:48Z

image/cli/mascli/functions/gitops_db2rds

+  export HOST=${SECRETS_PREFIX}rds-db2-endpoint-config-GiAgxQ#db2_endpoint
+  export PORT=${SECRETS_PREFIX}rds-db2-endpoint-config-GiAgxQ#db2_port
+  export DBNAME=${SECRETS_PREFIX}rds-db2-endpoint-config-GiAgxQ#db2_name
+  export USER=${SECRETS_PREFIX}rds-db2-endpoint-config-GiAgxQ#username
+  export PASSWORD=${SECRETS_PREFIX}rds-db2-endpoint-config-GiAgxQ#password


"-GiAgxQ" needs to be removed from the secret name

mnivedithaa · 2025-10-16T05:52:27Z

image/cli/mascli/functions/gitops_db2rds

+  # ---------------------------------------------------------------------------
+  ROOT_APP_NAME="root.${ACCOUNT_ID}"
+  CLUSTER_APP_NAME="cluster.${CLUSTER_ID}"
+  DB2RDS_APP_NAME="DB2RDS.${CLUSTER_ID}.${MAS_INSTANCE_ID}"


App naming convention to be matched with argo app mentioned in gitops

mnivedithaa · 2025-10-16T05:53:04Z

image/cli/mascli/functions/gitops_db2rds

+  echo_h2 "Generating DB2RDS operator Applications"
+  echo "- DB2RDS operator"
+
+  export IBM_ENTITLEMENT_KEY=$SECRET_KEY_IBM_ENTITLEMENT


I guess this is not required as it is not used for rds

image/cli/mascli/functions/gitops_db2rds

whitfiea · 2025-10-16T08:23:44Z

image/cli/mascli/functions/gitops_db2rds

+  # Define cluster-level secrets used
+  # ---------------------------------------------------------------------------
+  # Note that this cluster-level secret is set up by gitops-cluster
+  SECRETS_PREFIX="${ACCOUNT_ID}${SECRETS_KEY_SEPARATOR}${CLUSTER_ID}-${MAS_INSTANCE_ID}${SECRETS_KEY_SEPARATOR}"


@amitpandey0217 it should be a slash shouldn't it? the expected secrets path would be aws-dev/cluster1/instance1/ and not aws-dev/cluster1-instance1/

whitfiea · 2025-10-16T08:24:35Z

image/cli/mascli/functions/gitops_db2rds

+      --db2_instance_name ${COLOR_YELLOW}DB2_INSTANCE_NAME${TEXT_RESET}            db2rds instance name
+      --MAS_APP_ID ${COLOR_YELLOW}MAS_APP_ID${TEXT_RESET}          db2rds mas application id
+      --rds_admin_db_name ${COLOR_YELLOW}RDS_ADMIN_DB_NAME{TEXT_RESET}             db2rds admin db name


these need fixing. The params use - rather than _ and MAS_APP_ID should be lowercase

Done also update the secrets path which you provided under above comment

This still looks incorrect. it should be --db2-instance-name etc

whitfiea · 2025-10-16T08:24:53Z

image/cli/mascli/functions/gitops_db2rds

+      -g|--gitops-version)
+        echo "${COLOR_YELLOW}WARNING: the -g|--gitops-version parameter is deprecated; it has no effect and will be removed in a future release${COLOR_RESET}"
+        shift
+        ;;


i don't think this is needed

whitfiea · 2025-10-16T08:25:41Z

image/cli/mascli/functions/gitops_db2rds

+    [[ -z "$GITHUB_ORG" ]] && gitops_db2rds_help "GITHUB_ORG is not set"
+    [[ -z "$GITHUB_REPO" ]] && gitops_db2rds_help "GITHUB_REPO is not set"
+    [[ -z "$GIT_BRANCH" ]] && gitops_db2rds_help "GIT_BRANCH is not set"
+  fi


the checks for db2 related vars shouldn't be under if [[ "$GITHUB_PUSH" == "true" ]]; then

whitfiea · 2025-10-16T08:26:05Z

image/cli/mascli/functions/gitops_db2rds

+  echo_reset_dim "Region ................................ ${COLOR_MAGENTA}${REGION}"
+  echo_reset_dim "Cluster ID ............................ ${COLOR_MAGENTA}${CLUSTER_ID}"
+  echo_reset_dim "MAS Instance ID ....................... ${COLOR_MAGENTA}${MAS_INSTANCE_ID}"
+  echo_reset_dim "DB2RDS Namespace ........................ ${COLOR_MAGENTA}${DB2_NAMESPACE}"


fix formtting

whitfiea · 2025-10-16T08:26:42Z

image/cli/mascli/functions/gitops_db2rds

+  echo_reset_dim "DB2RDS Namespace ........................ ${COLOR_MAGENTA}${DB2_NAMESPACE}"
+  echo_reset_dim "Instance Config Directory ............. ${COLOR_MAGENTA}${GITOPS_INSTANCE_DIR}"
+  reset_colors
+


there is no echoed output for the db2 params

the password should be snipped

whitfiea · 2025-10-16T08:27:30Z

image/cli/mascli/functions/gitops_db2rds

+  echo_h2 "DB2RDS Operator" "    "
+  echo_reset_dim "DB2_NAMESPACE  .......................... ${COLOR_MAGENTA}${DB2_NAMESPACE}"
+  reset_colors


what is the db2 rds operator?

Removed as its not needed

whitfiea · 2025-10-16T08:29:34Z

image/cli/mascli/templates/gitops/appset-configs/cluster/instance/ibm-dbs-rds-databases.yaml.j2

+    host: <path:{{ SECRETS_PATH }}:{{ HOST }}>
+    port: <path:{{ SECRETS_PATH }}:{{ PORT }}>
+    dbname: <path:{{ SECRETS_PATH }}:{{ DBNAME }}>
+    user: <path:{{ SECRETS_PATH }}:{{ USER }}>
+    password: <path:{{ SECRETS_PATH }}:{{ PASSWORD }}>


what is putting the secrets into these locations in secrets manager?

mas-aws-build repo will be populating that information .

I believe the funciton should add it if these details are passed into the function. Then all cases the function should be verifying that the secrets exist.

whitfiea

The PR title and description needs more details. From the code it seems this might not have been tested so we need to know what testing has been done and where the tekton changes are

whitfiea · 2025-11-10T09:54:52Z

image/cli/mascli/functions/gitops_db2rds

+      --db2_instance_name ${COLOR_YELLOW}DB2_INSTANCE_NAME${TEXT_RESET}            db2rds instance name
+      --MAS_APP_ID ${COLOR_YELLOW}MAS_APP_ID${TEXT_RESET}          db2rds mas application id
+      --rds_admin_db_name ${COLOR_YELLOW}RDS_ADMIN_DB_NAME{TEXT_RESET}             db2rds admin db name


This still looks incorrect. it should be --db2-instance-name etc

whitfiea · 2025-11-10T09:55:14Z

image/cli/mascli/functions/gitops_db2rds

+      --db2_instance_name)
+      export DB2_INSTANCE_NAME=$1 && shift
+        ;;
+      --MAS_APP_ID)


incorrect name of variable

whitfiea · 2025-11-10T09:55:28Z

image/cli/mascli/functions/gitops_db2rds

+        ;;
+
+      # DB2RDS
+      --db2_instance_name)


incorrect use of _

whitfiea · 2025-11-10T09:56:12Z

image/cli/mascli/functions/gitops_db2rds

+    [[ -z "$GITHUB_ORG" ]] && gitops_db2rds_help "GITHUB_ORG is not set"
+    [[ -z "$GITHUB_REPO" ]] && gitops_db2rds_help "GITHUB_REPO is not set"
+    [[ -z "$GIT_BRANCH" ]] && gitops_db2rds_help "GIT_BRANCH is not set"
+  fi


Where the checks for these DB2RDS values removed?

whitfiea · 2025-11-10T09:57:08Z

image/cli/mascli/functions/gitops_db2rds

+  echo_reset_dim "DB2RDS Namespace ........................ ${COLOR_MAGENTA}${DB2_NAMESPACE}"
+  echo_reset_dim "Instance Config Directory ............. ${COLOR_MAGENTA}${GITOPS_INSTANCE_DIR}"
+  reset_colors
+


the password should be snipped

whitfiea · 2025-11-10T09:59:17Z

image/cli/mascli/functions/gitops_db2rds_database

+      --db2_instance_name ${COLOR_YELLOW}DB2_INSTANCE_NAME${TEXT_RESET}            db2rds instance name
+      --mas_app_id ${COLOR_YELLOW}MAS_APP_ID${TEXT_RESET}                          db2rds mas application id
+      --rds_admin_db_name ${COLOR_YELLOW}RDS_ADMIN_DB_NAME{TEXT_RESET}             db2rds admin db name


incorrect use of _ in the parameter name

whitfiea · 2025-11-10T09:59:35Z

image/cli/mascli/functions/gitops_db2rds_database

+      --db2_instance_name)
+      export DB2_INSTANCE_NAME=$1 && shift
+        ;;
+      --MAS_APP_ID)
+      export MAS_APP_ID=$1 && shift
+        ;;
+      --rds_admin_db_name)
+      export RDS_ADMIN_DB_NAME=$1 && shift


incorrect parameter names

whitfiea · 2025-11-10T10:00:17Z

image/cli/mascli/functions/gitops_db2rds_database

+  [[ -z "$DB2_META_STORAGE_CLASS" ]] && gitops_db2rds_database_help "DB2_META_STORAGE_CLASS is not set"
+  [[ -z "$DB2_DATA_STORAGE_CLASS" ]] && gitops_db2rds_database_help "DB2_DATA_STORAGE_CLASS is not set"
+  [[ -z "$DB2_BACKUP_STORAGE_CLASS" ]] && gitops_db2rds_database_help "DB2_BACKUP_STORAGE_CLASS is not set"
+  [[ -z "$DB2_LOGS_STORAGE_CLASS" ]] && gitops_db2rds_database_help "DB2_LOGS_STORAGE_CLASS is not set"


These are not valid parameters to check for this function

whitfiea · 2025-11-10T10:00:40Z

image/cli/mascli/functions/gitops_db2rds_database

+  export SECRET_NAME_DB2_BACKUP=${ACCOUNT_ID}${SECRETS_KEY_SEPERATOR}${CLUSTER_ID}${SECRETS_KEY_SEPERATOR}${MAS_INSTANCE_ID}${SECRETS_KEY_SEPERATOR}db2_backup
+  export SECRET_NAME_ICD_AUTH_KEY=${ACCOUNT_ID}${SECRETS_KEY_SEPERATOR}${CLUSTER_ID}${SECRETS_KEY_SEPERATOR}icd


why do we need these?

whitfiea · 2025-11-10T10:02:26Z

image/cli/mascli/templates/gitops/appset-configs/cluster/instance/ibm-dbs-rds-databases.yaml.j2

+    host: <path:{{ SECRETS_PATH }}:{{ HOST }}>
+    port: <path:{{ SECRETS_PATH }}:{{ PORT }}>
+    dbname: <path:{{ SECRETS_PATH }}:{{ DBNAME }}>
+    user: <path:{{ SECRETS_PATH }}:{{ USER }}>
+    password: <path:{{ SECRETS_PATH }}:{{ PASSWORD }}>


I believe the funciton should add it if these details are passed into the function. Then all cases the function should be verifying that the secrets exist.

db2 rds changes

e547c27

amitpandey0217 requested a review from a team as a code owner October 15, 2025 15:53

mnivedithaa requested changes Oct 16, 2025

View reviewed changes

amitpandey0217 added 2 commits October 16, 2025 13:25

db2 rds changes

47a11ff

db2 rds changes

40fc818

whitfiea requested changes Oct 16, 2025

View reviewed changes

amitpandey0217 added 2 commits October 16, 2025 15:19

db2 rds changes

81fc800

db2 rds changes

82c8192

whitfiea requested review from mnivedithaa and whitfiea November 10, 2025 09:53

whitfiea requested changes Nov 10, 2025

View reviewed changes

		export SECRET_NAME_DB2_BACKUP=${ACCOUNT_ID}${SECRETS_KEY_SEPERATOR}${CLUSTER_ID}${SECRETS_KEY_SEPERATOR}${MAS_INSTANCE_ID}${SECRETS_KEY_SEPERATOR}db2_backup
		export SECRET_NAME_ICD_AUTH_KEY=${ACCOUNT_ID}${SECRETS_KEY_SEPERATOR}${CLUSTER_ID}${SECRETS_KEY_SEPERATOR}icd

db2 rds changes #1839

Are you sure you want to change the base?

db2 rds changes #1839

Uh oh!

Conversation

amitpandey0217 commented Oct 15, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

amitpandey0217 Oct 16, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

whitfiea left a comment

Choose a reason for hiding this comment

amitpandey0217 commented Oct 15, 2025 •

edited

Loading

amitpandey0217 Oct 16, 2025 •

edited

Loading