-
Notifications
You must be signed in to change notification settings - Fork 4.7k
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
Don't enforce quota in registry by default #9400
Don't enforce quota in registry by default #9400
Conversation
Flake #9402. And two errors in extended tests:
I need to investigate them. They may be test flakes or an error in server's admission plugin. Either way, this change didn't introduce the problem. [test] |
This isn't enough (wont fix the issue) - the absence of the ENV var must default to "off" in the registry middleware - today the quotaEnforcing code is still added even when quota is off, which causes limit range checks, which breaks backwards compatibility. The middleware needs to default to not using the quotaBlobStore if the env var isn't set to true |
When we add backward compat things, we can't default new features to on if those features also require changes to the master for several releases. |
@smarterclayton but we default to not enforcing quota by default right now. So you'd have to have either a custom config file or a new deployment config created with current defaults (the enforce env var set to |
@smarterclayton oh I see now. There's a bug. Will update. |
The quota enforcement has been off by default for existing deployments. Let's keep it off by default for the new ones as well. Signed-off-by: Michal Minar <[email protected]>
7f52d6f
to
f303562
Compare
@@ -168,7 +168,7 @@ func (r *repository) Blobs(ctx context.Context) distribution.BlobStore { | |||
|
|||
bs := r.Repository.Blobs(ctx) | |||
|
|||
if quotaEnforcing != nil { | |||
if !quotaEnforcing.enforcementDisabled { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@smarterclayton this was the culprit - well, my accomplice.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
:). After Alexey lands his changes to distribution I have a refactor to the middleware initialization path that prevents us from reloading the clients multiple times (which was not intentional) that will affect some of this code. But the quick fix here is good.
Evaluated for origin testextended up to f303562 |
Waiting for extended but looks good to me. |
continuous-integration/openshift-jenkins/testextended FAILURE (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin_extended/218/) (Extended Tests: core(admission)) |
So the extended tests actually fail because of issue #9343 (tl;dr; we fail to parse output of docker 1.10). The builder reports success for failure. The images are actually refused as reported by registry:
|
The other was flake #9129. [test] |
Evaluated for origin test up to f303562 |
continuous-integration/openshift-jenkins/test SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/5064/) |
Lgtm [merge] Will be part of 1.3.0.alpha.2 |
continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pr_origin/5087/) (Image: devenv-rhel7_4408) |
[merge]
On Sat, Jun 18, 2016 at 1:45 PM, OpenShift Bot [email protected]
|
Evaluated for origin merge up to f303562 |
The quota enforcement has been off by default for existing deployments.
Let's keep it off by default for the new ones as well.
Resolves #9393