From 02e17196f2d5f283e3bcdceac065e2fbb786ca55 Mon Sep 17 00:00:00 2001 From: Javier Date: Tue, 30 May 2023 11:52:26 -0600 Subject: [PATCH] core: use -default-* flags enable flags with --default prefix for --log-to-stderr, --mon-cluster-log-to-stderr, --err-to-stderr, and --log-stderr-prefix Signed-off-by: Javier --- pkg/operator/ceph/config/defaults.go | 8 ++++---- pkg/operator/ceph/controller/spec_test.go | 8 ++++---- pkg/operator/ceph/test/containers.go | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/pkg/operator/ceph/config/defaults.go b/pkg/operator/ceph/config/defaults.go index c06721f37..d659d52e7 100644 --- a/pkg/operator/ceph/config/defaults.go +++ b/pkg/operator/ceph/config/defaults.go @@ -40,11 +40,11 @@ func DefaultFlags(fsid, mountedKeyringPath string) []string { func LoggingFlags() []string { return []string{ // For containers, we're expected to log everything to stderr - NewFlag("log-to-stderr", "true"), - NewFlag("err-to-stderr", "true"), - NewFlag("mon-cluster-log-to-stderr", "true"), + NewFlag("default-log-to-stderr", "true"), + NewFlag("default-err-to-stderr", "true"), + NewFlag("default-mon-cluster-log-to-stderr", "true"), // differentiate debug text from audit text, and the space after 'debug' is critical - NewFlag("log-stderr-prefix", "debug "), + NewFlag("default-log-stderr-prefix", "debug "), NewFlag("default-log-to-file", "false"), NewFlag("default-mon-cluster-log-to-file", "false"), } diff --git a/pkg/operator/ceph/controller/spec_test.go b/pkg/operator/ceph/controller/spec_test.go index 0ba93a47a..63a396b63 100644 --- a/pkg/operator/ceph/controller/spec_test.go +++ b/pkg/operator/ceph/controller/spec_test.go @@ -190,8 +190,8 @@ func TestDaemonFlags(t *testing.T) { }, }, daemonID: "daemon-id", - expected: []string{"--fsid=id", "--keyring=/etc/ceph/keyring-store/keyring", "--log-to-stderr=true", "--err-to-stderr=true", - "--mon-cluster-log-to-stderr=true", "--log-stderr-prefix=debug ", "--default-log-to-file=false", "--default-mon-cluster-log-to-file=false", + expected: []string{"--fsid=id", "--keyring=/etc/ceph/keyring-store/keyring", "--default-log-to-stderr=true", "--default-err-to-stderr=true", + "--default-mon-cluster-log-to-stderr=true", "--default-log-stderr-prefix=debug ", "--default-log-to-file=false", "--default-mon-cluster-log-to-file=false", "--mon-host=$(ROOK_CEPH_MON_HOST)", "--mon-initial-members=$(ROOK_CEPH_MON_INITIAL_MEMBERS)", "--id=daemon-id", "--setuser=ceph", "--setgroup=ceph", "--ms-bind-ipv4=false", "--ms-bind-ipv6=true"}, }, @@ -202,8 +202,8 @@ func TestDaemonFlags(t *testing.T) { }, clusterSpec: &cephv1.ClusterSpec{}, daemonID: "daemon-id", - expected: []string{"--fsid=id", "--keyring=/etc/ceph/keyring-store/keyring", "--log-to-stderr=true", "--err-to-stderr=true", - "--mon-cluster-log-to-stderr=true", "--log-stderr-prefix=debug ", "--default-log-to-file=false", "--default-mon-cluster-log-to-file=false", + expected: []string{"--fsid=id", "--keyring=/etc/ceph/keyring-store/keyring", "--default-log-to-stderr=true", "--default-err-to-stderr=true", + "--default-mon-cluster-log-to-stderr=true", "--default-log-stderr-prefix=debug ", "--default-log-to-file=false", "--default-mon-cluster-log-to-file=false", "--mon-host=$(ROOK_CEPH_MON_HOST)", "--mon-initial-members=$(ROOK_CEPH_MON_INITIAL_MEMBERS)", "--id=daemon-id", "--setuser=ceph", "--setgroup=ceph"}, }, } diff --git a/pkg/operator/ceph/test/containers.go b/pkg/operator/ceph/test/containers.go index aa4181844..3fdaa1ca2 100644 --- a/pkg/operator/ceph/test/containers.go +++ b/pkg/operator/ceph/test/containers.go @@ -58,10 +58,10 @@ func (ct *ContainersTester) AssertArgsContainCephRequirements() { continue // don't consider containers that aren't Ceph commands } requiredFlags := []string{ - "--log-to-stderr=true", - "--err-to-stderr=true", - "--mon-cluster-log-to-stderr=true", - "--log-stderr-prefix=debug ", + "--default-log-to-stderr=true", + "--default-err-to-stderr=true", + "--default-mon-cluster-log-to-stderr=true", + "--default-log-stderr-prefix=debug ", "--mon-host=$(ROOK_CEPH_MON_HOST)", "--mon-initial-members=$(ROOK_CEPH_MON_INITIAL_MEMBERS)", }