Skip to content
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

Jump to bottom

[patch] apply kubernetes changes server side to avoid version conflicts #1459

Merged
merged 2 commits into from
Sep 9, 2024
Merged

[patch] apply kubernetes changes server side to avoid version conflicts #1459

merged 2 commits into from
Sep 9, 2024

Conversation

stonepd
Copy link
Contributor

@stonepd stonepd commented Sep 9, 2024

Description
Fixing Issue https://jsw.ibm.com/browse/MASCORE-3802

409 conflicts occur when applying changes client side as the resource changed has been modifed server side by the time the api call has succeeded. To fix this we use kubernetes server-side apply.

Testing
I tested the new code against pfvtcpd48 cluster, the roles succeeded which doesn't necessarily mean that this intermittent failure is fixed but shows that the server side apply works and doesn't break things further

@stonepd stonepd requested a review from jonquark September 9, 2024 15:39
@JonahLuckett JonahLuckett added this pull request to the merge queue Sep 9, 2024
Merged via the queue into master with commit 7b15177 Sep 9, 2024
2 checks passed
@JonahLuckett JonahLuckett deleted the mascore-3802 branch September 9, 2024 16:03
stonepd added a commit that referenced this pull request Sep 10, 2024
@stonepd
Revert "[patch] apply kubernetes changes server side to avoid version…
836d552 
… conflicts (#1459)"

This reverts commit 7b15177.
stonepd added a commit that referenced this pull request Sep 10, 2024
@stonepd
Reapply "[patch] apply kubernetes changes server side to avoid versio…
8425ca4 
…n conflicts (#1459)"

This reverts commit 836d552.
This was referenced Sep 10, 2024
Closed
Merged
karol-czarnecki added a commit that referenced this pull request Oct 7, 2024
@karol-czarnecki
Squashed commit of the following:
9bd6323 
commit a14b5b4
Author: stonepd <[email protected]>
Date:   Thu Oct 3 17:11:30 2024 +0100

    [patch] fixes for CPD 5 edge cases and race conditions (#1501)

commit c39c254
Author: stonepd <[email protected]>
Date:   Thu Oct 3 09:45:12 2024 +0100

    [patch] CPD5 - install Python 3.10 runtime for Watson Studio (#1500)

commit e7faadf
Author: Witold Wierzchowski <[email protected]>
Date:   Thu Oct 3 06:02:36 2024 +0200

    [patch] Add variable for vargraphic setting for Manage and Health (#1427)

    Co-authored-by: Witold Wierzchowski <[email protected]>

commit ca4d333
Author: stonepd <[email protected]>
Date:   Tue Oct 1 18:46:11 2024 +0100

    [patch] update expired zenmetastore-edb license (#1497)

commit d3e3eb4
Author: Rawa <[email protected]>
Date:   Tue Oct 1 16:25:56 2024 +0100

    [patch] Fix usage of MASBR_BACKUP_DATA for mongo and db2 backup (#1496)

    Co-authored-by: Rawa Resul <[email protected]>

commit 672daca
Author: André Marcelino <[email protected]>
Date:   Tue Oct 1 11:00:09 2024 -0300

    [patch] Allow specifying CERT_MANAGER_NAMESPACE in suite_dns (#1476)

commit 7cef1f9
Author: Alona Varshal <[email protected]>
Date:   Tue Oct 1 02:13:31 2024 -0500

    [patch] Update block vs file storageclass in oneclick_core readme (#1494)

commit 507ec66
Author: Eric Klingelberger <[email protected]>
Date:   Mon Sep 30 03:14:35 2024 -0500

    [patch] updates to mongodb grafana v5 dashboard (#1491)

    Co-authored-by: Eric Klingelberger <[email protected]>
    Co-authored-by: Andrew Whitfield <[email protected]>

commit 8fd6bc7
Author: Benjamin Xue <[email protected]>
Date:   Mon Sep 30 03:06:20 2024 -0500

    [patch] Add AIbroker public cert (#1432)

commit 655da76
Author: Tremaine Hart <[email protected]>
Date:   Thu Sep 26 15:10:24 2024 -0500

    [patch] [MASCORE-3990] Mongo v7 upgrade wipes existing stateful set cpu/memory requests/limits (#1490)

commit b0be83e
Author: Tremaine Hart <[email protected]>
Date:   Wed Sep 25 08:15:25 2024 -0500

    [patch] use apiVersion instead of api in grafana role (#1479)

    Co-authored-by: JonahLuckett <[email protected]>

commit f2e3e74
Author: Aymen-Ben-S <[email protected]>
Date:   Wed Sep 25 09:11:51 2024 -0400

    [patch] Bump secret creation earlier in Turbonomic role (#1487)

commit 35b4af7
Author: karol-czarnecki <[email protected]>
Date:   Tue Sep 24 17:13:55 2024 +0100

    [patch] add support for default storage classes in techzone clusters (#1481)

    Co-authored-by: karol-czarnecki <[email protected]/com>

commit 4bca03f
Author: Terence Quinn <[email protected]>
Date:   Tue Sep 24 11:12:42 2024 -0500

    [patch] allow setting of PLAIN authentication for MongoDB (#1486)

commit 12e101f
Author: Tremaine Hart <[email protected]>
Date:   Thu Sep 19 11:02:36 2024 -0500

    [patch] forgot to add rbac rules for grafana v5 (#1478)

commit b8d545d
Author: Harsh Tamakuwala <[email protected]>
Date:   Thu Sep 19 20:07:43 2024 +0530

    [patch] Fix namespace lookup when cert provider is ibm (#1477)

    Co-authored-by: Harsh Tamakuwala <[email protected]>

commit 6b0385f
Author: Tremaine Hart <[email protected]>
Date:   Wed Sep 18 09:50:52 2024 -0500

    [patch] fix nfs for manage and health (#1474)

commit b1630e9
Author: Tremaine Hart <[email protected]>
Date:   Tue Sep 17 10:22:05 2024 -0500

    [patch] [MASCORE-3733] grafana dashboard not working after upgrade openshift to v4.15 (#1472)

commit fdee49c
Author: stonepd <[email protected]>
Date:   Tue Sep 17 10:00:18 2024 +0100

    [patch] wait for subscription to complete when creating (#1471)

commit 901c12a
Author: chiragcsatani <[email protected]>
Date:   Mon Sep 16 10:50:53 2024 +0530

    Revert "[patch] debug statement for cos hmac" (#1470)

commit 774be6e
Author: leo-miran <[email protected]>
Date:   Fri Sep 13 15:00:25 2024 -0300

    [patch] debug statement for cos hmac (#1469)

    Co-authored-by: Chirag Satani <[email protected]>

commit 5803215
Author: Alexandre Quinteiro <[email protected]>
Date:   Thu Sep 12 23:36:07 2024 -0300

    [patch] Add cos prefix in use_hmac parameter (#1467)

    Co-authored-by: Alexandre Quinteiro <[email protected]>

commit 8f367c3
Author: David Parker <[email protected]>
Date:   Thu Sep 12 16:16:20 2024 +0100

    [patch] Fix NFS idempotency checks (#1466)

commit d676162
Author: stonepd <[email protected]>
Date:   Thu Sep 12 11:45:45 2024 +0100

    [patch] apply kubernetes changes server side to avoid version conflicts (#1465)

    Co-authored-by: JonahLuckett <[email protected]>

commit e353afd
Author: Tremaine Hart <[email protected]>
Date:   Wed Sep 11 09:18:17 2024 -0500

    [patch] move mongo image to ubi8 (#1464)

commit 38e110a
Author: David Parker <[email protected]>
Date:   Wed Sep 11 09:39:23 2024 +0100

    [patch] Fix "IBM License Key Center" link in docs

commit d43185f
Author: Ian Boden <[email protected]>
Date:   Tue Sep 10 12:28:07 2024 +0100

    [patch] Mirror correct build of postgresql when using odf (#1413)

commit 75b25f7
Author: Ian Boden <[email protected]>
Date:   Tue Sep 10 12:26:49 2024 +0100

    [patch] Change how grafana is installed to be compatible with OCP 4.16 (#1436)

commit 3385693
Author: Harsh Tamakuwala <[email protected]>
Date:   Tue Sep 10 16:55:55 2024 +0530

    [patch] replaces awk cmd with k8s_info in detect_cert_manager (#1455)

    Co-authored-by: Harsh Tamakuwala <[email protected]>

commit b221d12
Author: stonepd <[email protected]>
Date:   Tue Sep 10 10:43:25 2024 +0100

    [patch] Revert Apply kubernetes changes server side  (#1461)

commit bd3189f
Author: Vishal-patel-7 <[email protected]>
Date:   Tue Sep 10 08:44:45 2024 +0530

    [minor] Added HMAC support for cos (#1447)

    Co-authored-by: Alexandre Quinteiro <[email protected]>
    Co-authored-by: unnati-solanki-git <[email protected]>

commit 7b15177
Author: stonepd <[email protected]>
Date:   Mon Sep 9 17:01:01 2024 +0100

    [patch] apply kubernetes changes server side to avoid version conflicts (#1459)

commit 8c4974d
Author: Tremaine Hart <[email protected]>
Date:   Fri Sep 6 10:10:49 2024 -0500

    [minor] [MASCORE-3026] implement role/tasks for new deployments of MongoDB CE v7.0 (#1452)

commit 524d951
Author: David Parker <[email protected]>
Date:   Thu Sep 5 11:26:43 2024 +0100

    [major] Remove UDS image mirroring support (#1451)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@JonahLuckett JonahLuckett JonahLuckett approved these changes

@jonquark jonquark Awaiting requested review from jonquark

@durera durera Awaiting requested review from durera durera is a code owner

@andrercm andrercm Awaiting requested review from andrercm andrercm is a code owner

@sanjayprab sanjayprab Awaiting requested review from sanjayprab sanjayprab is a code owner

@terenceq terenceq Awaiting requested review from terenceq terenceq is a code owner

@whitfiea whitfiea Awaiting requested review from whitfiea whitfiea is a code owner

@alequint alequint Awaiting requested review from alequint alequint is a code owner

@leo-miran leo-miran Awaiting requested review from leo-miran leo-miran is a code owner

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@stonepd @JonahLuckett