Skip to content

Commit

Permalink
Fix logger (#4710)
Browse files Browse the repository at this point in the history
* Fix logger
* add changelog and update ref
  • Loading branch information
jahvon committed May 7, 2021
1 parent 1eb6756 commit 1462df5
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 3 deletions.
9 changes: 9 additions & 0 deletions changelog/v1.8.0-beta12/fix-env-var-log-level.yaml
@@ -0,0 +1,9 @@
changelog:
- type: FIX
description: Fix setting of stat server log level when using the LOG_LEVEL environment variable
resolvesIssue: false
issueLink: https://github.com/solo-io/gloo/issues/4648
- type: DEPENDENCY_BUMP
dependencyOwner: solo-io
dependencyRepo: go-utils
dependencyTag: v0.21.5
5 changes: 5 additions & 0 deletions docs/content/reference/values.txt
Expand Up @@ -126,6 +126,7 @@
|gloo.deployment.resources.requests.cpu|string||amount of CPUs|
|gloo.serviceAccount.extraAnnotations.NAME|string||extra annotations to add to the service account|
|gloo.serviceAccount.disableAutomount|bool||disable automunting the service account to the gateway proxy. not mounting the token hardens the proxy container, but may interfere with service mesh integrations|
|gloo.logLevel|string||Level at which the pod should log. Options include "info", "debug", "warn", "error", "panic" and "fatal". Default level is info|
|discovery.deployment.image.tag|string|<release_version, ex: 1.2.3>|tag for the container|
|discovery.deployment.image.repository|string|discovery|image name (repository) for the container.|
|discovery.deployment.image.registry|string||image prefix/registry e.g. (quay.io/solo-io)|
Expand Down Expand Up @@ -166,6 +167,7 @@
|discovery.enabled|bool|true|enable Discovery features|
|discovery.serviceAccount.extraAnnotations.NAME|string||extra annotations to add to the service account|
|discovery.serviceAccount.disableAutomount|bool||disable automunting the service account to the gateway proxy. not mounting the token hardens the proxy container, but may interfere with service mesh integrations|
|discovery.logLevel|string||Level at which the pod should log. Options include "info", "debug", "warn", "error", "panic" and "fatal". Default level is info|
|gateway.enabled|bool|true|enable Gloo Edge API Gateway features|
|gateway.validation.enabled|bool|true|enable Gloo Edge API Gateway validation hook (default true)|
|gateway.validation.alwaysAcceptResources|bool|true|unless this is set this to false in order to ensure validation webhook rejects invalid resources. by default, validation webhook will only log and report metrics for invalid resource admission without rejecting them outright.|
Expand Down Expand Up @@ -229,6 +231,7 @@
|gateway.serviceAccount.extraAnnotations.NAME|string||extra annotations to add to the service account|
|gateway.serviceAccount.disableAutomount|bool||disable automunting the service account to the gateway proxy. not mounting the token hardens the proxy container, but may interfere with service mesh integrations|
|gateway.readGatewaysFromAllNamespaces|bool|false|if true, read Gateway custom resources from all watched namespaces rather than just the namespace of the Gateway controller|
|gateway.logLevel|string||Level at which the pod should log. Options include "info", "debug", "warn", "error", "panic" and "fatal". Default level is info|
|gatewayProxies.NAME.kind.deployment.replicas|int||number of instances to deploy|
|gatewayProxies.NAME.kind.deployment.customEnv[].name|string|||
|gatewayProxies.NAME.kind.deployment.customEnv[].value|string|||
Expand Down Expand Up @@ -373,6 +376,7 @@
|gatewayProxies.NAME.podDisruptionBudget.maxUnavailable|int32||An eviction is allowed if at most "maxUnavailable" pods selected by "selector" are unavailable after the eviction, i.e. even in absence of the evicted pod. For example, one can prevent all voluntary evictions by specifying 0. This is a mutually exclusive setting with "minAvailable".|
|gatewayProxies.NAME.istioMetaMeshId|string||ISTIO_META_MESH_ID Environment Variable. Defaults to "cluster.local"|
|gatewayProxies.NAME.istioMetaClusterId|string||ISTIO_META_CLUSTER_ID Environment Variable. Defaults to "Kubernetes"|
|gatewayProxies.NAME.logLevel|string||Level at which the pod should log. Options include "info", "debug", "warn", "error", "panic" and "fatal". Default level is info|
|gatewayProxies.gatewayProxy.kind.deployment.replicas|int|1|number of instances to deploy|
|gatewayProxies.gatewayProxy.kind.deployment.customEnv[].name|string|||
|gatewayProxies.gatewayProxy.kind.deployment.customEnv[].value|string|||
Expand Down Expand Up @@ -517,6 +521,7 @@
|gatewayProxies.gatewayProxy.podDisruptionBudget.maxUnavailable|int32||An eviction is allowed if at most "maxUnavailable" pods selected by "selector" are unavailable after the eviction, i.e. even in absence of the evicted pod. For example, one can prevent all voluntary evictions by specifying 0. This is a mutually exclusive setting with "minAvailable".|
|gatewayProxies.gatewayProxy.istioMetaMeshId|string||ISTIO_META_MESH_ID Environment Variable. Defaults to "cluster.local"|
|gatewayProxies.gatewayProxy.istioMetaClusterId|string||ISTIO_META_CLUSTER_ID Environment Variable. Defaults to "Kubernetes"|
|gatewayProxies.gatewayProxy.logLevel|string||Level at which the pod should log. Options include "info", "debug", "warn", "error", "panic" and "fatal". Default level is info|
|ingress.enabled|bool|false||
|ingress.deployment.image.tag|string|<release_version, ex: 1.2.3>|tag for the container|
|ingress.deployment.image.repository|string|ingress|image name (repository) for the container.|
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Expand Up @@ -67,7 +67,7 @@ require (
github.com/sergi/go-diff v1.1.0
github.com/smartystreets/assertions v1.0.0 // indirect
github.com/solo-io/go-list-licenses v0.1.0
github.com/solo-io/go-utils v0.21.0
github.com/solo-io/go-utils v0.21.5
github.com/solo-io/k8s-utils v0.0.7
github.com/solo-io/protoc-gen-ext v0.0.15
github.com/solo-io/reporting-client v0.2.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Expand Up @@ -1269,8 +1269,8 @@ github.com/solo-io/go-utils v0.16.4/go.mod h1:uIPAgEuwiEwpBaFv1uI7j4CUVaFYR5iHmT
github.com/solo-io/go-utils v0.19.0/go.mod h1:If8NiehXROCFU65PGeDTrrZCNA5gJXvbcVoXI8Fqjko=
github.com/solo-io/go-utils v0.20.0/go.mod h1:wy4um9xnqPNlASld4eSuQQqjNCXRBtDjVRLJsoGqkdE=
github.com/solo-io/go-utils v0.20.2/go.mod h1:6e8K1spnMWwlnJRSNp/J84GEyJbrcK4Gm7i+ehzCi8c=
github.com/solo-io/go-utils v0.21.0 h1:e7C/pFt9L0w99Vmtbdcq6Xs6OsHl1pZqqEW+x2pbAVY=
github.com/solo-io/go-utils v0.21.0/go.mod h1:6e8K1spnMWwlnJRSNp/J84GEyJbrcK4Gm7i+ehzCi8c=
github.com/solo-io/go-utils v0.21.5 h1:aoONkC2d7gVC7La9tY8oTUTURhUQ6zEzdlYmK96gJlw=
github.com/solo-io/go-utils v0.21.5/go.mod h1:6e8K1spnMWwlnJRSNp/J84GEyJbrcK4Gm7i+ehzCi8c=
github.com/solo-io/k8s-utils v0.0.1/go.mod h1:53N9+9Gl2MwqIZJ7/ocA9gKvWt+6z7MPD2qKQix7oFE=
github.com/solo-io/k8s-utils v0.0.7 h1:Gav67QcwzBFAUpG5RUmWWFrO3TQdFw0YEVXk2L6FzH4=
github.com/solo-io/k8s-utils v0.0.7/go.mod h1:NJFXCtSXXBErviEl7J+fIg4DU8xEvxFCQ2nEjxy2NdI=
Expand Down
4 changes: 4 additions & 0 deletions install/helm/gloo/generate/values.go
Expand Up @@ -181,6 +181,7 @@ type InvalidConfigPolicy struct {
type Gloo struct {
Deployment *GlooDeployment `json:"deployment,omitempty"`
ServiceAccount `json:"serviceAccount,omitempty" `
LogLevel *string `json:"logLevel,omitempty" desc:"Level at which the pod should log. Options include \"info\", \"debug\", \"warn\", \"error\", \"panic\" and \"fatal\". Default level is info"`
}

type GlooDeployment struct {
Expand All @@ -202,6 +203,7 @@ type Discovery struct {
FdsMode *string `json:"fdsMode,omitempty" desc:"mode for function discovery (blacklist or whitelist). See more info in the settings docs"`
Enabled *bool `json:"enabled,omitempty" desc:"enable Discovery features"`
ServiceAccount `json:"serviceAccount,omitempty" `
LogLevel *string `json:"logLevel,omitempty" desc:"Level at which the pod should log. Options include \"info\", \"debug\", \"warn\", \"error\", \"panic\" and \"fatal\". Default level is info"`
}

type DiscoveryDeployment struct {
Expand All @@ -223,6 +225,7 @@ type Gateway struct {
ProxyServiceAccount ServiceAccount `json:"proxyServiceAccount,omitempty" `
ServiceAccount ServiceAccount `json:"serviceAccount,omitempty" `
ReadGatewaysFromAllNamespaces *bool `json:"readGatewaysFromAllNamespaces,omitempty" desc:"if true, read Gateway custom resources from all watched namespaces rather than just the namespace of the Gateway controller"`
LogLevel *string `json:"logLevel,omitempty" desc:"Level at which the pod should log. Options include \"info\", \"debug\", \"warn\", \"error\", \"panic\" and \"fatal\". Default level is info"`
}

type ServiceAccount struct {
Expand Down Expand Up @@ -302,6 +305,7 @@ type GatewayProxy struct {
PodDisruptionBudget *PodDisruptionBudget `json:"podDisruptionBudget,omitempty" desc:"PodDisruptionBudget is an object to define the max disruption that can be caused to the gate-proxy pods"`
IstioMetaMeshId *string `json:"istioMetaMeshId,omitempty" desc:"ISTIO_META_MESH_ID Environment Variable. Defaults to \"cluster.local\""`
IstioMetaClusterId *string `json:"istioMetaClusterId,omitempty" desc:"ISTIO_META_CLUSTER_ID Environment Variable. Defaults to \"Kubernetes\""`
LogLevel *string `json:"logLevel,omitempty" desc:"Level at which the pod should log. Options include \"info\", \"debug\", \"warn\", \"error\", \"panic\" and \"fatal\". Default level is info"`
}

type GatewayProxyGatewaySettings struct {
Expand Down

0 comments on commit 1462df5

Please sign in to comment.