Edge Sync updates#561
Merged
amrc-benmorrow merged 10 commits intomainfrom Jan 27, 2026
Merged
Conversation
amrc-benmorrow
force-pushed
the
bmz/auth-rx-client
branch
3 times, most recently
from
6f309a5 to
307027e
Compare
amrc-benmorrow
force-pushed
the
bmz/auth-rx-client
branch
from
cc1fb6b to
7688799
Compare
amrc-benmorrow
force-pushed
the
bmz/edge-sync
branch
from
e933387 to
0650e0b
Compare
amrc-benmorrow
force-pushed
the
bmz/auth-rx-client
branch
from
7688799 to
d2a9f52
Compare
amrc-benmorrow
force-pushed
the
bmz/auth-rx-client
branch
from
579c175 to
2016e4a
Compare
amrc-benmorrow
force-pushed
the
bmz/edge-sync
branch
2 times, most recently
from
f84e31e to
859c180
Compare
amrc-benmorrow
force-pushed
the
bmz/edge-sync
branch
from
36c1d2d to
e6412d8
Compare
amrc-benmorrow
force-pushed
the
bmz/edge-sync
branch
from
e6412d8 to
a665775
Compare
This doesn't use the Auth service but is suffering from unreliable ConfigDB updates.
If we're committing it we need to build with it.
We started using merge-patch to avoid stomping on status changes made by Flux, but it's not straightforward to use merge-patch to remove fields. Use apply-patch instead, it's what k8s recommend. Unify the handling of the GitRepo resources with the HelmReleases. Give the GitRepo resources more sensible names.
Annoyingly the API has changes. We must maintain back-compat in rx-util for now as this is also used by the Monitor.
Instead of generating HelmReleases from a template in the ConfigDB and GitRepos from a template in the code, generate both from the ConfigDB. Generalise the HelmRelease single-entry app to _K8s resource template_, applying to objects of class _K8s resource kind_. Create a new _HelmRelease_ object in that class to hold the previous config. Unfortunately all the generation must still be special-cased in the code; there is too much detail required to make the whole process data-driven. (I'll be reinventing Helm in a minute...)
We have just merged another use of 0.19; upgrade to 1.x. Upgrade to 1.4 throughout.
* The incompatible k8s library upgrade is already handled by rx-util. * Upgrade to in-tree libraries.
These are names for the resources we are deploying directly, so the normalisation within the Helm charts doesn't help.
amrc-benmorrow
force-pushed
the
bmz/edge-sync
branch
from
a665775 to
1895470
Compare
amrc-benmorrow
added a commit
that referenced
this pull request
Feb 25, 2026
I am having trouble upgrading an edge cluster. The Helm chart rename done by #561 will not install cleanly as the old and new charts reference the same resources. I am hoping that enabling drift detection will cause Flux to sort itself out eventually.
Merged
amrc-benmorrow
added a commit
that referenced
this pull request
Mar 9, 2026
I am having trouble upgrading an edge cluster. The Helm chart rename done by #561 will not install cleanly as the old and new charts reference the same resources. I am hoping that enabling drift detection will cause Flux to sort itself out eventually.
amrc-benmorrow
added a commit
that referenced
this pull request
Mar 9, 2026
I am having trouble upgrading an edge cluster. The Helm chart rename done by #561 will not install cleanly as the old and new charts reference the same resources. I am hoping that enabling drift detection will cause Flux to sort itself out eventually.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This is more reliable.
Merge-patch will not delete fields. This is the only reliable method of update and is recommended by the k8s docs.
This will redeploy edge deployments when the Helm chart template changes.
The update is incompatible.