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.

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

outposts: fix Outpost reconcile not re-assigning managed attribute #8014

Merged
merged 2 commits into from
Dec 30, 2023

Conversation

BeryJu
Copy link
Member

@BeryJu BeryJu commented Dec 29, 2023

Details

If for some reason the managed outpost losses its managed attribute, the reconcile on startup would fail. This should prevent the reconcile from failing and also prevents the API from changing the managed attribute or the name of the embedded outpost


Checklist

  • Local tests pass (ak test authentik/)
  • The code has been formatted (make lint-fix)

If an API change has been made

  • The API schema has been updated (make gen-build)

If changes to the frontend have been made

  • The code has been formatted (make web)
  • The translation files have been updated (make i18n-extract)

If applicable

  • The documentation has been updated
  • The documentation has been formatted (make website)

Signed-off-by: Jens Langhammer <jens@goauthentik.io>
@BeryJu BeryJu requested a review from a team as a code owner December 29, 2023 22:27
Copy link

netlify bot commented Dec 29, 2023

Deploy Preview for authentik-storybook canceled.

Name Link
🔨 Latest commit f181e8f
🔍 Latest deploy log https://app.netlify.com/sites/authentik-storybook/deploys/658f4e14cc437e0008a83ad4

@BeryJu
Copy link
Member Author

BeryJu commented Dec 29, 2023

/cherry-pick version-2023.10

Copy link

codecov bot commented Dec 29, 2023

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (0e1646c) 92.02% compared to head (f181e8f) 92.47%.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #8014      +/-   ##
==========================================
+ Coverage   92.02%   92.47%   +0.45%     
==========================================
  Files         594      594              
  Lines       29524    29551      +27     
==========================================
+ Hits        27168    27326     +158     
+ Misses       2356     2225     -131     
Flag Coverage Δ
e2e 50.69% <6.66%> (+1.57%) ⬆️
integration 26.15% <0.00%> (-0.03%) ⬇️
unit 89.58% <100.00%> (+0.01%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Signed-off-by: Jens Langhammer <jens@goauthentik.io>
@BeryJu BeryJu force-pushed the outposts/fix-outpost-reconcile-missing-managed branch from 72d087c to f181e8f Compare December 29, 2023 22:54
@BeryJu BeryJu merged commit 1c3cce1 into main Dec 30, 2023
63 checks passed
@BeryJu BeryJu deleted the outposts/fix-outpost-reconcile-missing-managed branch December 30, 2023 14:18
gcp-cherry-pick-bot bot pushed a commit that referenced this pull request Dec 30, 2023
…8014)

* outposts: fix Outpost reconcile not re-assigning managed attribute

Signed-off-by: Jens Langhammer <jens@goauthentik.io>

* rework reconcile to find both name and managed outpost

Signed-off-by: Jens Langhammer <jens@goauthentik.io>

---------

Signed-off-by: Jens Langhammer <jens@goauthentik.io>
BeryJu added a commit that referenced this pull request Dec 30, 2023
…herry-pick #8014) (#8020)

outposts: fix Outpost reconcile not re-assigning managed attribute (#8014)

* outposts: fix Outpost reconcile not re-assigning managed attribute



* rework reconcile to find both name and managed outpost



---------

Signed-off-by: Jens Langhammer <jens@goauthentik.io>
Co-authored-by: Jens L <jens@goauthentik.io>
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.

1 participant