Skip to content

Commit 34b4660

Browse files
authored
Merge pull request #1827 from rexagod/1738
Incorporate Viper
2 parents 53a0dc6 + f8360a8 commit 34b4660

File tree

11 files changed

+366
-202
lines changed

11 files changed

+366
-202
lines changed

docs/cli-arguments.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ Flags:
3939
--add_dir_header If true, adds the file directory to the header of the log messages
4040
--alsologtostderr log to standard error as well as files (no effect when -logtostderr=true)
4141
--apiserver string The URL of the apiserver to use as a master
42+
--config string Path to the kube-state-metrics options config file
4243
--custom-resource-state-config string Inline Custom Resource State Metrics config YAML (experimental)
4344
--custom-resource-state-config-file string Path to a Custom Resource State Metrics config file (experimental)
4445
--custom-resource-state-only Only provide Custom Resource State metrics (experimental)

docs/node-metrics.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@
1212
| kube_node_status_allocatable | Gauge | The allocatable for different resources of a node that are available for scheduling | `cpu`=&lt;core&gt; <br> `ephemeral_storage`=&lt;byte&gt; <br> `pods`=&lt;integer&gt; <br> `attachable_volumes_*`=&lt;byte&gt; <br> `hugepages_*`=&lt;byte&gt; <br> `memory`=&lt;byte&gt; |`node`=&lt;node-address&gt; <br> `resource`=&lt;resource-name&gt; <br> `unit`=&lt;resource-unit&gt;| STABLE |
1313
| kube_node_status_condition | Gauge | The condition of a cluster node | |`node`=&lt;node-address&gt; <br> `condition`=&lt;node-condition&gt; <br> `status`=&lt;true\|false\|unknown&gt; | STABLE |
1414
| kube_node_created | Gauge | Unix creation timestamp | seconds |`node`=&lt;node-address&gt;| STABLE |
15-
| kube_node_deletion_timestamp | Gauge | Unix creation timestamp | seconds |`node`=&lt;node-address&gt;| STABLE |
15+
| kube_node_deletion_timestamp | Gauge | Unix creation timestamp | seconds |`node`=&lt;node-address&gt;| EXPERIMENTAL |

go.mod

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ require (
44
github.com/brancz/gojsontoyaml v0.1.0
55
github.com/campoy/embedmd v1.0.0
66
github.com/dgryski/go-jump v0.0.0-20211018200510-ba001c3ffce0
7+
github.com/fsnotify/fsnotify v1.6.0
78
github.com/gobuffalo/flect v0.3.0
89
github.com/google/go-cmp v0.5.9
910
github.com/google/go-jsonnet v0.19.1
@@ -15,6 +16,7 @@ require (
1516
github.com/prometheus/exporter-toolkit v0.8.1
1617
github.com/robfig/cron/v3 v3.0.1
1718
github.com/spf13/cobra v1.6.1
19+
github.com/spf13/viper v1.14.0
1820
github.com/stretchr/testify v1.8.1
1921
golang.org/x/perf v0.0.0-20220920022801-e8d778a60d07
2022
gopkg.in/yaml.v3 v3.0.1
@@ -29,7 +31,8 @@ require (
2931
)
3032

3133
require (
32-
cloud.google.com/go v0.97.0 // indirect
34+
cloud.google.com/go/compute v1.12.1 // indirect
35+
cloud.google.com/go/compute/metadata v0.2.1 // indirect
3336
github.com/Azure/go-autorest v14.2.0+incompatible // indirect
3437
github.com/Azure/go-autorest/autorest v0.11.27 // indirect
3538
github.com/Azure/go-autorest/autorest/adal v0.9.20 // indirect
@@ -61,35 +64,45 @@ require (
6164
github.com/google/gnostic v0.5.7-v3refs // indirect
6265
github.com/google/gofuzz v1.1.0 // indirect
6366
github.com/google/safehtml v0.0.2 // indirect
67+
github.com/hashicorp/hcl v1.0.0 // indirect
6468
github.com/imdario/mergo v0.3.6 // indirect
6569
github.com/inconshreveable/mousetrap v1.0.1 // indirect
6670
github.com/josharian/intern v1.0.0 // indirect
6771
github.com/jpillora/backoff v1.0.0 // indirect
6872
github.com/json-iterator/go v1.1.12 // indirect
73+
github.com/magiconair/properties v1.8.6 // indirect
6974
github.com/mailru/easyjson v0.7.6 // indirect
7075
github.com/mattn/go-colorable v0.1.12 // indirect
7176
github.com/mattn/go-isatty v0.0.14 // indirect
7277
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
78+
github.com/mitchellh/mapstructure v1.5.0 // indirect
7379
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
7480
github.com/modern-go/reflect2 v1.0.2 // indirect
7581
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
7682
github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f // indirect
83+
github.com/pelletier/go-toml v1.9.5 // indirect
84+
github.com/pelletier/go-toml/v2 v2.0.5 // indirect
7785
github.com/pkg/errors v0.9.1 // indirect
7886
github.com/pmezard/go-difflib v1.0.0 // indirect
7987
github.com/prometheus/procfs v0.8.0 // indirect
88+
github.com/spf13/afero v1.9.2 // indirect
89+
github.com/spf13/cast v1.5.0 // indirect
90+
github.com/spf13/jwalterweatherman v1.1.0 // indirect
8091
github.com/spf13/pflag v1.0.5 // indirect
92+
github.com/subosito/gotenv v1.4.1 // indirect
8193
golang.org/x/crypto v0.0.0-20221012134737-56aed061732a // indirect
82-
golang.org/x/net v0.0.0-20220909164309-bea034e7d591 // indirect
83-
golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1 // indirect
94+
golang.org/x/net v0.0.0-20221014081412-f15817d10f9b // indirect
95+
golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
8496
golang.org/x/sync v0.1.0 // indirect
8597
golang.org/x/sys v0.1.0 // indirect
8698
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
87-
golang.org/x/text v0.3.7 // indirect
88-
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
99+
golang.org/x/text v0.4.0 // indirect
100+
golang.org/x/time v0.0.0-20220609170525-579cf78fd858 // indirect
89101
google.golang.org/appengine v1.6.7 // indirect
90102
google.golang.org/protobuf v1.28.1 // indirect
91103
gopkg.in/alecthomas/kingpin.v2 v2.2.6 // indirect
92104
gopkg.in/inf.v0 v0.9.1 // indirect
105+
gopkg.in/ini.v1 v1.67.0 // indirect
93106
gopkg.in/yaml.v2 v2.4.0 // indirect
94107
k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect
95108
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect

0 commit comments

Comments
 (0)