-
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
cluster up: prevent admin templates from instantiating on older versions #14362
cluster up: prevent admin templates from instantiating on older versions #14362
Conversation
@openshift/devex ptal |
pkg/bootstrap/docker/up.go
Outdated
} | ||
|
||
func shouldImportAdminTemplates(v semver.Version) bool { | ||
return v.GT(openshiftVersion35) |
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.
this means we'll install them on 3.5.1, right? is that ok?
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.
you're right ... no, it needs to be 3.6 ... will change the condition to >= 3.6.0
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.
fixed
32a55cf
to
8048bc2
Compare
lgtm |
8048bc2
to
1342989
Compare
@bparees I fixed the error check in the ServerVersion method, it was backwards ... should cache the result if there is no error. If it still looks good to you is it ok to merge? |
ah, i thought that was intentional that you were clearing part of the version if you got an error. so much for my faith in you :) |
[merge][severity:bug] |
Evaluated for origin merge up to 1342989 |
[Test]ing while waiting on the merge queue |
Evaluated for origin test up to 1342989 |
continuous-integration/openshift-jenkins/test FAILURE (https://ci.openshift.redhat.com/jenkins/job/test_pull_request_origin/1781/) (Base Commit: d03a427) |
Flake #13980 |
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.
I think I can steal some of the 3.6.0 code check you have here for my use ansible evaluation. LGTM
continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/merge_pull_request_origin/821/) (Base Commit: 14f3300) (Extended Tests: bug) (Image: devenv-rhel7_6280) |
Why does template creation fail the cluster up? We should just warn ("couldn't add template X: reason") |
This isn't really versioning - this is that people are writing templates that aren't compatible on older versions because of api groups. That's a much more fundamental problem. |
@smarterclayton the problem with simply warning about the template creation error is that we'll have a partially imported template... is that ok? |
Fixes #14357