Skip to content

[minor] Added configurable install plan approval support for AIService and AIService tenant #447

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

Open
Sakshi-Singhroha1 wants to merge 13 commits into
base: main
Choose a base branch
from
Open

[minor] Added configurable install plan approval support for AIService and AIService tenant #447

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
0dfa3c8
Added configurable installPlanApproval to AI Service subscription te…
Sakshi-Singhroha1 Apr 2, 2026
d280899
Configured aiservice install plan approval
Sakshi-Singhroha1 Apr 29, 2026
06d6089
Passed aiservice_install_plan_approval from root app to aiservice app
Sakshi-Singhroha1 Apr 30, 2026
fb34332
Removed Default values from values.yaml file
Sakshi-Singhroha1 May 4, 2026
d4a6f0a
Merge origin/main - resolved conflict and removed duplicate line
Sakshi-Singhroha1 May 4, 2026
90ca16f
removed extra whitespaces
Sakshi-Singhroha1 May 7, 2026
9098a40
Merge branch 'main' of github.com:ibm-mas/gitops into MASCORE-12745
Sakshi-Singhroha1 May 7, 2026
7564ad4
Remove duplicate aiservice_channel parameter from 040-ibm-aiservice-a…
Sakshi-Singhroha1 May 8, 2026
b292b33
Added installPlanApproval parameter for AIService Tenant operator
Sakshi-Singhroha1 May 11, 2026
92cf371
Merge branch 'main' of github.com:ibm-mas/gitops into MASCORE-12745
May 14, 2026
fce45ae
update clusteradminrole and applicationadminrole defaults for tenant …
May 14, 2026
a065c11
update
May 14, 2026
65fb3d5
Merge branch 'main' into MASCORE-12745
mnivedithaa May 15, 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
5 changes: 3 additions & 2 deletions instance-applications/113-ibm-aiservice/templates/04-aiservice-operator-subscription.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,9 @@ metadata:
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
spec:
channel: "{{ .Values.aiservice_channel }}"
installPlanApproval: Automatic
installPlanApproval: {{ .Values.aiservice_install_plan_approval }}
name: ibm-aiservice
source: "{{ .Values.mas_catalog_source }}"
sourceNamespace: openshift-marketplace
sourceNamespace: openshift-marketplace
{{- end }}

2 changes: 1 addition & 1 deletion ...cations/115-ibm-aiservice-tenant/templates/06-aiservice-tenant-operator-subscription.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ metadata:
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
spec:
channel: "{{ .Values.catalog_channel }}"
installPlanApproval: Automatic
installPlanApproval: {{ .Values.aiservice_tenant_install_plan_approval }}
name: ibm-aiservice-tenant
source: "{{ .Values.catalog_source }}"
sourceNamespace: openshift-marketplace
Expand Down
1 change: 1 addition & 0 deletions root-applications/ibm-aiservice-instance-root/templates/040-ibm-aiservice-app.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ spec:
aiservice_s3_port: "{{ .Values.ibm_aiservice.aiservice_s3_port }}"
aiservice_s3_region: "{{ .Values.ibm_aiservice.aiservice_s3_region }}"
aiservice_operator_log_level: "{{ .Values.ibm_aiservice.aiservice_operator_log_level }}"
aiservice_install_plan_approval: "{{ .Values.ibm_aiservice.aiservice_install_plan_approval }}"

junitreporter:
reporter_name: "ibm-aiservice-{{ .Values.instance.id }}"
Expand Down
4 changes: 2 additions & 2 deletions root-applications/ibm-aiservice-instance-root/templates/070-aiservice-tenant-appset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,9 @@ spec:
values: "{{ `{{ toYaml . }}` }}"
parameters:
- name: "cluster_admin_role"
value: "{{ .Values.cluster_admin_role }}"
value: "{{ if hasKey .Values `cluster_admin_role` }}{{ .Values.cluster_admin_role }}{{ else }}true{{ end }}"
- name: "application_admin_role"
value: "{{ .Values.application_admin_role }}"
value: "{{ if hasKey .Values `application_admin_role` }}{{ .Values.application_admin_role }}{{ else }}true{{ end }}"
- name: "generator.repo_url"
value: "{{ .Values.generator.repo_url }}"
- name: "generator.revision"
Expand Down
9 changes: 5 additions & 4 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 @@ -44,6 +44,7 @@ spec:
value: |
catalog_source: "{{ .Values.ibm_aiservice_tenant.catalog_source }}"
catalog_channel: "{{ .Values.ibm_aiservice_tenant.catalog_channel }}"
aiservice_tenant_install_plan_approval: "{{ .Values.ibm_aiservice_tenant.aiservice_tenant_install_plan_approval }}"

tenant_id: "{{ .Values.ibm_aiservice_tenant.tenant_id }}"
aiservice_instance_id: "{{ .Values.ibm_aiservice_tenant.aiservice_instance_id }}"
Expand All @@ -52,8 +53,8 @@ spec:
account_id: "{{ .Values.account.id }}"
region_id: "{{ .Values.region.id }}"
cluster_id: "{{ .Values.cluster.id }}"
cluster_admin_role: {{ .Values.cluster_admin_role }}
application_admin_role: {{ .Values.application_admin_role }}
cluster_admin_role: {{ if hasKey .Values "cluster_admin_role" }}{{ .Values.cluster_admin_role }}{{ else }}true{{ end }}
application_admin_role: {{ if hasKey .Values "application_admin_role" }}{{ .Values.application_admin_role }}{{ else }}true{{ end }}
# SAAS
aiservice_saas_apikey: "{{ .Values.ibm_aiservice_tenant.aiservice_saas_apikey }}"
mas_aiservice_saas: "{{ .Values.ibm_aiservice_tenant.mas_aiservice_saas }}"
Expand Down Expand Up @@ -132,10 +133,10 @@ spec:
selfHeal: true
retry:
limit: 20
{{- if .Values.cluster_admin_role }}
syncOptions:
{{- if .Values.cluster_admin_role }}
- CreateNamespace=true
{{- end }}
{{- end }}
{{- if or .Values.custom_labels .Values.argocluster_instance }}
managedNamespaceMetadata:
labels:
Expand Down
Loading