clean up construction to make creating types more obvious#20777
Merged
openshift-merge-robot merged 4 commits intoopenshift:masterfrom Aug 29, 2018
Merged
clean up construction to make creating types more obvious#20777openshift-merge-robot merged 4 commits intoopenshift:masterfrom
openshift-merge-robot merged 4 commits intoopenshift:masterfrom
Conversation
openshift-ci-robot
added
the
size/XL
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: deads2k The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
openshift-ci-robot
added
the
approved
Contributor
Author
|
/retest |
1 similar comment
Contributor
Author
|
/retest |
mfojtik
reviewed
Aug 29, 2018
|
|
||
| var cloudConfig []byte | ||
| if kubeOptions.CloudProvider.CloudConfigFile != "" { | ||
| if cloudConfigFile != "" { |
Contributor
There was a problem hiding this comment.
nit: len(cloudConfigFile) == 0
mfojtik
reviewed
Aug 29, 2018
| return admission.PluginInitializers{genericInitializer, webhookInitializer, kubePluginInitializer, openshiftPluginInitializer}, nil | ||
| } | ||
|
|
||
| type DefaultInformerAccess struct { |
Contributor
Author
There was a problem hiding this comment.
where has this moved?
unused.
sttts
reviewed
Aug 29, 2018
| // install all APIs | ||
| _ "github.com/openshift/origin/pkg/api/install" | ||
| "github.com/openshift/origin/pkg/image/apiserver/registryhostname" | ||
| "k8s.io/apiserver/pkg/registry/generic" |
sttts
reviewed
Aug 29, 2018
| server, etcdStorage := etcdtesting.NewUnsecuredEtcd3TestClientServer(t) | ||
| etcdStorage.Codec = legacyscheme.Codecs.LegacyCodec(schema.GroupVersion{Group: "image.openshift.io", Version: "v1"}) | ||
| etcdClient := etcd.NewKV(server.V3Client) | ||
| restOptions := generic.RESTOptions{StorageConfig: etcdStorage, Decorator: generic.UndecoratedStorage, DeleteCollectionWorkers: 1, ResourcePrefix: "images"} |
Contributor
There was a problem hiding this comment.
to avoid confusion, rename to imageRestOptions.
sttts
reviewed
Aug 29, 2018
| server, etcdStorage := etcdtesting.NewUnsecuredEtcd3TestClientServer(t) | ||
| etcdStorage.Codec = legacyscheme.Codecs.LegacyCodec(schema.GroupVersion{Group: "image.openshift.io", Version: "v1"}) | ||
| etcdClient := etcd.NewKV(server.V3Client) | ||
| restOptions := generic.RESTOptions{StorageConfig: etcdStorage, Decorator: generic.UndecoratedStorage, DeleteCollectionWorkers: 1, ResourcePrefix: "imagestreams"} |
sttts
reviewed
Aug 29, 2018
| preparedOpenshiftAPIServer := openshiftAPIServer.GenericAPIServer.PrepareRun() | ||
|
|
||
| glog.Infof("Starting master on %s (%s)", masterConfig.ServingInfo.BindAddress, version.Get().String()) | ||
| glog.Infof("Public master address is %s", masterConfig.MasterPublicURL) |
Contributor
Author
There was a problem hiding this comment.
intentional removal?
yeah, logically the openshift apiserver has no public address
sttts
reviewed
Aug 29, 2018
| cloudConfig, err = ioutil.ReadFile(cloudConfigFile) | ||
| if err != nil { | ||
| return nil, fmt.Errorf("Error reading from cloud configuration file %s: %v", kubeOptions.CloudProvider.CloudConfigFile, err) | ||
| return nil, fmt.Errorf("Error reading from cloud configuration file %s: %v", cloudConfigFile, err) |
sttts
reviewed
Aug 29, 2018
pkg/cmd/server/origin/master.go
Outdated
| ) | ||
|
|
||
| func (c *MasterConfig) newOpenshiftAPIConfig(kubeAPIServerConfig apiserver.Config) (*openshiftapiserver.OpenshiftAPIConfig, error) { | ||
| var err error |
Contributor
|
Some nits. |
deads2k
force-pushed
the
server-22-scrub-start
branch
from
f865066 to
3563995
Compare
Contributor
Author
|
comments addressed |
|
New changes are detected. LGTM label has been removed. |
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
5 participants
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.
Builds on #20741
This collapses more start paths into a single chain.
/assign @sttts @mfojtik