forked from kubernetes/kubernetes
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request kubernetes#58095 from liggitt/fix-cadvisor
Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Fix cadvisor flag registration for cross build Fixed cross build by only importing linux-only cadvisor packages on linux (unconditional import added in kubernetes#57613) Fixes kubernetes#58106 ```release-note NONE ```
- Loading branch information
Showing
4 changed files
with
153 additions
and
60 deletions.
There are no files selected for viewing
This file contains 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
This file contains 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
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,79 @@ | ||
| // +build linux | ||
|
|
||
| /* | ||
| Copyright 2018 The Kubernetes Authors. | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package options | ||
|
|
||
| import ( | ||
| "flag" | ||
| "os" | ||
|
|
||
| "github.com/spf13/pflag" | ||
|
|
||
| // ensure libs have a chance to globally register their flags | ||
| _ "github.com/google/cadvisor/container/common" | ||
| _ "github.com/google/cadvisor/container/containerd" | ||
| _ "github.com/google/cadvisor/container/docker" | ||
| _ "github.com/google/cadvisor/container/raw" | ||
| _ "github.com/google/cadvisor/machine" | ||
| _ "github.com/google/cadvisor/manager" | ||
| _ "github.com/google/cadvisor/storage" | ||
| ) | ||
|
|
||
| // addCadvisorFlags adds flags from cadvisor | ||
| func addCadvisorFlags(fs *pflag.FlagSet) { | ||
| // lookup flags in global flag set and re-register the values with our flagset | ||
| global := flag.CommandLine | ||
| local := pflag.NewFlagSet(os.Args[0], pflag.ExitOnError) | ||
|
|
||
| // These flags were also implicit from cadvisor, but are actually used by something in the core repo: | ||
| // TODO(mtaufen): This one is stil used by our salt, but for heaven's sake it's even deprecated in cadvisor | ||
| register(global, local, "docker_root") | ||
| // e2e node tests rely on this | ||
| register(global, local, "housekeeping_interval") | ||
|
|
||
| // These flags were implicit from cadvisor, and are mistakes that should be registered deprecated: | ||
| const deprecated = "This is a cadvisor flag that was mistakenly registered with the Kubelet. Due to legacy concerns, it will follow the standard CLI deprecation timeline before being removed." | ||
|
|
||
| registerDeprecated(global, local, "application_metrics_count_limit", deprecated) | ||
| registerDeprecated(global, local, "boot_id_file", deprecated) | ||
| registerDeprecated(global, local, "container_hints", deprecated) | ||
| registerDeprecated(global, local, "containerd", deprecated) | ||
| registerDeprecated(global, local, "docker", deprecated) | ||
| registerDeprecated(global, local, "docker_env_metadata_whitelist", deprecated) | ||
| registerDeprecated(global, local, "docker_only", deprecated) | ||
| registerDeprecated(global, local, "docker-tls", deprecated) | ||
| registerDeprecated(global, local, "docker-tls-ca", deprecated) | ||
| registerDeprecated(global, local, "docker-tls-cert", deprecated) | ||
| registerDeprecated(global, local, "docker-tls-key", deprecated) | ||
| registerDeprecated(global, local, "enable_load_reader", deprecated) | ||
| registerDeprecated(global, local, "event_storage_age_limit", deprecated) | ||
| registerDeprecated(global, local, "event_storage_event_limit", deprecated) | ||
| registerDeprecated(global, local, "global_housekeeping_interval", deprecated) | ||
| registerDeprecated(global, local, "log_cadvisor_usage", deprecated) | ||
| registerDeprecated(global, local, "machine_id_file", deprecated) | ||
| registerDeprecated(global, local, "storage_driver_user", deprecated) | ||
| registerDeprecated(global, local, "storage_driver_password", deprecated) | ||
| registerDeprecated(global, local, "storage_driver_host", deprecated) | ||
| registerDeprecated(global, local, "storage_driver_db", deprecated) | ||
| registerDeprecated(global, local, "storage_driver_table", deprecated) | ||
| registerDeprecated(global, local, "storage_driver_secure", deprecated) | ||
| registerDeprecated(global, local, "storage_driver_buffer_duration", deprecated) | ||
|
|
||
| // finally, add cadvisor flags to the provided flagset | ||
| fs.AddFlagSet(local) | ||
| } |
This file contains 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| // +build !linux | ||
|
|
||
| /* | ||
| Copyright 2018 The Kubernetes Authors. | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| */ | ||
|
|
||
| package options | ||
|
|
||
| import ( | ||
| "github.com/spf13/pflag" | ||
| ) | ||
|
|
||
| func addCadvisorFlags(fs *pflag.FlagSet) { | ||
| } |