Skip to content

Bug 1878040: operator: allow log levels for old clients and unify OperatorLogLevel #753

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Sep 29, 2020
Merged

Bug 1878040: operator: allow log levels for old clients and unify OperatorLogLevel #753

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion imageregistry/v1/00-crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -652,6 +652,7 @@ spec:
type: string
default: Normal
enum:
- ""
- Normal
- Debug
- Trace
Expand Down Expand Up @@ -683,9 +684,11 @@ spec:
operator itself. It does not give fine grained control, but it
is a simple way to manage coarse grained logging choices that operators
have to interpret for themselves. \n Valid values are: \"Normal\",
\"Debug\", \"Trace\", \"TraceAll\"."
\"Debug\", \"Trace\", \"TraceAll\". Defaults to \"Normal\"."
type: string
default: Normal
enum:
- ""
- Normal
- Debug
- Trace
Expand Down
1 change: 1 addition & 0 deletions imageregistry/v1/01-crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -663,6 +663,7 @@ spec:
type: string
default: Normal
enum:
- ""
- Normal
- Debug
- Trace
Expand Down
5 changes: 4 additions & 1 deletion operator/v1/0000_10_config-operator_01_config.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ spec:
type: string
default: Normal
enum:
- ""
- Normal
- Debug
- Trace
Expand All @@ -73,9 +74,11 @@ spec:
operator itself. It does not give fine grained control, but it
is a simple way to manage coarse grained logging choices that operators
have to interpret for themselves. \n Valid values are: \"Normal\",
\"Debug\", \"Trace\", \"TraceAll\"."
\"Debug\", \"Trace\", \"TraceAll\". Defaults to \"Normal\"."
type: string
default: Normal
enum:
- ""
- Normal
- Debug
- Trace
Expand Down
5 changes: 4 additions & 1 deletion operator/v1/0000_12_etcd-operator_01_config.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ spec:
type: string
default: Normal
enum:
- ""
- Normal
- Debug
- Trace
Expand All @@ -85,9 +86,11 @@ spec:
operator itself. It does not give fine grained control, but it
is a simple way to manage coarse grained logging choices that operators
have to interpret for themselves. \n Valid values are: \"Normal\",
\"Debug\", \"Trace\", \"TraceAll\"."
\"Debug\", \"Trace\", \"TraceAll\". Defaults to \"Normal\"."
type: string
default: Normal
enum:
- ""
- Normal
- Debug
- Trace
Expand Down
5 changes: 4 additions & 1 deletion operator/v1/0000_20_kube-apiserver-operator_01_config.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ spec:
interpret for their operands. \n Valid values are: \"Normal\", \"Debug\",
\"Trace\", \"TraceAll\". Defaults to \"Normal\"."
enum:
- ""
- Normal
- Debug
- Trace
Expand All @@ -73,12 +74,14 @@ spec:
type: object
x-kubernetes-preserve-unknown-fields: true
operatorLogLevel:
default: Normal
description: "operatorLogLevel is an intent based logging for the
operator itself. It does not give fine grained control, but it
is a simple way to manage coarse grained logging choices that operators
have to interpret for themselves. \n Valid values are: \"Normal\",
\"Debug\", \"Trace\", \"TraceAll\"."
\"Debug\", \"Trace\", \"TraceAll\". Defaults to \"Normal\"."
enum:
- ""
- Normal
- Debug
- Trace
Expand Down
5 changes: 4 additions & 1 deletion operator/v1/0000_25_kube-controller-manager-operator_01_config.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ spec:
interpret for their operands. \n Valid values are: \"Normal\", \"Debug\",
\"Trace\", \"TraceAll\". Defaults to \"Normal\"."
enum:
- ""
- Normal
- Debug
- Trace
Expand All @@ -75,12 +76,14 @@ spec:
type: object
x-kubernetes-preserve-unknown-fields: true
operatorLogLevel:
default: Normal
description: "operatorLogLevel is an intent based logging for the
operator itself. It does not give fine grained control, but it
is a simple way to manage coarse grained logging choices that operators
have to interpret for themselves. \n Valid values are: \"Normal\",
\"Debug\", \"Trace\", \"TraceAll\"."
\"Debug\", \"Trace\", \"TraceAll\". Defaults to \"Normal\"."
enum:
- ""
- Normal
- Debug
- Trace
Expand Down
5 changes: 4 additions & 1 deletion operator/v1/0000_25_kube-scheduler-operator_01_config.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ spec:
interpret for their operands. \n Valid values are: \"Normal\", \"Debug\",
\"Trace\", \"TraceAll\". Defaults to \"Normal\"."
enum:
- ""
- Normal
- Debug
- Trace
Expand All @@ -75,12 +76,14 @@ spec:
type: object
x-kubernetes-preserve-unknown-fields: true
operatorLogLevel:
default: Normal
description: "operatorLogLevel is an intent based logging for the
operator itself. It does not give fine grained control, but it
is a simple way to manage coarse grained logging choices that operators
have to interpret for themselves. \n Valid values are: \"Normal\",
\"Debug\", \"Trace\", \"TraceAll\"."
\"Debug\", \"Trace\", \"TraceAll\". Defaults to \"Normal\"."
enum:
- ""
- Normal
- Debug
- Trace
Expand Down
5 changes: 4 additions & 1 deletion operator/v1/0000_30_openshift-apiserver-operator_01_config.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ spec:
type: string
default: Normal
enum:
- ""
- Normal
- Debug
- Trace
Expand All @@ -74,9 +75,11 @@ spec:
operator itself. It does not give fine grained control, but it
is a simple way to manage coarse grained logging choices that operators
have to interpret for themselves. \n Valid values are: \"Normal\",
\"Debug\", \"Trace\", \"TraceAll\"."
\"Debug\", \"Trace\", \"TraceAll\". Defaults to \"Normal\"."
type: string
default: Normal
enum:
- ""
- Normal
- Debug
- Trace
Expand Down
5 changes: 4 additions & 1 deletion operator/v1/0000_40_cloud-credential-operator_00_config.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ spec:
type: string
default: Normal
enum:
- ""
- Normal
- Debug
- Trace
Expand All @@ -84,9 +85,11 @@ spec:
operator itself. It does not give fine grained control, but it
is a simple way to manage coarse grained logging choices that operators
have to interpret for themselves. \n Valid values are: \"Normal\",
\"Debug\", \"Trace\", \"TraceAll\"."
\"Debug\", \"Trace\", \"TraceAll\". Defaults to \"Normal\"."
type: string
default: Normal
enum:
- ""
- Normal
- Debug
- Trace
Expand Down
5 changes: 4 additions & 1 deletion operator/v1/0000_40_kube-storage-version-migrator-operator_00_config.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ spec:
type: string
default: Normal
enum:
- ""
- Normal
- Debug
- Trace
Expand All @@ -71,9 +72,11 @@ spec:
operator itself. It does not give fine grained control, but it
is a simple way to manage coarse grained logging choices that operators
have to interpret for themselves. \n Valid values are: \"Normal\",
\"Debug\", \"Trace\", \"TraceAll\"."
\"Debug\", \"Trace\", \"TraceAll\". Defaults to \"Normal\"."
type: string
default: Normal
enum:
- ""
- Normal
- Debug
- Trace
Expand Down
5 changes: 4 additions & 1 deletion operator/v1/0000_50_cluster-authentication-operator_01_config.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ spec:
type: string
default: Normal
enum:
- ""
- Normal
- Debug
- Trace
Expand All @@ -70,9 +71,11 @@ spec:
operator itself. It does not give fine grained control, but it
is a simple way to manage coarse grained logging choices that operators
have to interpret for themselves. \n Valid values are: \"Normal\",
\"Debug\", \"Trace\", \"TraceAll\"."
\"Debug\", \"Trace\", \"TraceAll\". Defaults to \"Normal\"."
type: string
default: Normal
enum:
- ""
- Normal
- Debug
- Trace
Expand Down
5 changes: 4 additions & 1 deletion operator/v1/0000_50_cluster-openshift-controller-manager-operator_02_config.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ spec:
type: string
default: Normal
enum:
- ""
- Normal
- Debug
- Trace
Expand All @@ -72,9 +73,11 @@ spec:
operator itself. It does not give fine grained control, but it
is a simple way to manage coarse grained logging choices that operators
have to interpret for themselves. \n Valid values are: \"Normal\",
\"Debug\", \"Trace\", \"TraceAll\"."
\"Debug\", \"Trace\", \"TraceAll\". Defaults to \"Normal\"."
type: string
default: Normal
enum:
- ""
- Normal
- Debug
- Trace
Expand Down
5 changes: 4 additions & 1 deletion operator/v1/0000_50_cluster_storage_operator_01_crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ spec:
type: string
default: Normal
enum:
- ""
- Normal
- Debug
- Trace
Expand All @@ -71,9 +72,11 @@ spec:
operator itself. It does not give fine grained control, but it
is a simple way to manage coarse grained logging choices that operators
have to interpret for themselves. \n Valid values are: \"Normal\",
\"Debug\", \"Trace\", \"TraceAll\"."
\"Debug\", \"Trace\", \"TraceAll\". Defaults to \"Normal\"."
type: string
default: Normal
enum:
- ""
- Normal
- Debug
- Trace
Expand Down
5 changes: 4 additions & 1 deletion operator/v1/0000_50_service-ca-operator_02_crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ spec:
type: string
default: Normal
enum:
- ""
- Normal
- Debug
- Trace
Expand All @@ -72,9 +73,11 @@ spec:
operator itself. It does not give fine grained control, but it
is a simple way to manage coarse grained logging choices that operators
have to interpret for themselves. \n Valid values are: \"Normal\",
\"Debug\", \"Trace\", \"TraceAll\"."
\"Debug\", \"Trace\", \"TraceAll\". Defaults to \"Normal\"."
type: string
default: Normal
enum:
- ""
- Normal
- Debug
- Trace
Expand Down
1 change: 1 addition & 0 deletions operator/v1/0000_70_cluster-network-operator_01_crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,6 +373,7 @@ spec:
logging may affect performance. The default value is "Normal".
type: string
enum:
- ""
- Normal
- Debug
- Trace
Expand Down
5 changes: 4 additions & 1 deletion operator/v1/0000_70_console-operator.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ spec:
type: string
default: Normal
enum:
- ""
- Normal
- Debug
- Trace
Expand All @@ -117,9 +118,11 @@ spec:
operator itself. It does not give fine grained control, but it
is a simple way to manage coarse grained logging choices that operators
have to interpret for themselves. \n Valid values are: \"Normal\",
\"Debug\", \"Trace\", \"TraceAll\"."
\"Debug\", \"Trace\", \"TraceAll\". Defaults to \"Normal\"."
type: string
default: Normal
enum:
- ""
- Normal
- Debug
- Trace
Expand Down
5 changes: 4 additions & 1 deletion operator/v1/0000_80_csi_snapshot_controller_operator_01_crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ spec:
type: string
default: Normal
enum:
- ""
- Normal
- Debug
- Trace
Expand All @@ -71,9 +72,11 @@ spec:
operator itself. It does not give fine grained control, but it
is a simple way to manage coarse grained logging choices that operators
have to interpret for themselves. \n Valid values are: \"Normal\",
\"Debug\", \"Trace\", \"TraceAll\"."
\"Debug\", \"Trace\", \"TraceAll\". Defaults to \"Normal\"."
type: string
default: Normal
enum:
- ""
- Normal
- Debug
- Trace
Expand Down
5 changes: 4 additions & 1 deletion operator/v1/0000_90_cluster_csi_driver_01_config.crd.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ spec:
interpret for their operands. \n Valid values are: \"Normal\", \"Debug\",
\"Trace\", \"TraceAll\". Defaults to \"Normal\"."
enum:
- ""
- Normal
- Debug
- Trace
Expand All @@ -68,12 +69,14 @@ spec:
type: object
x-kubernetes-preserve-unknown-fields: true
operatorLogLevel:
default: Normal
description: "operatorLogLevel is an intent based logging for the
operator itself. It does not give fine grained control, but it
is a simple way to manage coarse grained logging choices that operators
have to interpret for themselves. \n Valid values are: \"Normal\",
\"Debug\", \"Trace\", \"TraceAll\"."
\"Debug\", \"Trace\", \"TraceAll\". Defaults to \"Normal\"."
enum:
- ""
- Normal
- Debug
- Trace
Expand Down
8 changes: 5 additions & 3 deletions operator/v1/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,14 +56,16 @@ type OperatorSpec struct {
// Defaults to "Normal".
// +optional
// +kubebuilder:default=Normal
LogLevel LogLevel `json:"logLevel"`
LogLevel LogLevel `json:"logLevel,omitempty"`

// operatorLogLevel is an intent based logging for the operator itself. It does not give fine grained control, but it is a
// simple way to manage coarse grained logging choices that operators have to interpret for themselves.
//
// Valid values are: "Normal", "Debug", "Trace", "TraceAll".
// Defaults to "Normal".
// +optional
OperatorLogLevel LogLevel `json:"operatorLogLevel"`
// +kubebuilder:default=Normal
OperatorLogLevel LogLevel `json:"operatorLogLevel,omitempty"`

// unsupportedConfigOverrides holds a sparse config that will override any previously set options. It only needs to be the fields to override
// it will end up overlaying in the following order:
Expand All @@ -83,7 +85,7 @@ type OperatorSpec struct {
ObservedConfig runtime.RawExtension `json:"observedConfig"`
}

// +kubebuilder:validation:Enum=Normal;Debug;Trace;TraceAll
// +kubebuilder:validation:Enum="";Normal;Debug;Trace;TraceAll
type LogLevel string

var (
Expand Down
Loading