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

cmd/server/kube #42

Conversation

ncdc
Copy link

@ncdc ncdc commented Mar 21, 2017

No description provided.

@@ -26,7 +25,7 @@ func TestKubeletDefaults(t *testing.T) {
// If the default changes (new fields are added, or default values change), we want to know
// Once we've reacted to the changes appropriately in BuildKubernetesNodeConfig(), update this expected default to match the new upstream defaults
expectedDefaults := &kubeletoptions.KubeletServer{
AuthPath: flag.NewStringFlag(""),
//AuthPath: flag.NewStringFlag(""),
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is gone?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's gone, kube commit 2f6027a

)

func NewSourceAPIOpenShift(
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you plan to merge that somehow with the upstream one?

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, ideally we'll just use what's upstream, but it's not available yet.

@ncdc ncdc force-pushed the sttts-rebase-1.6.0-beta3-cmd-server branch from 39ae150 to 47eb8e3 Compare March 22, 2017 13:27
@sttts sttts merged commit c30abd5 into sttts:sttts-rebase-1.6.0-beta3-cmd-server Mar 22, 2017
sttts added a commit that referenced this pull request Mar 22, 2017
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.

2 participants