Sync release-future branch with master #2381

bluzarraga · 2025-02-12T22:18:42Z

We are using the future branches to make changes to the helm charts so we can continue to make changes to helm charts while code freeze is in place for 4.11 GA

Signed-off-by: YuChen <[email protected]>

* Update OperandConfig with value reference Signed-off-by: Daniel Fan <[email protected]> * Add operator ns for EDB image list ConfigMap Signed-off-by: Daniel Fan <[email protected]> * add value reference for EDB license image Signed-off-by: Daniel Fan <[email protected]> * fix EDB operand image digest Signed-off-by: Daniel Fan <[email protected]> --------- Signed-off-by: Daniel Fan <[email protected]>

Signed-off-by: Daniel Fan <[email protected]>

Signed-off-by: Ben Luzarraga <[email protected]>

for OperandConfig resources[*] array field Signed-off-by: Daniel Fan <[email protected]>

* add storage class placeholder for EDB-Keycloak * EDB-Keycloak storage configuration Signed-off-by: YuChen <[email protected]> --------- Signed-off-by: YuChen <[email protected]> Co-authored-by: Piotr Godowski <[email protected]> Co-authored-by: YuChen <[email protected]>

* Handle EDB Keycloak profile sizes * Apply suggestions from code review Co-authored-by: giacomoch <[email protected]> * specify profile size for Keycloak * EDB and keycloak size configuration Signed-off-by: YuChen <[email protected]> * align default EDB resources with the starterset --------- Signed-off-by: YuChen <[email protected]> Co-authored-by: Piotr Godowski <[email protected]> Co-authored-by: giacomoch <[email protected]> Co-authored-by: YuChen <[email protected]>

* Fix keycloak CatalogSource reference issue Signed-off-by: Daniel Fan <[email protected]> * implement Keycloak BindInfo via template reference Signed-off-by: Daniel Fan <[email protected]> --------- Signed-off-by: Daniel Fan <[email protected]>

Signed-off-by: James Hewitt <[email protected]>

Signed-off-by: Piotr Godowski <[email protected]> Co-authored-by: Piotr Godowski <[email protected]>

for all namespace mode, move services Ns check into reconciliation logic Signed-off-by: Daniel Fan <[email protected]>

Signed-off-by: Daniel Fan <[email protected]>

Signed-off-by: YuChen <[email protected]>

Signed-off-by: Daniel Fan <[email protected]>

* Bump version to 4.4.0 Signed-off-by: Daniel Fan <[email protected]> * Add new IM v4.4 entry Signed-off-by: Daniel Fan <[email protected]> --------- Signed-off-by: Daniel Fan <[email protected]>

Signed-off-by: Daniel Fan <[email protected]>

and unused code Signed-off-by: Daniel Fan <[email protected]>

Signed-off-by: James Hewitt <[email protected]>

* introduce maintennance mode into cs operator Signed-off-by: YuChen <[email protected]> * add annotation and label change predicate Signed-off-by: YuChen <[email protected]> --------- Signed-off-by: YuChen <[email protected]>

Bumps golang from 1.21.3-bullseye to 1.21.4-bullseye. --- updated-dependencies: - dependency-name: golang dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Co-authored-by: Piotr Godowski <[email protected]>

* Add Keycloak truststore configuration option * Add the Keycloak startup script to generate truststore * import also default serviceaccount ca.crt --------- Co-authored-by: Piotr Godowski <[email protected]>

Co-authored-by: Piotr Godowski <[email protected]>

Signed-off-by: Daniel Fan <[email protected]>

when spec field does not exist Signed-off-by: Daniel Fan <[email protected]>

Signed-off-by: Daniel Fan <[email protected]>

Bumps golang from 1.21.4-bullseye to 1.21.5-bullseye. --- updated-dependencies: - dependency-name: golang dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Co-authored-by: Piotr Godowski <[email protected]>

Signed-off-by: Allen Li <[email protected]>

* added operatorVersion for helm chart Signed-off-by: Henry Li <[email protected]> * changed helm chart version to 4.11.0 Signed-off-by: Henry Li <[email protected]> * changed image tag to use chart.appVersion Signed-off-by: Henry Li <[email protected]> --------- Signed-off-by: Henry Li <[email protected]>

Signed-off-by: Henry Li <[email protected]>

* added CommonService CR to helm chart Signed-off-by: Henry Li <[email protected]> * removed optional namespace-scope configmap to avoid needing restart if NSS operator is not installed first Signed-off-by: Henry Li <[email protected]> --------- Signed-off-by: Henry Li <[email protected]>

* updated helm template to work with CICD automation Signed-off-by: Henry Li <[email protected]> * removed operatorVersion because it will have no function when charts are built Signed-off-by: Henry Li <[email protected]> --------- Signed-off-by: Henry Li <[email protected]>

* comment out values for transition to global values file * global values transition * replace values with global values * update pull secret * Update global values

* remove cluster rbac * add cluster roles to cluster rbac file

Signed-off-by: Henry Li <[email protected]>

* add storageclass config option Signed-off-by: YuChen <[email protected]> * Update helm/templates/cr.yaml Co-authored-by: Henry Li <[email protected]> --------- Signed-off-by: YuChen <[email protected]> Co-authored-by: Henry Li <[email protected]>

Signed-off-by: YuChen <[email protected]>

* added new postgres parameter max_slot_wal_keep_size Signed-off-by: Henry Li <[email protected]> * quote value since EDB docs has value quoted Signed-off-by: Henry Li <[email protected]> * fixed incorrect value for max_slot_wal_keep_size Signed-off-by: Henry Li <[email protected]> --------- Signed-off-by: Henry Li <[email protected]>

* cs-operator refactor for no olm Signed-off-by: Allen Li <[email protected]> * add deployment status check Signed-off-by: Allen Li <[email protected]> * update status check Signed-off-by: Allen Li <[email protected]> * revert unused changes Signed-off-by: Allen Li <[email protected]> * add comment Signed-off-by: Allen Li <[email protected]> * update returned error message Signed-off-by: Allen Li <[email protected]> * typo in check condition Signed-off-by: Allen Li <[email protected]> * change forceupdate to true Signed-off-by: Allen Li <[email protected]> * add else condition Signed-off-by: Allen Li <[email protected]> * add error condition Signed-off-by: Allen Li <[email protected]> * lint issue Signed-off-by: Allen Li <[email protected]> --------- Signed-off-by: Allen Li <[email protected]>

bluzarraga · 2025-02-12T22:34:05Z

/retest

bitscuit

/lgtm

ibm-ci-bot · 2025-02-12T22:39:35Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bitscuit, bluzarraga

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details

Needs approval from an approver in each of these files:

~~OWNERS~~ [bitscuit,bluzarraga]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

bitscuit · 2025-02-12T22:58:44Z

/verify-owners

ibm-ci-bot · 2025-02-12T22:58:55Z

The following users are mentioned in OWNERS file(s) but are untrusted for the following reasons. One way to make the user trusted is to add them as members of the IBM org. You can then trigger verification by writing /verify-owners in a comment.

pgodowski
- User is not a member of the org. User is not a collaborator. Satisfy at least one of these conditions to make the user trusted.
- OWNERS

YCShen1010 and others added 30 commits November 1, 2023 05:22

new entries with suffix -v4.3 (#1573)

c6c1c8c

Signed-off-by: YuChen <[email protected]>

Expose postgresql Image list via ConfigMap (#1583)

a0ef885

Signed-off-by: Daniel Fan <[email protected]>

update grpc pkg (#1584)

528c348

Signed-off-by: Ben Luzarraga <[email protected]>

Enable customized configuration (#1585)

1593e4c

for OperandConfig resources[*] array field Signed-off-by: Daniel Fan <[email protected]>

Missing . in objectRef path (#1597)

421d38a

Signed-off-by: James Hewitt <[email protected]>

Update odlm.go (#1607)

faa49e6

Signed-off-by: Piotr Godowski <[email protected]> Co-authored-by: Piotr Godowski <[email protected]>

Create default CR even services Ns does not exist (#1611)

0f9a681

for all namespace mode, move services Ns check into reconciliation logic Signed-off-by: Daniel Fan <[email protected]>

remove redhat-operators from excluded list (#1613)

cecdd65

Signed-off-by: Daniel Fan <[email protected]>

Bump version to 4.3.1 (#1651)

20e97ef

Signed-off-by: Daniel Fan <[email protected]>

align default EDB keycloak with starterset (#1638)

61873ed

Signed-off-by: YuChen <[email protected]>

Update installer License short link (#1631)

77bfadc

Signed-off-by: Daniel Fan <[email protected]>

Bump version to 4.4.0 (#1653)

0d5f8b6

* Bump version to 4.4.0 Signed-off-by: Daniel Fan <[email protected]> * Add new IM v4.4 entry Signed-off-by: Daniel Fan <[email protected]> --------- Signed-off-by: Daniel Fan <[email protected]>

Remove multiInstance template (#1652)

42d0e49

Signed-off-by: Daniel Fan <[email protected]>

Update Zen channel to v4.3 temporarily (#1656)

096940f

Signed-off-by: Daniel Fan <[email protected]>

Clean webhook, secretshare and zen reference (#1654)

f15f2a7

and unused code Signed-off-by: Daniel Fan <[email protected]>

Add default realm security settings (#1655)

362c554

Signed-off-by: James Hewitt <[email protected]>

introduce basic maintenance mode into CS operator (#1661)

0b3b9f0

* introduce maintennance mode into cs operator Signed-off-by: YuChen <[email protected]> * add annotation and label change predicate Signed-off-by: YuChen <[email protected]> --------- Signed-off-by: YuChen <[email protected]>

Fix swapped key/name (#1683)

fd1dde4

Co-authored-by: Piotr Godowski <[email protected]>

Add Keycloak truststore configuration option (#1659)

7b17292

* Add Keycloak truststore configuration option * Add the Keycloak startup script to generate truststore * import also default serviceaccount ca.crt --------- Co-authored-by: Piotr Godowski <[email protected]>

Import multiple PEM encoded SA ca.crt (#1685)

2187024

Co-authored-by: Piotr Godowski <[email protected]>

Avoid overwrite fields in merged CR (#1694)

415c64c

Signed-off-by: Daniel Fan <[email protected]>

fix: get extreme value on resources field (#1695)

b55a99f

when spec field does not exist Signed-off-by: Daniel Fan <[email protected]>

Add managedByCsOperator label for ConfigMap (#1703)

ff52bd0

Signed-off-by: Daniel Fan <[email protected]>

remove the 3 iterations password policy (#1712)

f6532b2

Co-authored-by: Piotr Godowski <[email protected]>

qpdpQ and others added 15 commits January 31, 2025 23:20

remove crs from helm chart (#2358)

c25853c

Signed-off-by: Allen Li <[email protected]>

add create certificate cr (#2359)

475abf9

Signed-off-by: Allen Li <[email protected]>

changed from using Chart.AppVersion to values.yaml (#2362)

5b1c788

Signed-off-by: Henry Li <[email protected]>

comment out values for transition to global values file (#2366)

b8b590a

* comment out values for transition to global values file * global values transition * replace values with global values * update pull secret * Update global values

remove cluster rbac (#2369)

0fce1cc

* remove cluster rbac * add cluster roles to cluster rbac file

Update OWNERS (#2368)

0b515db

Trigger build with new base image

bb0fd55

updated ODLM to channel v4.4 for CD (#2375)

d9d81f0

Signed-off-by: Henry Li <[email protected]>

skip EDB image list for non-olm case (#2376)

b391ae6

Signed-off-by: YuChen <[email protected]>

ibm-ci-bot requested review from Daniel-Fan and bitscuit February 12, 2025 22:18

ibm-ci-bot added approved size/XXL labels Feb 12, 2025

Merge branch 'release-future' into mergeconflictforsync

ef86d2a

ibm-ci-bot added the do-not-merge/invalid-owners-file label Feb 12, 2025

bitscuit approved these changes Feb 12, 2025

View reviewed changes

ibm-ci-bot assigned bitscuit Feb 12, 2025

ibm-ci-bot added the lgtm label Feb 12, 2025

bitscuit removed the do-not-merge/invalid-owners-file label Feb 12, 2025

ibm-ci-bot merged commit ebc68a5 into release-future Feb 12, 2025
5 of 8 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Sync release-future branch with master #2381

Sync release-future branch with master #2381

Uh oh!

bluzarraga commented Feb 12, 2025

Uh oh!

bluzarraga commented Feb 12, 2025

Uh oh!

bitscuit left a comment

Uh oh!

ibm-ci-bot commented Feb 12, 2025

Uh oh!

bitscuit commented Feb 12, 2025

Uh oh!

ibm-ci-bot commented Feb 12, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

13 participants

Sync release-future branch with master #2381

Sync release-future branch with master #2381

Uh oh!

Conversation

bluzarraga commented Feb 12, 2025

Uh oh!

bluzarraga commented Feb 12, 2025

Uh oh!

bitscuit left a comment

Choose a reason for hiding this comment

Uh oh!

ibm-ci-bot commented Feb 12, 2025

Uh oh!

bitscuit commented Feb 12, 2025

Uh oh!

ibm-ci-bot commented Feb 12, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

13 participants