Skip to content

chore(wrapper): removed viper os fallback due to underlying update #2896

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.

Sign up for GitHub

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

Open
bxrne wants to merge 1 commit into
base: main
Choose a base branch
from
Open

chore(wrapper): removed viper os fallback due to underlying update #2896

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions internal/wrapper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,6 @@ func RunKubeStateMetricsWrapper(opts *options.Options) {
if cfgViperReadInConfigErr = cfgViper.ReadInConfig(); cfgViperReadInConfigErr != nil {
if errors.Is(cfgViperReadInConfigErr, viper.ConfigFileNotFoundError{}) {
klog.ErrorS(cfgViperReadInConfigErr, "Options configuration file not found at startup", "file", file)
} else if _, isNotExisterr := os.Stat(filepath.Clean(file)); isNotExisterr != nil {
// TODO: Remove this check once viper.ConfigFileNotFoundError is working as expected, see this issue -
// https://github.com/spf13/viper/issues/1783
klog.ErrorS(isNotExisterr, "Options configuration file not found at startup", "file", file)
} else {
klog.ErrorS(cfgViperReadInConfigErr, "Error reading options configuration file", "file", file)
}
Expand Down Expand Up @@ -90,10 +86,6 @@ func RunKubeStateMetricsWrapper(opts *options.Options) {
if cfgViperReadInConfigErr := crcViper.ReadInConfig(); cfgViperReadInConfigErr != nil {
if errors.Is(cfgViperReadInConfigErr, viper.ConfigFileNotFoundError{}) {
klog.ErrorS(cfgViperReadInConfigErr, "Custom resource configuration file not found at startup", "file", opts.CustomResourceConfigFile)
} else if _, isNotExisterr := os.Stat(filepath.Clean(opts.CustomResourceConfigFile)); isNotExisterr != nil {
// Adding this check in addition to the above since viper.ConfigFileNotFoundError is not working as expected due to this issue -
// https://github.com/spf13/viper/issues/1783
klog.ErrorS(isNotExisterr, "Custom resource configuration file not found at startup", "file", opts.CustomResourceConfigFile)
} else {
klog.ErrorS(cfgViperReadInConfigErr, "Error reading Custom resource configuration file", "file", opts.CustomResourceConfigFile)
}
Expand Down