Skip to content

[patch] temporarily hardcode AI Service tenant operator resources - #519

Merged
boonware merged 4 commits into
mainfrom
masaib-2648-2
Aug 7, 2026
Merged

[patch] temporarily hardcode AI Service tenant operator resources#519
boonware merged 4 commits into
mainfrom
masaib-2648-2

Conversation

@boonware

@boonware boonware commented Aug 5, 2026

Copy link
Copy Markdown
Contributor

Issue

MASAIB-2712

Description

Temporarily hardcode the AI Service tenant operator resource requests and limits until the GitOps pipeline fully supports configuring these values. The operator's current requests are too high and this may potentially block a successful upgrade from AI Service 9.1 to 9.2. Work to make these values configurable is underway in #518

Test Results

Pointed ArgoCD to this branch in a test cluster and confirmed that the operator pod was redeployed with the resource changes

@boonware
boonware marked this pull request as draft August 5, 2026 12:04
@boonware
boonware marked this pull request as ready for review August 6, 2026 15:20
@boonware
boonware merged commit b606316 into main Aug 7, 2026
3 checks passed
@rbinns
rbinns deleted the masaib-2648-2 branch August 7, 2026 13:50
AditIBM931 added a commit that referenced this pull request Aug 17, 2026
…eline (#560)

* added podtemplates to licenseService CR

* improve ignored secret fields (#515)

Co-authored-by: Josef Harte <josefharte@Josefs-MacBook-Pro.local>

* [patch] temporarily hardcode AI Service tenant operator resources (#519)

* set operator resources

* set operator resources

* set operator resources

---------

Co-authored-by: Josef Harte <josefharte@dhcp-9-224-176-118.iea-ie.ibm.com>

* add sls_pod_templates support to standard and centralized SLS pipelines

* [patch] add kmodels toleration to instana agent pod (#556)

* fix: resolve DB2 credential mismatch causing Manage startup failure for inst1002 (#542)

## Issue
https://jsw.ibm.com/browse/MASCORE-14472

## Description
The `GenericAddon` addon type has been renamed from `application-configuration` to `saas-maf-enablement` in the MAS addons operator.

Updated `instance-applications/550-ibm-mas-addons-config/templates/07-application-configuration-cr.yaml` to reflect this rename across all fields:
- `metadata.name`: `{instance_id}-addons-application-configuration` → `{instance_id}-addons-saas-maf-enablement`
- `spec.displayName`: `{instance_id}-application-configuration` → `{instance_id}-saas-maf-enablement`
- `spec.addonType`: `application-configuration` → `saas-maf-enablement`
- `spec.config.instances[].name`: `{instance_id}-application-configuration` → `{instance_id}-saas-maf-enablement`

**Impact:** Without this change, the `GenericAddon` operator continuously fails to reconcile because it attempts to reserve app points for the old addon type `application-configuration` via the `catalogmgr` service, which returns a `404` since that addon type no longer exists. Clusters with the old resource already deployed will need the orphaned `GenericAddon` (`{instance_id}-addons-application-configuration`) manually deleted, as ArgoCD will create the new resource but will not automatically remove the renamed one.

## Test Results
Validated on a live cluster — the old `GenericAddon` resource (`inst01-addons-application-configuration`) was stuck in a `AppPointReservationFailed` failure loop with a `404` from `catalogmgr`. After deleting the old resource and allowing ArgoCD to sync the updated template, the new `GenericAddon` (`inst01-addons-saas-maf-enablement`) was created successfully with the correct `addonType`.

## Backporting
<!-- Does the change you are making need backporting? Create a seperate PR with the same name as this one but add the corresponding backport version to the end (`(8.10)`, `(8.11)`  or `(9.0)`) and provide a link to the PRs so that we can review and process the PRs together.

- 9.0 - #issuenumber
- 8.11 - #issuenumber
- 8.10 - #issuenumber

DELETE THIS SECTION if no backporting is required -->

## Related Pull Requests
<!-- Please list any related pull requests in other repositories. -->
<hr/>

### ⚠️ Notes for Reviewers
* Ensure you have understood the [guidelines](https://pages.github.ibm.com/maximoappsuite/playbook/tools/github/#guidelines) before proceeding with a review.
* Ensure all sections in the PR template are appropriately completed.

* [patch] Fix PostBackFlow.sh to detect facilities (#558)

* revrted changes

---------

Co-authored-by: Adit Yarra <adit.yarra@ibm.com>
Co-authored-by: Joe Harte <josefharte@gmail.com>
Co-authored-by: Josef Harte <josefharte@Josefs-MacBook-Pro.local>
Co-authored-by: Josef Harte <josefharte@dhcp-9-224-176-118.iea-ie.ibm.com>
Co-authored-by: vijeyanidhi <42498089+vijeyanidhi@users.noreply.github.com>
Co-authored-by: Hardik Prajapati <Hardik.Prajapati@ibm.com>
Co-authored-by: Nikita Kumble <47314239+nikitakumble@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants