Merge pull request #9168 from cybozu-go/core-fix-unnecessary-option

core: remove unnecessary option
This commit is contained in:
Satoru Takeuchi authored and GitHub committed 2021-11-15 22:50:08 +09:00
commit 07e1ca678a
2 files changed
+5 -16

No files matched your search

+5 -1
View File
@@ -17,6 +17,7 @@ limitations under the License.
package ceph
import (
"flag"
"os"
"github.com/pkg/errors"
@@ -43,7 +44,10 @@ func init() {
operatorCmd.Flags().BoolVar(&operator.EnableMachineDisruptionBudget, "enable-machine-disruption-budget", false, "enable fencing controllers")
flags.SetFlagsFromEnv(operatorCmd.Flags(), rook.RookEnvVarPrefix)
flags.SetLoggingFlags(operatorCmd.Flags())
operatorCmd.Flags().AddGoFlagSet(flag.CommandLine)
if err := operatorCmd.Flags().Parse(nil); err != nil {
panic(err)
}
operatorCmd.RunE = startOperator
}
-15
View File
@@ -16,7 +16,6 @@ limitations under the License.
package flags
import (
"flag"
"fmt"
"os"
"regexp"
@@ -55,20 +54,6 @@ func createRequiredFlagError(name string, flags []string) error {
return fmt.Errorf("%s are required for %s", strings.Join(flags, ","), name)
}
func SetLoggingFlags(flags *pflag.FlagSet) {
//Add commandline flags to the flagset. We will always write to stderr
//and not to a file by default
flags.AddGoFlagSet(flag.CommandLine)
if err := flags.Set("logtostderr", "true"); err != nil {
// TODO: fix me
// 2021-09-02 09:41:29.645366 I | op-flags: failed to set flag "logtostderr". no such flag -logtostderr
logger.Infof("failed to set flag %q. %v", "logtostderr", err)
}
if err := flags.Parse(nil); err != nil {
panic(err)
}
}
func SetFlagsFromEnv(flags *pflag.FlagSet, prefix string) {
var errorFlag bool
var err error