From 3da5f5893cb56f945a78ccf3e7526d59fedfe944 Mon Sep 17 00:00:00 2001 From: Albin Kerouanton Date: Mon, 13 Jan 2025 18:38:09 +0100 Subject: [PATCH 1/2] docs: mark logger opt 'fluentd-async-connect' as removed Signed-off-by: Albin Kerouanton --- docs/deprecated.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/deprecated.md b/docs/deprecated.md index 9c99fad610..5381f218b6 100644 --- a/docs/deprecated.md +++ b/docs/deprecated.md @@ -79,7 +79,7 @@ The following table provides an overview of the current status of deprecated fea | Deprecated | [CLI plugins support](#cli-plugins-support) | v20.10 | - | | Deprecated | [Dockerfile legacy `ENV name value` syntax](#dockerfile-legacy-env-name-value-syntax) | v20.10 | - | | Removed | [`docker build --stream` flag (experimental)](#docker-build---stream-flag-experimental) | v20.10 | v20.10 | -| Deprecated | [`fluentd-async-connect` log opt](#fluentd-async-connect-log-opt) | v20.10 | - | +| Deprecated | [`fluentd-async-connect` log opt](#fluentd-async-connect-log-opt) | v20.10 | v28.0 | | Removed | [Configuration options for experimental CLI features](#configuration-options-for-experimental-cli-features) | v19.03 | v23.0 | | Deprecated | [Pushing and pulling with image manifest v2 schema 1](#pushing-and-pulling-with-image-manifest-v2-schema-1) | v19.03 | v27.0 | | Removed | [`docker engine` subcommands](#docker-engine-subcommands) | v19.03 | v20.10 | @@ -678,6 +678,7 @@ files. ### `fluentd-async-connect` log opt **Deprecated in Release: v20.10** +**Removed in Release: v28.0** The `--log-opt fluentd-async-connect` option for the fluentd logging driver is [deprecated in favor of `--log-opt fluentd-async`](https://github.com/moby/moby/pull/39086). From acbdad9551086e7750e9cab0ddfb0938581ff463 Mon Sep 17 00:00:00 2001 From: Albin Kerouanton Date: Mon, 13 Jan 2025 18:38:24 +0100 Subject: [PATCH 2/2] completion: replace fluentd-async-connect with fluentd-async Signed-off-by: Albin Kerouanton --- contrib/completion/bash/docker | 2 +- contrib/completion/zsh/_docker | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/completion/bash/docker b/contrib/completion/bash/docker index 4c6235211c..4ceceb50ae 100644 --- a/contrib/completion/bash/docker +++ b/contrib/completion/bash/docker @@ -971,7 +971,7 @@ __docker_complete_log_driver_options() { __docker_nospace return ;; - compress|fluentd-async-connect) + compress|fluentd-async) COMPREPLY=( $( compgen -W "false true" -- "${cur##*=}" ) ) return ;; diff --git a/contrib/completion/zsh/_docker b/contrib/completion/zsh/_docker index f4d538a3df..127f1a7ae5 100644 --- a/contrib/completion/zsh/_docker +++ b/contrib/completion/zsh/_docker @@ -227,7 +227,7 @@ __docker_get_log_options() { common_options=("max-buffer-size" "mode") common_options2=("env" "env-regex" "labels") awslogs_options=($common_options "awslogs-create-group" "awslogs-datetime-format" "awslogs-group" "awslogs-multiline-pattern" "awslogs-region" "awslogs-stream" "tag") - fluentd_options=($common_options $common_options2 "fluentd-address" "fluentd-async-connect" "fluentd-buffer-limit" "fluentd-retry-wait" "fluentd-max-retries" "fluentd-sub-second-precision" "tag") + fluentd_options=($common_options $common_options2 "fluentd-address" "fluentd-async" "fluentd-buffer-limit" "fluentd-retry-wait" "fluentd-max-retries" "fluentd-sub-second-precision" "tag") gcplogs_options=($common_options $common_options2 "gcp-log-cmd" "gcp-meta-id" "gcp-meta-name" "gcp-meta-zone" "gcp-project") gelf_options=($common_options $common_options2 "gelf-address" "gelf-compression-level" "gelf-compression-type" "tag") journald_options=($common_options $common_options2 "tag")