Skip to content

[minor] param for AI Service deprovisioning #2279

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.

Sign up for GitHub

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

Draft
boonware wants to merge 4 commits into
base: master
Choose a base branch
from
Draft

[minor] param for AI Service deprovisioning #2279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c8dc7bf
param for AI Service deprovisioning
May 14, 2026
626e892
fix boolean value
May 19, 2026
855828e
handle empty var
May 28, 2026
0b88936
add CLI flag
May 28, 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
6 changes: 3 additions & 3 deletions .secrets.baseline
View file
Open in desktop
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-12T12:20:28Z",
"generated_at": "2026-05-28T12:02:34Z",
"plugins_used": [
{
"name": "AWSKeyDetector"
Expand Down Expand Up @@ -234,7 +234,7 @@
"hashed_secret": "b2817467154949a61f8e9ad31d1eeaf03221cbfa",
"is_secret": false,
"is_verified": false,
"line_number": 372,
"line_number": 377,
"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": 43,
"line_number": 46,
"type": "Secret Keyword",
"verified_result": null
}
Expand Down
6 changes: 6 additions & 0 deletions image/cli/mascli/functions/gitops_aiservice_tenant
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ ibm_aiservice_tenant(required):
--aiservice-watsonxai-url ${COLOR_YELLOW}AISERVICE_WATSONXAI_URL${TEXT_RESET} Endpoint URL for Watsonx.ai
--aiservice-watsonx-full ${COLOR_YELLOW}AISERVICE_WATSONX_FULL${TEXT_RESET} Full URL for Watsonx.ai including API key
--tenant-scheduling-config-file ${COLOR_YELLOW}TENANT_SCHEDULING_CONFIG_FILE${TEXT_RESET} Path to tenant scheduling configuration file (tolerations and nodeSelector)
--enable-deprovisioning ${COLOR_YELLOW}AISERVICE_ENABLE_DEPROVISIONING${TEXT_RESET} When true, the tenant is deprovisioned when its AIServiceTenant CR is deleted

AiService :
--aiservice-namespace ${COLOR_YELLOW}AISERVICE_NAMESPACE${TEXT_RESET} The namespace where AI Service is deployed
Expand Down Expand Up @@ -262,6 +263,10 @@ function gitops_aiservice_tenant_noninteractive() {
export TENANT_SCHEDULING_CONFIG_YAML=$1 && shift
;;

--enable-deprovisioning)
export AISERVICE_ENABLE_DEPROVISIONING=$1 && shift
;;

# Automatic GitHub Push
-P|--github-push)
export GITHUB_PUSH=true
Expand Down Expand Up @@ -401,6 +406,7 @@ function gitops_aiservice_tenant() {
echo_reset_dim "tenant ID ...................................................... ${COLOR_MAGENTA}${TENANT_ID}"
echo_reset_dim "cluster domain ................................................. ${COLOR_MAGENTA}${CLUSTER_DOMAIN}"
echo_reset_dim "in SaaS environment ............................................ ${COLOR_MAGENTA}${IN_SAAS_ENV}"
echo_reset_dim "deprovisioning enabled ......................................... ${COLOR_MAGENTA}${AISERVICE_ENABLE_DEPROVISIONING}"
if [[ -n "$TENANT_SCHEDULING_CONFIG_YAML" ]]; then
echo_reset_dim "Scheduling constraints (tolerations/nodeSelector) .............. ${COLOR_MAGENTA}${TENANT_SCHEDULING_CONFIG_YAML}"
else
Expand Down
3 changes: 3 additions & 0 deletions .../cli/mascli/templates/gitops/appset-configs/cluster/instance/ibm-aiservice-tenant.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ ibm_aiservice_tenant:
catalog_channel: "{{ CATALOG_CHANNEL }}"
catalog_source: "{{ CATALOG_SOURCE }}"
tenantNamespace: "{{ TENANT_NAMESPACE }}"
{% if AISERVICE_ENABLE_DEPROVISIONING is defined and AISERVICE_ENABLE_DEPROVISIONING != '' %}
enable_deprovisioning: {{ AISERVICE_ENABLE_DEPROVISIONING }}
{% endif %}

mas_icr_cp: "{{ MAS_ICR_CP }}"
mas_icr_cpopen: "{{ MAS_ICR_CPOPEN }}"
Expand Down
5 changes: 5 additions & 0 deletions tekton/src/pipelines/gitops/gitops-aiservice-tenant-pipeline.yml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ spec:
type: string
- name: github_host
type: string
- name: aiservice_enable_deprovisioning
type: string
default: "false"
- name: aiservice_namespace
type: string
- name: aiservice_provision_tenant
Expand Down Expand Up @@ -132,6 +135,8 @@ spec:
value: $(params.github_repo)
- name: github_host
value: $(params.github_host)
- name: aiservice_enable_deprovisioning
value: $(params.aiservice_enable_deprovisioning)
- name: aiservice_namespace
value: $(params.aiservice_namespace)
- name: aiservice_provision_tenant
Expand Down
5 changes: 5 additions & 0 deletions tekton/src/tasks/gitops/gitops-aiservice-tenant.yml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,9 @@ spec:
type: string
- name: github_host
type: string
- name: aiservice_enable_deprovisioning
type: string
default: "false
- name: aiservice_namespace
type: string
- name: aiservice_provision_tenant
Expand Down Expand Up @@ -113,6 +116,8 @@ spec:
value: $(params.github_host)
- name: GITHUB_REPO
value: $(params.github_repo)
- name: AISERVICE_ENABLE_DEPROVISIONING
value: $(params.aiservice_enable_deprovisioning)
- name: AISERVICE_NAMESPACE
value: $(params.aiservice_namespace)
- name: AISERVICE_PROVISION_TENANT
Expand Down
Loading