Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
19e76fc
Added aiservice-install-plan-approval CLI parameter
Sakshi-Singhroha1 Apr 2, 2026
8cf9333
Added aiservice-install-plan-approval CLI parameter
Sakshi-Singhroha1 Apr 2, 2026
e46ade6
Made changes for adding install-plan-approval CLI parameter in instal…
Raahithyaj Apr 6, 2026
1aeb9d9
Add aiservice_install_plan_approval parameter
Raahithyaj Apr 7, 2026
22b25df
Added aiservice-subscription-install-plan parameter with Automatic de…
Sakshi-Singhroha1 Apr 28, 2026
dbddb96
Added aiservice-subscription-install-plan parameter with Automatic de…
Sakshi-Singhroha1 Apr 29, 2026
eb99ed2
Updated CLI parameter from --aiservice-subscription-install-plan to -…
Sakshi-Singhroha1 Apr 30, 2026
21bce08
Merge origin/master into MASCORE-12745 - resolved params.py conflict …
Sakshi-Singhroha1 May 4, 2026
0268c82
Fix pre-commit formatting and update secrets baseline
Sakshi-Singhroha1 May 4, 2026
4a00006
Fix pre-commit formatting issues
Sakshi-Singhroha1 May 4, 2026
0959af1
Merge branch 'master' into mascore12745
mnivedithaa May 4, 2026
0c4a856
Updated gitops-aiservice
Sakshi-Singhroha1 May 4, 2026
440700f
Revert non-GitOps files - Python and Tekton changes not required for …
Sakshi-Singhroha1 May 6, 2026
7c851e9
Revert non-GitOps files and apply autopep8 formatting
Sakshi-Singhroha1 May 6, 2026
96b5518
Revert non-GitOps files and apply autopep8 formatting
Sakshi-Singhroha1 May 6, 2026
fd52d63
made changes in argBuilder.py
Sakshi-Singhroha1 May 6, 2026
f60f9f8
made changes install-aiservice.yml.j2
Sakshi-Singhroha1 May 6, 2026
d28f11b
Revert last two commits and apply autopep8 formatting
Sakshi-Singhroha1 May 6, 2026
0fb2102
Fix Build python Package Failure
Sakshi-Singhroha1 May 7, 2026
a0fc8aa
removed install plan from argbuilder file
Sakshi-Singhroha1 May 7, 2026
5c05670
Merge latest master changes into mascore12745
Sakshi-Singhroha1 May 7, 2026
3741ad2
Remove extra white spaces
Sakshi-Singhroha1 May 7, 2026
ebd4674
added installPlanApproval configuration for AI Service Tenant operator
Sakshi-Singhroha1 May 11, 2026
1fbc1ec
Removed Extra Whitespaces
Sakshi-Singhroha1 May 11, 2026
6314192
Removed Extra Whitespaces
Sakshi-Singhroha1 May 11, 2026
1a2725f
Merged master into mascore12745
Sakshi-Singhroha1 May 14, 2026
4c3112d
Restore valid secrets baseline
Sakshi-Singhroha1 May 14, 2026
0b6147f
Update .secrets.baseline after detect-secrets
Sakshi-Singhroha1 May 14, 2026
eb3e98a
Refresh .secrets.baseline
Sakshi-Singhroha1 May 14, 2026
6b88adb
Refresh .secrets.baseline
Sakshi-Singhroha1 May 14, 2026
d289e5e
Modified gitops_aiservice_tenant
Sakshi-Singhroha1 May 15, 2026
df6a38d
Modified gitops_aiservice_tenant
Sakshi-Singhroha1 May 15, 2026
44b1ec0
Modified gitops_aiservice_tenant
Sakshi-Singhroha1 May 15, 2026
ee327a9
Modified gitops_aiservice_tenant
Sakshi-Singhroha1 May 15, 2026
cd96e57
Modified gitops_aiservice_tenant
Sakshi-Singhroha1 May 15, 2026
788d006
Modified gitops_aiservice_tenant
Sakshi-Singhroha1 May 15, 2026
bd945ce
Modified gitops_aiservice_tenant
Sakshi-Singhroha1 May 15, 2026
8574122
Resolved Merge Conflict
Sakshi-Singhroha1 May 18, 2026
8fb1bd5
Merge branch 'master' into mascore12745
Sakshi-Singhroha1 May 18, 2026
8409c0f
Updated .secrets.baseline
Sakshi-Singhroha1 May 18, 2026
e9feffd
Update .secrets.baseline
Sakshi-Singhroha1 May 18, 2026
ea790bf
Resolved merge conflict
Sakshi-Singhroha1 May 18, 2026
e5ccc94
Resolving Merge Conflict
Sakshi-Singhroha1 May 18, 2026
245a092
Merge branch 'master' into mascore12745
Sakshi-Singhroha1 May 19, 2026
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
16 changes: 8 additions & 8 deletions .secrets.baseline
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"files": "build/bin/config/oscap/ssg-rhel9-ds.xml|^.secrets.baseline$|^docs/catalogs/",
"lines": null
},
"generated_at": "2026-05-18T05:35:22Z",
"generated_at": "2026-05-18T08:58:20Z",
"plugins_used": [
{
"name": "AWSKeyDetector"
Expand Down Expand Up @@ -192,39 +192,39 @@
"hashed_secret": "6ffb91fd9c01e69b8e9093d84439c8b88dd8fe35",
"is_secret": false,
"is_verified": false,
"line_number": 75,
"line_number": 76,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "db40a6131d9b574bb057875df98fb03f9874d5b4",
"is_secret": false,
"is_verified": false,
"line_number": 91,
"line_number": 92,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "6fbaa59234a602571baf17a51592b436b33f8491",
"is_secret": false,
"is_verified": false,
"line_number": 92,
"line_number": 93,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "bd1b0b7f343605538b1da78056db3a7bddf3f807",
"is_secret": false,
"is_verified": false,
"line_number": 95,
"line_number": 96,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "b2817467154949a61f8e9ad31d1eeaf03221cbfa",
"is_secret": false,
"is_verified": false,
"line_number": 308,
"line_number": 312,
"type": "Secret Keyword",
"verified_result": null
}
Expand All @@ -234,7 +234,7 @@
"hashed_secret": "b2817467154949a61f8e9ad31d1eeaf03221cbfa",
"is_secret": false,
"is_verified": false,
"line_number": 368,
"line_number": 374,
"type": "Secret Keyword",
"verified_result": null
}
Expand Down Expand Up @@ -654,7 +654,7 @@
"hashed_secret": "fee2d55ad9a49a95fc89abe8f414dad66704ebfd",
"is_secret": false,
"is_verified": false,
"line_number": 44,
"line_number": 45,
"type": "Secret Keyword",
"verified_result": null
}
Expand Down
7 changes: 6 additions & 1 deletion image/cli/mascli/functions/gitops_aiservice
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ ibm aiservice(required):
--aiservice-namespace ${TEXT_RESET}AISERVICE_NAMESPACE${TEXT_RESET}
--aiservice-instance-id ${TEXT_RESET}AISERVICE_INSTANCE_ID${TEXT_RESET}
--primary-storage-class ${TEXT_RESET}PRIMARY_STORAGE_CLASS${TEXT_RESET}
--aiservice-install-plan-approval ${TEXT_RESET}AISERVICE_INSTALL_PLAN_APPROVAL${TEXT_RESET}

storage provider:
--aiservice-storage-provider ${TEXT_RESET}AISERVICE_STORAGE_PROVIDER${TEXT_RESET}
Expand Down Expand Up @@ -85,7 +86,7 @@ function gitops_aiservice_noninteractive() {
export AISERVICE_STORAGE_REGION=${AISERVICE_STORAGE_REGION:-""}
export AISERVICE_STORAGE_SSL=${AISERVICE_STORAGE_SSL:-"true"}
export MAS_CATALOG_SOURCE=${MAS_CATALOG_SOURCE:-"ibm-operator-catalog"}

export AISERVICE_INSTALL_PLAN_APPROVAL=${AISERVICE_INSTALL_PLAN_APPROVAL:-"Automatic"}
export AISERVICE_S3_BUCKET_PREFIX=${AISERVICE_S3_BUCKET_PREFIX:-"m"}
export ENVIRONMENT_TYPE=${ENVIRONMENT_TYPE:-"PRODUCTION"}
export DRO_TOKEN_SECRET=${DRO_TOKEN_SECRET:-"dro-token"}
Expand Down Expand Up @@ -170,6 +171,9 @@ function gitops_aiservice_noninteractive() {
--mas-catalog-source)
export MAS_CATALOG_SOURCE=$1 && shift
;;
--aiservice-install-plan-approval)
export AISERVICE_INSTALL_PLAN_APPROVAL=$1 && shift
;;
--environment-type)
export ENVIRONMENT_TYPE=$1 && shift
;;
Expand Down Expand Up @@ -340,6 +344,7 @@ function gitops_aiservice() {
echo_reset_dim "Primary Storage Class ................. ${COLOR_MAGENTA}${PRIMARY_STORAGE_CLASS}"
echo_reset_dim "Artifactory Username ................... ${COLOR_MAGENTA}${ARTIFACTORY_USERNAME}"
echo_reset_dim "AiService Channel ...................... ${COLOR_MAGENTA}${AISERVICE_CHANNEL}"
echo_reset_dim "AIService Install Plan Approval ........ ${COLOR_MAGENTA}${AISERVICE_INSTALL_PLAN_APPROVAL}"
echo_reset_dim "MAS Catalog Source ..................... ${COLOR_MAGENTA}${MAS_CATALOG_SOURCE}"
echo_reset_dim "MAS ICR CP ............................. ${COLOR_MAGENTA}${MAS_ICR_CP}"
echo_reset_dim "MAS ICR CPOpen ......................... ${COLOR_MAGENTA}${MAS_ICR_CPOPEN}"
Expand Down
7 changes: 7 additions & 0 deletions image/cli/mascli/functions/gitops_aiservice_tenant
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ ibm_aiservice_tenant(required):
--catalog-channel ${TEXT_RESET}CATALOG_CHANNEL${TEXT_RESET} The catalog channel from which to install the tenant operator
--tenantNamespace ${COLOR_YELLOW}TENANT_NAMESPACE${TEXT_RESET} The tenant's Kubernetes namespace
--tenant-id ${COLOR_YELLOW}TENANT_ID${TEXT_RESET} The tenant ID for the AI Service instance
--aiservice-tenant-install-plan-approval ${TEXT_RESET}AISERVICE_TENANT_INSTALL_PLAN_APPROVAL${TEXT_RESET}
--cluster-domain ${COLOR_YELLOW}CLUSTER_DOMAIN${TEXT_RESET} The domain name of the Kubernetes cluster (e.g., cluster.local)
--dro-url ${COLOR_YELLOW}DRO_URL${TEXT_RESET} URL of the DRO configuration service
--slscfg-url ${COLOR_YELLOW}SLSCFG_URL${TEXT_RESET} URL of the SLS configuration service
Expand All @@ -34,6 +35,7 @@ AiService :
--aiservice-instance-id ${COLOR_YELLOW}AISERVICE_INSTANCE_ID${TEXT_RESET} The AI Service instance ID
--tenantNamespace ${COLOR_YELLOW}TENANT_NAMESPACE${TEXT_RESET} The tenant's Kubernetes namespace
--tenant-id ${COLOR_YELLOW}TENANT_ID${TEXT_RESET} The tenant ID for the AI Service instance
--aiservice-tenant-install-plan-approval ${TEXT_RESET}AISERVICE_TENANT_INSTALL_PLAN_APPROVAL${TEXT_RESET}
--cluster-domain ${COLOR_YELLOW}CLUSTER_DOMAIN${TEXT_RESET} The domain name of the Kubernetes cluster (e.g., cluster.local)
--in-saas-env ${COLOR_YELLOW}IN_SAAS_ENV${TEXT_RESET} Whether the environment is SaaS (true/false)
--aiservice_operator_log_level ${COLOR_YELLOW}AISERVICE_OPERATOR_LOG_LEVEL${TEXT_RESET} Log level for the AI Service operator (e.g., info, debug)
Expand Down Expand Up @@ -103,6 +105,7 @@ function gitops_aiservice_tenant_noninteractive() {
#adding default values # -- aiservice Defaults
export AISERVICE_NAMESPACE=${AISERVICE_NAMESPACE:-"aiservice-${AISERVICE_INSTANCE_ID}"}
export AISERVICE_PROVISION_TENANT=${AISERVICE_PROVISION_TENANT:-"provision-tenant"}
export AISERVICE_TENANT_INSTALL_PLAN_APPROVAL=${AISERVICE_TENANT_INSTALL_PLAN_APPROVAL:-"Automatic"}
export CATALOG_SOURCE=${CATALOG_SOURCE:-"ibm-operator-catalog"}
export IN_SAAS_ENV=${IN_SAAS_ENV:-"true"}
export MAS_ICR_CP=${MAS_ICR_CP:-"docker-na-public.artifactory.swg-devops.com/wiotp-docker-local"}
Expand Down Expand Up @@ -172,6 +175,9 @@ function gitops_aiservice_tenant_noninteractive() {
--tenant-id)
export TENANT_ID=$1 && shift
;;
--aiservice-tenant-install-plan-approval)
export AISERVICE_TENANT_INSTALL_PLAN_APPROVAL=$1 && shift
;;
--cluster-domain)
export CLUSTER_DOMAIN=$1 && shift
;;
Expand Down Expand Up @@ -395,6 +401,7 @@ function gitops_aiservice_tenant() {
echo_reset_dim "AiService instance ID .......................................... ${COLOR_MAGENTA}${AISERVICE_INSTANCE_ID}"
echo_reset_dim "tenant namespace ............................................... ${COLOR_MAGENTA}${TENANT_NAMESPACE}"
echo_reset_dim "tenant ID ...................................................... ${COLOR_MAGENTA}${TENANT_ID}"
echo_reset_dim "AIService Tenant Install Plan Approval . ${COLOR_MAGENTA}${AISERVICE_TENANT_INSTALL_PLAN_APPROVAL}"
echo_reset_dim "cluster domain ................................................. ${COLOR_MAGENTA}${CLUSTER_DOMAIN}"
echo_reset_dim "in SaaS environment ............................................ ${COLOR_MAGENTA}${IN_SAAS_ENV}"
if [[ -n "$TENANT_SCHEDULING_CONFIG_YAML" ]]; then
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ ibm_aiservice_tenant:
aiservice_instance_id: "{{ AISERVICE_INSTANCE_ID }}"
catalog_channel: "{{ CATALOG_CHANNEL }}"
catalog_source: "{{ CATALOG_SOURCE }}"
aiservice_tenant_install_plan_approval: "{{ AISERVICE_TENANT_INSTALL_PLAN_APPROVAL }}"
tenantNamespace: "{{ TENANT_NAMESPACE }}"

mas_icr_cp: "{{ MAS_ICR_CP }}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,14 @@ ibm_aiservice:
artifactory_token: "<path:{{ SECRETS_PATH }}:{{ ARTIFACTORY_TOKEN }}>"
# Environment Variable:
aiservice_channel: "{{ AISERVICE_CHANNEL }}"
aiservice_install_plan_approval: "{{ AISERVICE_INSTALL_PLAN_APPROVAL }}"
mas_catalog_source: "{{ MAS_CATALOG_SOURCE }}"

# Source container registry
# -----------------------------------------------------------------------------

mas_icr_cp: "{{ MAS_ICR_CP }}"
mas_icr_cpopen: "{{ MAS_ICR_CPOPEN }}"

aiservice_domain: "{{ CLUSTER_DOMAIN }}"
in_saas_env: {{ IN_SAAS_ENV }}
aiservice_storage_class: "{{ PRIMARY_STORAGE_CLASS }}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@ spec:
type: string
- name: aiservice_channel
type: string
- name: aiservice_install_plan_approval
type: string
default: "Automatic"
- name: mas_catalog_source
type: string
- name: mas_icr_cp
Expand Down Expand Up @@ -205,6 +208,9 @@ spec:
value: $(params.artifactory_username)
- name: aiservice_channel
value: $(params.aiservice_channel)
- name: aiservice_install_plan_approval
value: $(params.aiservice_install_plan_approval)

- name: mas_catalog_source
value: $(params.mas_catalog_source)
- name: mas_icr_cp
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,9 @@ spec:
type: string
- name: catalog_source
type: string
- name: aiservice_tenant_install_plan_approval
type: string
default: "Automatic"
- name: tenantNamespace
type: string
- name: tenant_id
Expand Down Expand Up @@ -142,6 +145,8 @@ spec:
value: $(params.aiservice_tenant_catalog_channel)
- name: catalog_source
value: $(params.catalog_source)
- name: aiservice_tenant_install_plan_approval
value: $(params.aiservice_tenant_install_plan_approval)
- name: tenantNamespace
value: $(params.tenantNamespace)
- name: tenant_id
Expand Down
5 changes: 5 additions & 0 deletions tekton/src/tasks/gitops/gitops-aiservice-tenant.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@ spec:
type: string
- name: catalog_source
type: string
- name: aiservice_tenant_install_plan_approval
type: string
default: "Automatic"
- name: tenantNamespace
type: string
- name: tenant_id
Expand Down Expand Up @@ -123,6 +126,8 @@ spec:
value: $(params.aiservice_tenant_catalog_channel)
- name: CATALOG_SOURCE
value: $(params.catalog_source)
- name: AISERVICE_TENANT_INSTALL_PLAN_APPROVAL
value: $(params.aiservice_tenant_install_plan_approval)
- name: TENANT_NAMESPACE
value: $(params.tenantNamespace)
- name: TENANT_ID
Expand Down
7 changes: 6 additions & 1 deletion tekton/src/tasks/gitops/gitops-aiservice.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,9 @@ spec:
type: string
- name: aiservice_channel
type: string
- name: aiservice_install_plan_approval
type: string
default: "Automatic"
- name: mas_catalog_source
type: string
- name: mas_icr_cp
Expand Down Expand Up @@ -118,6 +121,8 @@ spec:
value: $(params.artifactory_username)
- name: AISERVICE_CHANNEL
value: $(params.aiservice_channel)
- name: AISERVICE_INSTALL_PLAN_APPROVAL
value: $(params.aiservice_install_plan_approval)
- name: MAS_CATALOG_SOURCE
value: $(params.mas_catalog_source)
- name: MAS_ICR_CP
Expand Down Expand Up @@ -184,4 +189,4 @@ spec:
imagePullPolicy: IfNotPresent
image: quay.io/ibmmas/cli:latest
workspaces:
- name: configs
- name: configs
Loading