Skip to content

Commit 9ba019e

Browse files
lowang-bhlowang-bh
committed
use logrus to replace fmt.Print
Signed-off-by: lowang-bh <[email protected]>
1 parent a2153f7 commit 9ba019e

File tree

52 files changed

+141
-97
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+141
-97
lines changed

‎cmd/main.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ limitations under the License.
1717
package main
1818

1919
import (
20-
"log"
21-
2220
"github.com/sirupsen/logrus"
2321
"github.com/spf13/afero"
2422
"sigs.k8s.io/kubebuilder/v3/pkg/cli"
@@ -88,9 +86,9 @@ func main() {
8886
cli.WithCompletion(),
8987
)
9088
if err != nil {
91-
log.Fatal(err)
89+
logrus.Fatal(err)
9290
}
9391
if err := c.Run(); err != nil {
94-
log.Fatal(err)
92+
logrus.Fatal(err)
9593
}
9694
}

‎hack/docs/generate_samples.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ limitations under the License.
1717
package main
1818

1919
import (
20-
"fmt"
20+
log "github.com/sirupsen/logrus"
2121

2222
componentconfig "sigs.k8s.io/kubebuilder/v3/hack/docs/internal/component-config-tutorial"
2323
cronjob "sigs.k8s.io/kubebuilder/v3/hack/docs/internal/cronjob-tutorial"
@@ -27,12 +27,12 @@ import (
2727
const KubebuilderBinName = "/tmp/kubebuilder/bin/kubebuilder"
2828

2929
func main() {
30-
fmt.Println("Generating documents...")
30+
log.Println("Generating documents...")
3131

32-
fmt.Println("Generating component-config tutorial...")
32+
log.Println("Generating component-config tutorial...")
3333
UpdateComponentConfigTutorial()
3434

35-
fmt.Println("Generating cronjob tutorial...")
35+
log.Println("Generating cronjob tutorial...")
3636
UpdateCronjobTutorial()
3737
// TODO: Generate multiversion-tutorial
3838
}

‎hack/docs/internal/cronjob-tutorial/generate_cronjob.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ limitations under the License.
1717
package cronjob
1818

1919
import (
20-
"fmt"
2120
"os"
2221
"os/exec"
2322
"path/filepath"
2423

2524
log "github.com/sirupsen/logrus"
2625
"github.com/spf13/afero"
26+
2727
pluginutil "sigs.k8s.io/kubebuilder/v3/pkg/plugin/util"
2828
"sigs.k8s.io/kubebuilder/v3/test/e2e/utils"
2929
)
@@ -97,7 +97,7 @@ func (sp *Sample) GenerateSampleProject() {
9797
}
9898

9999
func (sp *Sample) UpdateTutorial() {
100-
fmt.Println("TODO: update tutorial")
100+
log.Println("TODO: update tutorial")
101101
// 1. update specs
102102
updateSpec(sp)
103103
// 2. update webhook

‎pkg/cli/alpha/generate.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ limitations under the License.
1414
package alpha
1515

1616
import (
17-
"log"
17+
log "github.com/sirupsen/logrus"
1818

1919
"github.com/spf13/cobra"
2020
"sigs.k8s.io/kubebuilder/v3/pkg/rescaffold"

‎pkg/plugin/util/exec.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,18 @@ limitations under the License.
1717
package util
1818

1919
import (
20-
"fmt"
2120
"os"
2221
"os/exec"
2322
"strings"
23+
24+
log "github.com/sirupsen/logrus"
2425
)
2526

2627
// RunCmd prints the provided message and command and then executes it binding stdout and stderr
2728
func RunCmd(msg, cmd string, args ...string) error {
2829
c := exec.Command(cmd, args...) //nolint:gosec
2930
c.Stdout = os.Stdout
3031
c.Stderr = os.Stderr
31-
fmt.Println(msg + ":\n$ " + strings.Join(c.Args, " "))
32+
log.Println(msg + ":\n$ " + strings.Join(c.Args, " "))
3233
return c.Run()
3334
}

‎pkg/plugins/common/kustomize/v1/scaffolds/api.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ package scaffolds
1919
import (
2020
"fmt"
2121

22+
log "github.com/sirupsen/logrus"
23+
2224
"sigs.k8s.io/kubebuilder/v3/pkg/config"
2325
"sigs.k8s.io/kubebuilder/v3/pkg/machinery"
2426
"sigs.k8s.io/kubebuilder/v3/pkg/model/resource"
@@ -60,7 +62,7 @@ func (s *apiScaffolder) InjectFS(fs machinery.Filesystem) {
6062

6163
// Scaffold implements cmdutil.Scaffolder
6264
func (s *apiScaffolder) Scaffold() error {
63-
fmt.Println("Writing kustomize manifests for you to edit...")
65+
log.Println("Writing kustomize manifests for you to edit...")
6466

6567
// Initialize the machinery.Scaffold that will write the files to disk
6668
scaffold := machinery.NewScaffold(s.fs,

‎pkg/plugins/common/kustomize/v1/scaffolds/init.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ limitations under the License.
1717
package scaffolds
1818

1919
import (
20-
"fmt"
20+
log "github.com/sirupsen/logrus"
2121

2222
"sigs.k8s.io/kubebuilder/v3/pkg/config"
2323
"sigs.k8s.io/kubebuilder/v3/pkg/machinery"
@@ -55,7 +55,7 @@ func (s *initScaffolder) InjectFS(fs machinery.Filesystem) {
5555

5656
// Scaffold implements cmdutil.Scaffolder
5757
func (s *initScaffolder) Scaffold() error {
58-
fmt.Println("Writing kustomize manifests for you to edit...")
58+
log.Println("Writing kustomize manifests for you to edit...")
5959

6060
// Initialize the machinery.Scaffold that will write the files to disk
6161
scaffold := machinery.NewScaffold(s.fs,

‎pkg/plugins/common/kustomize/v1/scaffolds/webhook.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ package scaffolds
1919
import (
2020
"fmt"
2121

22+
log "github.com/sirupsen/logrus"
23+
2224
"sigs.k8s.io/kubebuilder/v3/pkg/config"
2325
"sigs.k8s.io/kubebuilder/v3/pkg/machinery"
2426
"sigs.k8s.io/kubebuilder/v3/pkg/model/resource"
@@ -55,7 +57,7 @@ func (s *webhookScaffolder) InjectFS(fs machinery.Filesystem) { s.fs = fs }
5557

5658
// Scaffold implements cmdutil.Scaffolder
5759
func (s *webhookScaffolder) Scaffold() error {
58-
fmt.Println("Writing kustomize manifests for you to edit...")
60+
log.Println("Writing kustomize manifests for you to edit...")
5961

6062
// Initialize the machinery.Scaffold that will write the files to disk
6163
scaffold := machinery.NewScaffold(s.fs,

‎pkg/plugins/common/kustomize/v2/scaffolds/api.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ package scaffolds
1919
import (
2020
"fmt"
2121

22+
log "github.com/sirupsen/logrus"
23+
2224
"sigs.k8s.io/kubebuilder/v3/pkg/config"
2325
"sigs.k8s.io/kubebuilder/v3/pkg/machinery"
2426
"sigs.k8s.io/kubebuilder/v3/pkg/model/resource"
@@ -60,7 +62,7 @@ func (s *apiScaffolder) InjectFS(fs machinery.Filesystem) {
6062

6163
// Scaffold implements cmdutil.Scaffolder
6264
func (s *apiScaffolder) Scaffold() error {
63-
fmt.Println("Writing kustomize manifests for you to edit...")
65+
log.Println("Writing kustomize manifests for you to edit...")
6466

6567
// Initialize the machinery.Scaffold that will write the files to disk
6668
scaffold := machinery.NewScaffold(s.fs,

‎pkg/plugins/common/kustomize/v2/scaffolds/init.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ limitations under the License.
1717
package scaffolds
1818

1919
import (
20-
"fmt"
20+
log "github.com/sirupsen/logrus"
2121

2222
"sigs.k8s.io/kubebuilder/v3/pkg/config"
2323
"sigs.k8s.io/kubebuilder/v3/pkg/machinery"
@@ -55,7 +55,7 @@ func (s *initScaffolder) InjectFS(fs machinery.Filesystem) {
5555

5656
// Scaffold implements cmdutil.Scaffolder
5757
func (s *initScaffolder) Scaffold() error {
58-
fmt.Println("Writing kustomize manifests for you to edit...")
58+
log.Println("Writing kustomize manifests for you to edit...")
5959

6060
// Initialize the machinery.Scaffold that will write the files to disk
6161
scaffold := machinery.NewScaffold(s.fs,

0 commit comments

Comments
 (0)