{"action":"created","comment":{"url":"https://api.github.com/repos/openshift/origin/pulls/comments/56697656","id":56697656,"diff_hunk":"@@ -6,24 +6,116 @@ import (\n \t\"time\"\n \n \tproxyoptions \"k8s.io/kubernetes/cmd/kube-proxy/app/options\"\n+\tkubeletoptions \"k8s.io/kubernetes/cmd/kubelet/app/options\"\n \t\"k8s.io/kubernetes/pkg/api/unversioned\"\n \t\"k8s.io/kubernetes/pkg/apis/componentconfig\"\n-\t\"k8s.io/kubernetes/pkg/kubelet/qos\"\n+\tkubetypes \"k8s.io/kubernetes/pkg/kubelet/types\"\n+\t\"k8s.io/kubernetes/pkg/util\"\n )\n \n+func TestKubeletDefaults(t *testing.T) {\n+\tdefaults := kubeletoptions.NewKubeletServer()\n+\n+\t// This is a snapshot of the default config\n+\t// If the default changes (new fields are added, or default values change), we want to know\n+\t// Once we've reacted to the changes appropriately in BuildKubernetesNodeConfig(), update this expected default to match the new upstream defaults\n+\texpectedDefaults := &kubeletoptions.KubeletServer{\n+\t\tAuthPath:   util.NewStringFlag(\"/var/lib/kubelet/kubernetes_auth\"),\n+\t\tKubeConfig: util.NewStringFlag(\"/var/lib/kubelet/kubeconfig\"),\n+\n+\t\tSystemReserved: util.ConfigurationMap{},\n+\t\tKubeReserved:   util.ConfigurationMap{},\n+\t\tKubeletConfiguration: componentconfig.KubeletConfiguration{\n+\t\t\tAddress:                     \"0.0.0.0\", // overridden\n+\t\t\tAllowPrivileged:             false,     // overridden\n+\t\t\tCAdvisorPort:                4194,      // disabled\n+\t\t\tVolumeStatsAggPeriod:        unversioned.Duration{time.Minute},\n+\t\t\tCertDirectory:               \"/var/run/kubernetes\",\n+\t\t\tCgroupRoot:                  \"\",\n+\t\t\tClusterDNS:                  \"\", // overridden\n+\t\t\tClusterDomain:               \"\", // overridden\n+\t\t\tConfigureCBR0:               false,\n+\t\t\tContainerRuntime:            \"docker\",\n+\t\t\tContainerized:               false, // overridden based on OPENSHIFT_CONTAINERIZED\n+\t\t\tCPUCFSQuota:                 true,  // forced to true\n+\t\t\tDockerExecHandlerName:       \"native\",\n+\t\t\tEventBurst:                  10,\n+\t\t\tEventRecordQPS:              5.0,\n+\t\t\tEnableCustomMetrics:         false,\n+\t\t\tEnableDebuggingHandlers:     true,\n+\t\t\tEnableServer:                true,\n+\t\t\tFileCheckFrequency:          unversioned.Duration{20 * time.Second}, // overridden\n+\t\t\tHealthzBindAddress:          \"127.0.0.1\",                            // disabled\n+\t\t\tHealthzPort:                 10248,                                  // disabled\n+\t\t\tHostNetworkSources:          \"*\",                                    // overridden\n+\t\t\tHostPIDSources:              \"*\",                                    // overridden\n+\t\t\tHostIPCSources:              \"*\",                                    // overridden\n+\t\t\tHTTPCheckFrequency:          unversioned.Duration{20 * time.Second}, // disabled\n+\t\t\tImageMinimumGCAge:           unversioned.Duration{2 * time.Minute},\n+\t\t\tImageGCHighThresholdPercent: 90,\n+\t\t\tImageGCLowThresholdPercent:  80,\n+\t\t\tLowDiskSpaceThresholdMB:     256,\n+\t\t\tMasterServiceNamespace:      \"default\",\n+\t\t\tMaxContainerCount:           240,\n+\t\t\tMaxPerPodContainerCount:     2,\n+\t\t\tMaxOpenFiles:                1000000,\n+\t\t\tMaxPods:                     110, // overridden\n+\t\t\tMinimumGCAge:                unversioned.Duration{1 * time.Minute},\n+\t\t\tNetworkPluginDir:            \"/usr/libexec/kubernetes/kubelet-plugins/net/exec/\",\n+\t\t\tNetworkPluginName:           \"\", // overridden\n+\t\t\tNonMasqueradeCIDR:           \"10.0.0.0/8\",\n+\t\t\tVolumePluginDir:             \"/usr/libexec/kubernetes/kubelet-plugins/volume/exec/\",\n+\t\t\tNodeStatusUpdateFrequency:   unversioned.Duration{10 * time.Second},\n+\t\t\tNodeLabels:                  map[string]string{},\n+\t\t\tOOMScoreAdj:                 -999,\n+\t\t\tLockFilePath:                \"\",\n+\t\t\tPodInfraContainerImage:      kubetypes.PodInfraContainerImage, // overridden\n+\t\t\tPort:                           10250, // overridden\n+\t\t\tReadOnlyPort:                   10255, // disabled\n+\t\t\tRegisterNode:                   true,\n+\t\t\tRegisterSchedulable:            true,\n+\t\t\tRegistryBurst:                  10,\n+\t\t\tRegistryPullQPS:                5.0,\n+\t\t\tKubeletCgroups:                 \"\",\n+\t\t\tRktPath:                        \"\",\n+\t\t\tRktStage1Image:                 \"\",\n+\t\t\tRootDirectory:                  \"/var/lib/kubelet\", // overridden\n+\t\t\tRuntimeCgroups:                 \"\",\n+\t\t\tSerializeImagePulls:            true,\n+\t\t\tStreamingConnectionIdleTimeout: unversioned.Duration{4 * time.Hour},\n+\t\t\tSyncFrequency:                  unversioned.Duration{1 * time.Minute},\n+\t\t\tSystemCgroups:                  \"\",\n+\t\t\tTLSCertFile:                    \"\", // overridden to prevent cert generation\n+\t\t\tTLSPrivateKeyFile:              \"\", // overridden to prevent cert generation\n+\t\t\tReconcileCIDR:                  true,\n+\t\t\tKubeAPIQPS:                     5.0,\n+\t\t\tKubeAPIBurst:                   10,\n+\t\t\tExperimentalFlannelOverlay:     false,\n+\t\t\tOutOfDiskTransitionFrequency:   unversioned.Duration{5 * time.Minute},\n+\t\t\tHairpinMode:                    \"promiscuous-bridge\",","path":"pkg/cmd/server/kubernetes/node_config_test.go","position":null,"original_position":91,"commit_id":"6f5583dd5915b4759d145798b927fd22e94a1b75","original_commit_id":"832cb9d24281b36e98e506a868573dce79082adf","user":{"login":"danwinship","id":96040,"avatar_url":"https://avatars.githubusercontent.com/u/96040?v=3","gravatar_id":"","url":"https://api.github.com/users/danwinship","html_url":"https://github.com/danwinship","followers_url":"https://api.github.com/users/danwinship/followers","following_url":"https://api.github.com/users/danwinship/following{/other_user}","gists_url":"https://api.github.com/users/danwinship/gists{/gist_id}","starred_url":"https://api.github.com/users/danwinship/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/danwinship/subscriptions","organizations_url":"https://api.github.com/users/danwinship/orgs","repos_url":"https://api.github.com/users/danwinship/repos","events_url":"https://api.github.com/users/danwinship/events{/privacy}","received_events_url":"https://api.github.com/users/danwinship/received_events","type":"User","site_admin":false},"body":"Then you have a linux bridge, so you don't want `\"none\"`. So it looks like upstream prefers `\"promiscuous-bridge\"` and openshift-sdn prefers `\"none\"`, but we're stuck with `\"hairpin-veth\"` for backward-compatibility reasons.","created_at":"2016-03-18T18:00:11Z","updated_at":"2016-03-18T18:00:11Z","html_url":"https://github.com/openshift/origin/pull/8131#discussion_r56697656","pull_request_url":"https://api.github.com/repos/openshift/origin/pulls/8131","_links":{"self":{"href":"https://api.github.com/repos/openshift/origin/pulls/comments/56697656"},"html":{"href":"https://github.com/openshift/origin/pull/8131#discussion_r56697656"},"pull_request":{"href":"https://api.github.com/repos/openshift/origin/pulls/8131"}}},"pull_request":{"url":"https://api.github.com/repos/openshift/origin/pulls/8131","id":63404529,"html_url":"https://github.com/openshift/origin/pull/8131","diff_url":"https://github.com/openshift/origin/pull/8131.diff","patch_url":"https://github.com/openshift/origin/pull/8131.patch","issue_url":"https://api.github.com/repos/openshift/origin/issues/8131","number":8131,"state":"open","locked":false,"title":"Add kube component config tests, disable /logs on master, update kube-proxy init","user":{"login":"liggitt","id":980082,"avatar_url":"https://avatars.githubusercontent.com/u/980082?v=3","gravatar_id":"","url":"https://api.github.com/users/liggitt","html_url":"https://github.com/liggitt","followers_url":"https://api.github.com/users/liggitt/followers","following_url":"https://api.github.com/users/liggitt/following{/other_user}","gists_url":"https://api.github.com/users/liggitt/gists{/gist_id}","starred_url":"https://api.github.com/users/liggitt/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/liggitt/subscriptions","organizations_url":"https://api.github.com/users/liggitt/orgs","repos_url":"https://api.github.com/users/liggitt/repos","events_url":"https://api.github.com/users/liggitt/events{/privacy}","received_events_url":"https://api.github.com/users/liggitt/received_events","type":"User","site_admin":false},"body":null,"created_at":"2016-03-18T16:54:49Z","updated_at":"2016-03-18T18:00:11Z","closed_at":null,"merged_at":null,"merge_commit_sha":"6fb7ec649f3f7111563d70cb0fd2ec911812f34a","assignee":null,"milestone":null,"commits_url":"https://api.github.com/repos/openshift/origin/pulls/8131/commits","review_comments_url":"https://api.github.com/repos/openshift/origin/pulls/8131/comments","review_comment_url":"https://api.github.com/repos/openshift/origin/pulls/comments{/number}","comments_url":"https://api.github.com/repos/openshift/origin/issues/8131/comments","statuses_url":"https://api.github.com/repos/openshift/origin/statuses/6f5583dd5915b4759d145798b927fd22e94a1b75","head":{"label":"liggitt:config-tests","ref":"config-tests","sha":"6f5583dd5915b4759d145798b927fd22e94a1b75","user":{"login":"liggitt","id":980082,"avatar_url":"https://avatars.githubusercontent.com/u/980082?v=3","gravatar_id":"","url":"https://api.github.com/users/liggitt","html_url":"https://github.com/liggitt","followers_url":"https://api.github.com/users/liggitt/followers","following_url":"https://api.github.com/users/liggitt/following{/other_user}","gists_url":"https://api.github.com/users/liggitt/gists{/gist_id}","starred_url":"https://api.github.com/users/liggitt/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/liggitt/subscriptions","organizations_url":"https://api.github.com/users/liggitt/orgs","repos_url":"https://api.github.com/users/liggitt/repos","events_url":"https://api.github.com/users/liggitt/events{/privacy}","received_events_url":"https://api.github.com/users/liggitt/received_events","type":"User","site_admin":false},"repo":{"id":23198153,"name":"origin","full_name":"liggitt/origin","owner":{"login":"liggitt","id":980082,"avatar_url":"https://avatars.githubusercontent.com/u/980082?v=3","gravatar_id":"","url":"https://api.github.com/users/liggitt","html_url":"https://github.com/liggitt","followers_url":"https://api.github.com/users/liggitt/followers","following_url":"https://api.github.com/users/liggitt/following{/other_user}","gists_url":"https://api.github.com/users/liggitt/gists{/gist_id}","starred_url":"https://api.github.com/users/liggitt/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/liggitt/subscriptions","organizations_url":"https://api.github.com/users/liggitt/orgs","repos_url":"https://api.github.com/users/liggitt/repos","events_url":"https://api.github.com/users/liggitt/events{/privacy}","received_events_url":"https://api.github.com/users/liggitt/received_events","type":"User","site_admin":false},"private":false,"html_url":"https://github.com/liggitt/origin","description":"OpenShift 3 - build, deploy, and manage your applications with Docker and Kubernetes","fork":true,"url":"https://api.github.com/repos/liggitt/origin","forks_url":"https://api.github.com/repos/liggitt/origin/forks","keys_url":"https://api.github.com/repos/liggitt/origin/keys{/key_id}","collaborators_url":"https://api.github.com/repos/liggitt/origin/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/liggitt/origin/teams","hooks_url":"https://api.github.com/repos/liggitt/origin/hooks","issue_events_url":"https://api.github.com/repos/liggitt/origin/issues/events{/number}","events_url":"https://api.github.com/repos/liggitt/origin/events","assignees_url":"https://api.github.com/repos/liggitt/origin/assignees{/user}","branches_url":"https://api.github.com/repos/liggitt/origin/branches{/branch}","tags_url":"https://api.github.com/repos/liggitt/origin/tags","blobs_url":"https://api.github.com/repos/liggitt/origin/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/liggitt/origin/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/liggitt/origin/git/refs{/sha}","trees_url":"https://api.github.com/repos/liggitt/origin/git/trees{/sha}","statuses_url":"https://api.github.com/repos/liggitt/origin/statuses/{sha}","languages_url":"https://api.github.com/repos/liggitt/origin/languages","stargazers_url":"https://api.github.com/repos/liggitt/origin/stargazers","contributors_url":"https://api.github.com/repos/liggitt/origin/contributors","subscribers_url":"https://api.github.com/repos/liggitt/origin/subscribers","subscription_url":"https://api.github.com/repos/liggitt/origin/subscription","commits_url":"https://api.github.com/repos/liggitt/origin/commits{/sha}","git_commits_url":"https://api.github.com/repos/liggitt/origin/git/commits{/sha}","comments_url":"https://api.github.com/repos/liggitt/origin/comments{/number}","issue_comment_url":"https://api.github.com/repos/liggitt/origin/issues/comments{/number}","contents_url":"https://api.github.com/repos/liggitt/origin/contents/{+path}","compare_url":"https://api.github.com/repos/liggitt/origin/compare/{base}...{head}","merges_url":"https://api.github.com/repos/liggitt/origin/merges","archive_url":"https://api.github.com/repos/liggitt/origin/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/liggitt/origin/downloads","issues_url":"https://api.github.com/repos/liggitt/origin/issues{/number}","pulls_url":"https://api.github.com/repos/liggitt/origin/pulls{/number}","milestones_url":"https://api.github.com/repos/liggitt/origin/milestones{/number}","notifications_url":"https://api.github.com/repos/liggitt/origin/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/liggitt/origin/labels{/name}","releases_url":"https://api.github.com/repos/liggitt/origin/releases{/id}","deployments_url":"https://api.github.com/repos/liggitt/origin/deployments","created_at":"2014-08-21T18:23:05Z","updated_at":"2016-01-11T15:42:07Z","pushed_at":"2016-03-18T17:52:16Z","git_url":"git://github.com/liggitt/origin.git","ssh_url":"git@github.com:liggitt/origin.git","clone_url":"https://github.com/liggitt/origin.git","svn_url":"https://github.com/liggitt/origin","homepage":"https://openshift.github.io","size":234709,"stargazers_count":0,"watchers_count":0,"language":"Go","has_issues":false,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":0,"mirror_url":null,"open_issues_count":0,"forks":0,"open_issues":0,"watchers":0,"default_branch":"master"}},"base":{"label":"openshift:master","ref":"master","sha":"79e75d17e52191718c88cdc262f4e93b5d6610d1","user":{"login":"openshift","id":792337,"avatar_url":"https://avatars.githubusercontent.com/u/792337?v=3","gravatar_id":"","url":"https://api.github.com/users/openshift","html_url":"https://github.com/openshift","followers_url":"https://api.github.com/users/openshift/followers","following_url":"https://api.github.com/users/openshift/following{/other_user}","gists_url":"https://api.github.com/users/openshift/gists{/gist_id}","starred_url":"https://api.github.com/users/openshift/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/openshift/subscriptions","organizations_url":"https://api.github.com/users/openshift/orgs","repos_url":"https://api.github.com/users/openshift/repos","events_url":"https://api.github.com/users/openshift/events{/privacy}","received_events_url":"https://api.github.com/users/openshift/received_events","type":"Organization","site_admin":false},"repo":{"id":22442668,"name":"origin","full_name":"openshift/origin","owner":{"login":"openshift","id":792337,"avatar_url":"https://avatars.githubusercontent.com/u/792337?v=3","gravatar_id":"","url":"https://api.github.com/users/openshift","html_url":"https://github.com/openshift","followers_url":"https://api.github.com/users/openshift/followers","following_url":"https://api.github.com/users/openshift/following{/other_user}","gists_url":"https://api.github.com/users/openshift/gists{/gist_id}","starred_url":"https://api.github.com/users/openshift/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/openshift/subscriptions","organizations_url":"https://api.github.com/users/openshift/orgs","repos_url":"https://api.github.com/users/openshift/repos","events_url":"https://api.github.com/users/openshift/events{/privacy}","received_events_url":"https://api.github.com/users/openshift/received_events","type":"Organization","site_admin":false},"private":false,"html_url":"https://github.com/openshift/origin","description":"The Continuous Application Platform - build, deploy, and manage cloud-native and legacy applications on Kubernetes and Docker","fork":false,"url":"https://api.github.com/repos/openshift/origin","forks_url":"https://api.github.com/repos/openshift/origin/forks","keys_url":"https://api.github.com/repos/openshift/origin/keys{/key_id}","collaborators_url":"https://api.github.com/repos/openshift/origin/collaborators{/collaborator}","teams_url":"https://api.github.com/repos/openshift/origin/teams","hooks_url":"https://api.github.com/repos/openshift/origin/hooks","issue_events_url":"https://api.github.com/repos/openshift/origin/issues/events{/number}","events_url":"https://api.github.com/repos/openshift/origin/events","assignees_url":"https://api.github.com/repos/openshift/origin/assignees{/user}","branches_url":"https://api.github.com/repos/openshift/origin/branches{/branch}","tags_url":"https://api.github.com/repos/openshift/origin/tags","blobs_url":"https://api.github.com/repos/openshift/origin/git/blobs{/sha}","git_tags_url":"https://api.github.com/repos/openshift/origin/git/tags{/sha}","git_refs_url":"https://api.github.com/repos/openshift/origin/git/refs{/sha}","trees_url":"https://api.github.com/repos/openshift/origin/git/trees{/sha}","statuses_url":"https://api.github.com/repos/openshift/origin/statuses/{sha}","languages_url":"https://api.github.com/repos/openshift/origin/languages","stargazers_url":"https://api.github.com/repos/openshift/origin/stargazers","contributors_url":"https://api.github.com/repos/openshift/origin/contributors","subscribers_url":"https://api.github.com/repos/openshift/origin/subscribers","subscription_url":"https://api.github.com/repos/openshift/origin/subscription","commits_url":"https://api.github.com/repos/openshift/origin/commits{/sha}","git_commits_url":"https://api.github.com/repos/openshift/origin/git/commits{/sha}","comments_url":"https://api.github.com/repos/openshift/origin/comments{/number}","issue_comment_url":"https://api.github.com/repos/openshift/origin/issues/comments{/number}","contents_url":"https://api.github.com/repos/openshift/origin/contents/{+path}","compare_url":"https://api.github.com/repos/openshift/origin/compare/{base}...{head}","merges_url":"https://api.github.com/repos/openshift/origin/merges","archive_url":"https://api.github.com/repos/openshift/origin/{archive_format}{/ref}","downloads_url":"https://api.github.com/repos/openshift/origin/downloads","issues_url":"https://api.github.com/repos/openshift/origin/issues{/number}","pulls_url":"https://api.github.com/repos/openshift/origin/pulls{/number}","milestones_url":"https://api.github.com/repos/openshift/origin/milestones{/number}","notifications_url":"https://api.github.com/repos/openshift/origin/notifications{?since,all,participating}","labels_url":"https://api.github.com/repos/openshift/origin/labels{/name}","releases_url":"https://api.github.com/repos/openshift/origin/releases{/id}","deployments_url":"https://api.github.com/repos/openshift/origin/deployments","created_at":"2014-07-30T20:04:05Z","updated_at":"2016-03-18T14:43:23Z","pushed_at":"2016-03-18T17:49:02Z","git_url":"git://github.com/openshift/origin.git","ssh_url":"git@github.com:openshift/origin.git","clone_url":"https://github.com/openshift/origin.git","svn_url":"https://github.com/openshift/origin","homepage":"http://www.openshift.org","size":307044,"stargazers_count":1132,"watchers_count":1132,"language":"Go","has_issues":true,"has_downloads":true,"has_wiki":false,"has_pages":false,"forks_count":701,"mirror_url":null,"open_issues_count":979,"forks":701,"open_issues":979,"watchers":1132,"default_branch":"master"}},"_links":{"self":{"href":"https://api.github.com/repos/openshift/origin/pulls/8131"},"html":{"href":"https://github.com/openshift/origin/pull/8131"},"issue":{"href":"https://api.github.com/repos/openshift/origin/issues/8131"},"comments":{"href":"https://api.github.com/repos/openshift/origin/issues/8131/comments"},"review_comments":{"href":"https://api.github.com/repos/openshift/origin/pulls/8131/comments"},"review_comment":{"href":"https://api.github.com/repos/openshift/origin/pulls/comments{/number}"},"commits":{"href":"https://api.github.com/repos/openshift/origin/pulls/8131/commits"},"statuses":{"href":"https://api.github.com/repos/openshift/origin/statuses/6f5583dd5915b4759d145798b927fd22e94a1b75"}}}}