Merge branch 'enable_log_config' of github.com:openziti/helm-charts into enable_log_config

Author: mguthrie88

charts/ziti-controller/README.md

@@ -251,7 +251,7 @@ For more information, please check [here](https://openziti.io/docs/learn/core-co
 | fabric.events.subscriptions[9].type | string | `"edge.entityCounts"` |  |
 | highAvailability.mode | string | `"standalone"` | Ziti controller HA mode |
 | highAvailability.replicas | int | `1` | Ziti controller HA swarm replicas |
-| image.additionalArgs | list | `["--log-formatter","pfxlog"]` | Additional arguments can be passed directly to the container to modify ziti runtime arguments use "json" for json formatted logs |
+| image.additionalArgs | list | `["--log-formatter","pfxlog"]` | additional arguments can be passed directly to the container to modify ziti runtime arguments |
 | image.args | list | `["{{ include \"configMountDir\" . }}/ziti-controller.yaml"]` | args for the entrypoint command |
 | image.command | list | `["ziti","controller","run"]` | container entrypoint command |
 | image.homeDir | string | `"/home/ziggy"` | homeDir for admin login shell must align with container image's ~/.bashrc for ziti CLI auto-complete to work |

charts/ziti-router/README.md

@@ -201,9 +201,9 @@ tunnel:
 | forwarder.xgressDialWorkerCount | int | `128` |  |
 | hostNetwork | bool | `false` | Host networking requested for a pod if set, i.e. tproxy ports enabled in the host namespace. i.e. egress gateway |
 | identityMountDir | string | `"/etc/ziti/identity"` | read-only mountpoint for router identity secret specified in deployment for use by router run container |
+| image.additionalArgs | list | `["--log-formatter","pfxlog"]` | additional arguments can be passed directly to the container to modify ziti runtime arguments |
 | image.args | list | `["run","{{ .Values.configMountDir }}/{{ .Values.configFile }}"]` | deployment container command args and opts |
 | image.command | list | `["/entrypoint.bash"]` | deployment container command |
-| image.env | list | `[{"name":"--log-formatter"},"pfxlog"]` | Additional arguments can be passed directly to the container to modify ziti runtime arguments |
 | image.pullPolicy | string | `"Always"` | deployment image pull policy |
 | image.repository | string | `"docker.io/openziti/ziti-router"` | container image tag for deployment |
 | image.tag | string | `nil` | container image tag (default is Chart's appVersion) |