Support structure logging for livenessprobe container #168
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -32,6 +32,8 @@ import ( | |
| connlib "github.com/kubernetes-csi/csi-lib-utils/connection" | ||
| "github.com/kubernetes-csi/csi-lib-utils/metrics" | ||
| "github.com/kubernetes-csi/csi-lib-utils/rpc" | ||
| logsapi "k8s.io/component-base/logs/api/v1" | ||
| json "k8s.io/component-base/logs/json" | ||
| ) | ||
|
|
||
| const ( | ||
|
|
@@ -46,6 +48,7 @@ var ( | |
| metricsAddress = flag.String("metrics-address", "", "(deprecated) The TCP network address where the prometheus metrics endpoint will listen (example: `:8080`). The default is empty string, which means metrics endpoint is disabled. If set, `--http-endpoint` cannot be set, and the address cannot resolve to localhost + the port from `--health-port`.") | ||
| httpEndpoint = flag.String("http-endpoint", "", "The TCP network address where the HTTP server for diagnostics, including CSI driver health check and metrics. The default is empty string, which means the server is disabled. If set, `--health-port` and `--metrics-address` cannot be explicitly set.") | ||
| metricsPath = flag.String("metrics-path", "/metrics", "The HTTP path where prometheus metrics will be exposed. Default is `/metrics`.") | ||
| logFormatJSON = flag.Bool("log-format-json", false, "set log formatter to json") | ||
| ) | ||
|
|
||
| type healthProbe struct { | ||
|
|
@@ -131,6 +134,11 @@ func main() { | |
| klog.Error("only one of `--metrics-address` and `--http-endpoint` can be explicitly set.") | ||
| os.Exit(1) | ||
| } | ||
| if *logFormatJSON { | ||
| jsonFactory := json.Factory{} | ||
| logger, _ := jsonFactory.Create(logsapi.LoggingConfiguration{Format: "json"}) | ||
| klog.InfoS("logging livenessprobe",logger) | ||
|
There was a problem hiding this comment. I think this is just logging There was a problem hiding this comment. @mauriciopoppe ok i will re check this, if it's possible could you provide me pointer on this. There was a problem hiding this comment. I wrote some pointers in kubernetes-csi/node-driver-registrar#228 (comment) There was a problem hiding this comment. sure i will check that thanks |
||
| } | ||
| var addr string | ||
| if *httpEndpoint != "" { | ||
| addr = *httpEndpoint | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -50,4 +50,5 @@ | |
| args: | ||
| - --v=4 | ||
| - --csi-address=/csi/csi.sock | ||
| - --log-format-json=true | ||
| # | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
we should follow the same flag as the kubelet which is
logging-formathttps://github.com/kubernetes/component-base/blob/v0.25.3/logs/api/v1/options.go#L185There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sure i will modify this to
logging-format