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]>
sridhargaddam · Jan 24, 2025 · f96e227 · f96e227
1 parent 6f59106
commit f96e227
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/api/v1alpha1/values_types_extra.go b/api/v1alpha1/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"` //nolint
 }
 
 // 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"` //nolint
 	// Specifies the global logging level settings for the Istio control plane components.
 	Logging *GlobalLoggingConfig `json:"logging,omitempty"`
 

diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
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.

diff --git a/docs/api-reference/sailoperator.io.md b/docs/api-reference/sailoperator.io.md
@@ -3252,7 +3252,7 @@ _Appears in:_
 | `xdsAddress` _string_ | The customized XDS address to retrieve configuration. |  |  |
 | `istioNamespace` _string_ | Specifies the default namespace for the Istio control plane components. |  |  |
 | `logging` _[GlobalLoggingConfig](#globalloggingconfig)_ | Same as `global.logging.level`, but will override it if set |  |  |
-| `logAsJSON` _boolean_ | Specifies whether istio components should output logs in json format by adding --log_as_json argument to each container. |  |  |
+| `logAsJson` _boolean_ | Specifies whether istio components should output logs in json format by adding --log_as_json argument to each container. |  |  |
 
 
 #### ZTunnelGlobalConfig
@@ -3272,7 +3272,7 @@ _Appears in:_
 | `hub` _string_ | Specifies the docker hub for Istio images. |  |  |
 | `imagePullPolicy` _[PullPolicy](https://kubernetes.io/docs/reference/generated/kubernetes-api/v1.25/#pullpolicy-v1-core)_ | Specifies the image pull policy for the Istio images. one of Always, Never, IfNotPresent. Defaults to Always if :latest tag is specified, or IfNotPresent otherwise. Cannot be updated.  More info: https://kubernetes.io/docs/concepts/containers/images#updating-images |  | Enum: [Always Never IfNotPresent]   |
 | `imagePullSecrets` _string array_ | ImagePullSecrets for the control plane ServiceAccount, list of secrets in the same namespace to use for pulling any images in pods that reference this ServiceAccount. Must be set for any cluster configured with private docker registry. |  |  |
-| `logAsJSON` _boolean_ | Specifies whether istio components should output logs in json format by adding --log_as_json argument to each container. |  |  |
+| `logAsJson` _boolean_ | Specifies whether istio components should output logs in json format by adding --log_as_json argument to each container. |  |  |
 | `logging` _[GlobalLoggingConfig](#globalloggingconfig)_ | Specifies the global logging level settings for the Istio control plane components. |  |  |
 | `tag` _string_ | Specifies the tag for the Istio docker images. |  |  |
 | `variant` _string_ | The variant of the Istio container images to use. Options are "debug" or "distroless". Unset will use the default for the given version. |  |  |