Skip to content

Commit 66d4415

Browse files
committed
Remove hard coded logger dev mode
Before this commit, the cluster operator always used a logger dev mode, even in production. After this commit, the logger is prod mode by default. When developing locally deploying the operator using `make deploy-dev` and `make deploy-kind`, the logger will use dev mode. Futhermore, users can now configure more zap flags (see https://github.com/kubernetes-sigs/controller-runtime/blob/66537ca5b7439b06f2f3b08901640f934834c9a1/pkg/log/zap/zap.go#L227-L233) For example, they can set the log level.
1 parent 9b239ea commit 66d4415

File tree

3 files changed

+7
-1
lines changed

3 files changed

+7
-1
lines changed

config/default/overlays/dev/manager_image_patch.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,4 @@ spec:
1717
- image: ((operator_docker_image))
1818
name: operator
1919
imagePullPolicy: Always
20+
args: ["--zap-devel"]

config/default/overlays/kind/manager_image_patch.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -17,3 +17,4 @@ spec:
1717
- image: ((operator_docker_image))
1818
name: operator
1919
imagePullPolicy: IfNotPresent
20+
args: ["--zap-devel"]

main.go

+5-1
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,13 @@ func init() {
4545
func main() {
4646
var metricsAddr string
4747
flag.StringVar(&metricsAddr, "metrics-addr", ":12345", "The address the metric endpoint binds to.")
48+
49+
opts := zap.Options{}
50+
opts.BindFlags(flag.CommandLine)
51+
4852
flag.Parse()
4953

50-
ctrl.SetLogger(zap.New(zap.UseDevMode(true)))
54+
ctrl.SetLogger(zap.New(zap.UseFlagOptions(&opts)))
5155

5256
operatorNamespace := os.Getenv("OPERATOR_NAMESPACE")
5357
if operatorNamespace == "" {

0 commit comments

Comments
 (0)