Update disableSamples to create samples config resource if it does not exist #4045
Conversation
This file contains 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
tsatam
force-pushed
the
tsatam/ARO-14389-fix-disablesamples
branch
from
9a3a10c to
23600d9
Compare
kimorris27
reviewed
Jan 13, 2025
|
LGTM in addition to automated e2e I'd like a couple of by hand tests executed in different regions to ensure we didn't miss anything. |
hawkowl
reviewed
Jan 14, 2025
| // bootstrap and create the resource | ||
| // | ||
| // https://docs.openshift.com/container-platform/4.17/openshift_images/configuring-samples-operator.html#samples-operator-restricted-network-install-with-access | ||
| if errors.IsNotFound(err) { |
There was a problem hiding this comment.
Should we make sure that if this fails with a conflict (e.g. it gets bootstrapped, maybe?) then we leave it alone? Or retry, maybe by using clienthelper's Ensure or something?
There was a problem hiding this comment.
We already have been retrying on conflicts:
Line 24 in 23600d9
There was a problem hiding this comment.
Oh, I guess the whole thing being wrapped in it would do it as well. I'm a derp :)
tsatam
requested review from
jewzaam,
bennerv,
rogbas,
petrkotas,
jharrington22,
cblecker,
cadenmarchese,
UlrichSchlueter,
SudoBrendan,
yjst2012,
jaitaiwan,
anshulvermapatel,
hlipsig,
mociarain,
bitoku and
sankur-codes
as code owners
yjst2012
approved these changes
Jan 15, 2025
2 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Which issue this PR addresses:
Fixes ARO-14389
What this PR does / why we need it:
The current implementation of disableSamples fails and retries if the config resource does not exist. This resource is created by the samples operator at the end of its bootstrapping process. However, in some circumstances, this process can take a long time to finish, and as a result this resource will not exist before our disableSamples implementation gives up and exits.
This PR updates this process to instead, create the config resource if it does not exist, following the recommendations outlined in https://docs.openshift.com/container-platform/4.17/openshift_images/configuring-samples-operator.html#samples-operator-restricted-network-install-with-access.
Further improvement ideas (not implemented in this PR):
Test plan for issue:
[ ] Attempt a cluster install with this fix and a reproducer for the failure mode here (e.g. custom routing that redirects traffic for registry.redhat.io to a location that times out requests)we were not able to create a reproducer.Is there any documentation that needs to be updated for this PR?
No
How do you know this will function as expected in production?
Above testing/validation