diff --git a/api/envoy/config/cluster/v3/cluster.proto b/api/envoy/config/cluster/v3/cluster.proto index 7e05736106ee..506623367a5b 100644 --- a/api/envoy/config/cluster/v3/cluster.proto +++ b/api/envoy/config/cluster/v3/cluster.proto @@ -953,8 +953,8 @@ message Cluster { // :ref:`STRICT_DNS` // and :ref:`LOGICAL_DNS` // this setting is ignored. - // This field is deprecated in favor of ``dns_config`` - // which aggregates all of the DNS configuration in a single message. + // This field is deprecated in favor of :ref:`cluster_type` and + // will be ignored :ref:`cluster_type` is set. google.protobuf.Duration dns_refresh_rate = 16 [ deprecated = true, (validate.rules).duration = {gt {nanos: 1000000}}, @@ -970,8 +970,8 @@ message Cluster { // :ref:`STRICT_DNS` // and :ref:`LOGICAL_DNS` // this setting is ignored. - // This field is deprecated in favor of ``dns_config`` - // which aggregates all of the DNS configuration in a single message. + // This field is deprecated in favor of :ref:`cluster_type` and + // will be ignored :ref:`cluster_type` is set. google.protobuf.Duration dns_jitter = 58 [deprecated = true, (envoy.annotations.deprecated_at_minor_version) = "3.0"]; @@ -983,16 +983,16 @@ message Cluster { // other than :ref:`STRICT_DNS` and // :ref:`LOGICAL_DNS` this setting is // ignored. - // This field is deprecated in favor of ``dns_config`` - // which aggregates all of the DNS configuration in a single message. + // This field is deprecated in favor of :ref:`cluster_type` and + // will be ignored :ref:`cluster_type` is set. RefreshRate dns_failure_refresh_rate = 44 [deprecated = true, (envoy.annotations.deprecated_at_minor_version) = "3.0"]; // Optional configuration for setting cluster's DNS refresh rate. If the value is set to true, // cluster's DNS refresh rate will be set to resource record's TTL which comes from DNS // resolution. - // This field is deprecated in favor of ``dns_config`` - // which aggregates all of the DNS configuration in a single message. + // This field is deprecated in favor of :ref:`cluster_type` and + // will be ignored :ref:`cluster_type` is set. bool respect_dns_ttl = 39 [deprecated = true, (envoy.annotations.deprecated_at_minor_version) = "3.0"]; @@ -1015,8 +1015,6 @@ message Cluster { // :ref:`STRICT_DNS` // and :ref:`LOGICAL_DNS` // this setting is ignored. - // This field is deprecated in favor of ``dns_resolution_config`` - // which aggregates all of the DNS resolver configuration in a single message. repeated core.v3.Address dns_resolvers = 18 [deprecated = true, (envoy.annotations.deprecated_at_minor_version) = "3.0"]; diff --git a/source/extensions/clusters/logical_dns/logical_dns_cluster.cc b/source/extensions/clusters/logical_dns/logical_dns_cluster.cc index 9fef749c270a..c98d79ba641b 100644 --- a/source/extensions/clusters/logical_dns/logical_dns_cluster.cc +++ b/source/extensions/clusters/logical_dns/logical_dns_cluster.cc @@ -223,12 +223,12 @@ LogicalDnsClusterFactory::createClusterWithConfig( absl::StatusOr> cluster_or_error; if (cluster.has_cluster_type()) { cluster_or_error = LogicalDnsCluster::create(cluster, proto_config, context, - std::move(*dns_resolver_or_error)); + std::move(*dns_resolver_or_error)); } else { envoy::extensions::clusters::dns::v3::DnsCluster proto_config_legacy{}; createDnsClusterFromLegacyFields(cluster, proto_config_legacy); cluster_or_error = LogicalDnsCluster::create(cluster, proto_config_legacy, context, - std::move(*dns_resolver_or_error)); + std::move(*dns_resolver_or_error)); } RETURN_IF_NOT_OK(cluster_or_error.status());