[release-1.0] Use logAsJson instead of logAsJSON in ZTunnel APIs (#594)

* Use logAsJson instead of logAsJSON in ZTunnel APIs The Ztunnel charts (as well as other Istio resources) use logAsJson and not logAsJSON. Signed-off-by: Sridhar Gaddam <[email protected]> * Instead of "nolint" use "logAsJSON" in the go struct Signed-off-by: Sridhar Gaddam <[email protected]> --------- Signed-off-by: Sridhar Gaddam <[email protected]> Co-authored-by: Sridhar Gaddam <[email protected]>
istio-ecosystem · Jan 28, 2025 · 0100a32 · 0100a32
1 parent c9d9284
commit 0100a32
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/api/v1/values_types_extra.go b/api/v1/values_types_extra.go
@@ -93,7 +93,7 @@ type ZTunnelConfig struct {
 	// Same as `global.logging.level`, but will override it if set
 	Logging *GlobalLoggingConfig `json:"logging,omitempty"`
 	// Specifies whether istio components should output logs in json format by adding --log_as_json argument to each container.
-	LogAsJSON *bool `json:"logAsJSON,omitempty"`
+	LogAsJSON *bool `json:"logAsJson,omitempty"`
 }
 
 // ZTunnelGlobalConfig is a subset of the Global Configuration used in the Istio ztunnel chart.
@@ -118,7 +118,7 @@ type ZTunnelGlobalConfig struct { // Default k8s resources settings for all Isti
 	ImagePullSecrets []string `json:"imagePullSecrets,omitempty"`
 
 	// Specifies whether istio components should output logs in json format by adding --log_as_json argument to each container.
-	LogAsJSON *bool `json:"logAsJSON,omitempty"`
+	LogAsJSON *bool `json:"logAsJson,omitempty"`
 	// Specifies the global logging level settings for the Istio control plane components.
 	Logging *GlobalLoggingConfig `json:"logging,omitempty"`
 

diff --git a/bundle/manifests/sailoperator.io_ztunnels.yaml b/bundle/manifests/sailoperator.io_ztunnels.yaml
@@ -177,7 +177,7 @@ spec:
                         items:
                           type: string
                         type: array
-                      logAsJSON:
+                      logAsJson:
                         description: Specifies whether istio components should output
                           logs in json format by adding --log_as_json argument to
                           each container.
@@ -262,7 +262,7 @@ spec:
                         description: Specifies the default namespace for the Istio
                           control plane components.
                         type: string
-                      logAsJSON:
+                      logAsJson:
                         description: Specifies whether istio components should output
                           logs in json format by adding --log_as_json argument to
                           each container.

diff --git a/chart/crds/sailoperator.io_ztunnels.yaml b/chart/crds/sailoperator.io_ztunnels.yaml
@@ -177,7 +177,7 @@ spec:
                         items:
                           type: string
                         type: array
-                      logAsJSON:
+                      logAsJson:
                         description: Specifies whether istio components should output
                           logs in json format by adding --log_as_json argument to
                           each container.
@@ -262,7 +262,7 @@ spec:
                         description: Specifies the default namespace for the Istio
                           control plane components.
                         type: string
-                      logAsJSON:
+                      logAsJson:
                         description: Specifies whether istio components should output
                           logs in json format by adding --log_as_json argument to
                           each container.