Skip to content

[patch] Remove the rsl kubernetes secret creation and remove rls_url and rsl_org_id prarams #456

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

Merged
whitfiea merged 13 commits into from
May 18, 2026
Merged

[patch] Remove the rsl kubernetes secret creation and remove rls_url and rsl_org_id prarams #456

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
d0e3f10
[patch] Remove rsl related params and secret creation (now handle by …
May 6, 2026
6ca2ab7
[patch] Remove rls params from the root-applications
May 6, 2026
61d61f4
Merge branch 'main' into masaib-1915
May 10, 2026
8eb34bd
Fix AIService postsync job to use real AWS Secrets Manager credentials
May 11, 2026
05c2412
Add AWS Secrets Manager credentials for AIService postsync job
May 11, 2026
4d4b143
[patch] Add default value at tenant instance level
May 11, 2026
1b3a858
Merge branch 'main' into masaib-1915
May 11, 2026
ed9d992
Merge branch 'main' into masaib-1915
May 12, 2026
1a1541c
[patch] Revert some workaround
May 12, 2026
b91dc96
Merge branch 'main' into masaib-1915
Bhautik-Vala May 13, 2026
53cffb6
[patch] Add empty string validation on rsl_ca_crt
May 14, 2026
b99cd5a
Merge branch 'main' into masaib-1915
May 18, 2026
d33692b
[patch] Remove extra line
May 18, 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
24 changes: 0 additions & 24 deletions instance-applications/115-ibm-aiservice-tenant/templates/02-aiservice-rsl-secret.yaml
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions instance-applications/115-ibm-aiservice-tenant/templates/07-aiservice-workspace.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@ spec:
url: "{{ .Values.slscfg_url }}"
secretName: "{{ .Values.tenantNamespace }}----sls-secret"
ca: "{{ .Values.slscfg_ca_b64enc }}"
{{- if not (empty .Values.rsl_ca_crt) }}
rsl:
url: "{{ .Values.rsl_url }}"
orgId: "{{ .Values.rsl_org_id }}"
secretName: "{{ .Values.tenantNamespace }}----rsl-secret"
ca: "{{ .Values.rsl_ca_crt }}"
{{- end }}
watsonxai:
url: "{{ .Values.aiservice_watsonxai_url }}"
secretName: "{{ .Values.tenantNamespace }}----wx-secret"
Expand Down
6 changes: 1 addition & 5 deletions instance-applications/115-ibm-aiservice-tenant/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,7 @@ slscfg_url: "slscfg_url"
slscfg_registration_key: "slscfg_registration_key"
aiservice_sls_subscription_id: "001"

rsl_url: "rsl_url"
rsl_org_id: "rsl_org_id"
rsl_token: "rsl_token"
rsl_ca_crt: "rsl_ca_crt"

rsl_ca_crt: ""

# watsonx
aiservice_watsonxai_url: "aiservice_watsonxai_url"
Expand Down
7 changes: 3 additions & 4 deletions root-applications/ibm-aiservice-instance-root/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,10 +272,9 @@ ibm_aiservice_tenant:
slscfg_registration_key: "slscfg_registration_key"
aiservice_sls_subscription_id: "001"

rsl_url: "rsl_url"
rsl_org_id: "rsl_org_id"
rsl_token: "rsl_token"
rsl_ca_crt: "rsl_ca_crt"
# RSL - Per MASAIB-1915: Only CA cert needed for self-signed certificates
# RSL URL, Org ID, and token are provided during FMEA model creation in the UI
rsl_ca_crt: "" # Optional: Base64-encoded CA certificate for self-signed RSL endpoints


# watsonx
Expand Down
6 changes: 1 addition & 5 deletions root-applications/ibm-aiservice-tenant-root/templates/100-ibm-aiservice-tenant-app.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@ spec:
aiservice_s3_secretkey: "{{ .Values.ibm_aiservice_tenant.aiservice_s3_secretkey }}"
aiservice_s3_region: "{{ .Values.ibm_aiservice_tenant.aiservice_s3_region }}"


# WatsonX
aiservice_watsonxai_apikey: "{{ .Values.ibm_aiservice_tenant.aiservice_watsonxai_apikey }}"
aiservice_watsonxai_url: "{{ .Values.ibm_aiservice_tenant.aiservice_watsonxai_url }}"
Expand All @@ -96,10 +95,7 @@ spec:
aiservice_watsonxai_username: "{{ .Values.ibm_aiservice_tenant.aiservice_watsonxai_username }}"
aiservice_watsonxai_verify: "{{ .Values.ibm_aiservice_tenant.aiservice_watsonxai_verify }}"

#rsl
rsl_url: "{{ .Values.ibm_aiservice_tenant.rsl_url }}"
rsl_org_id: "{{ .Values.ibm_aiservice_tenant.rsl_org_id }}"
rsl_token: "{{ .Values.ibm_aiservice_tenant.rsl_token }}"
#rsl - Per MASAIB-1915: Only CA cert for self-signed certificates
rsl_ca_crt: "{{ .Values.ibm_aiservice_tenant.rsl_ca_crt }}"

tenant_entitlement_type: "{{ .Values.ibm_aiservice_tenant.tenant_entitlement_type }}"
Expand Down
7 changes: 3 additions & 4 deletions root-applications/ibm-aiservice-tenant-root/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,10 +287,9 @@ ibm_aiservice_tenant:
# slscfg_ca: "slscfg_ca"
# slscfg_tls: "slscfg_tls"
# slscfg_key: "slscfg_key"
#RSL ##review
rsl_url: "rsl_url"
rsl_org_id: "rsl_org_id"
mas_aiservice_rsl_secret: "mas_aiservice_rsl_secret"
#RSL - Per MASAIB-1915: Only CA cert needed for self-signed certificates
# RSL URL, Org ID, and token are provided during FMEA model creation in the UI
rsl_ca_crt: "" # Optional: Base64-encoded CA certificate for self-signed RSL endpoints


# WatsonX
Expand Down
Loading