Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build(deps): bump golang from 1.21.5-bullseye to 1.21.6-bullseye in /examples/shared/golang #1004

Closed
wants to merge 2 commits into from
Closed

build(deps): bump golang from 1.21.5-bullseye to 1.21.6-bullseye in /examples/shared/golang #1004

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f6f5299
outlier: changing to use statusor
alyssawilk Dec 11, 2023
1836e73
build(deps): bump golang in /examples/shared/golang
dependabot[bot] Jan 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion examples/shared/golang/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ RUN rm -f /etc/apt/apt.conf.d/docker-clean \
&& echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' | tee /etc/apt/apt.conf.d/keep-cache


FROM golang:1.21.5-bullseye@sha256:2148dd89f087c3e0efe8f1337ef325fede10bb6f9109cc367b9b601fb3299379 as golang-base
FROM golang:1.21.6-bullseye@sha256:836698daa8d9d324edc48faf9d784abf8da0b5d0fca40b172346eea3b1bc16e0 as golang-base


FROM golang-base as golang-control-plane-builder
Expand Down
6 changes: 4 additions & 2 deletions source/common/upstream/cluster_factory_impl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,10 +115,12 @@ ClusterFactoryImplBase::create(const envoy::config::cluster::v3::Cluster& cluste
}
}

new_cluster_pair.first->setOutlierDetector(Outlier::DetectorImplFactory::createForCluster(
auto detector_or_error = Outlier::DetectorImplFactory::createForCluster(
*new_cluster_pair.first, cluster, server_context.mainThreadDispatcher(),
server_context.runtime(), context.outlierEventLogger(),
server_context.api().randomGenerator()));
server_context.api().randomGenerator());
RETURN_IF_STATUS_NOT_OK(detector_or_error);
new_cluster_pair.first->setOutlierDetector(detector_or_error.value());

return status_or_cluster;
}
Expand Down
6 changes: 3 additions & 3 deletions source/common/upstream/outlier_detection_impl.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ namespace Envoy {
namespace Upstream {
namespace Outlier {

DetectorSharedPtr DetectorImplFactory::createForCluster(
absl::StatusOr<DetectorSharedPtr> DetectorImplFactory::createForCluster(
Cluster& cluster, const envoy::config::cluster::v3::Cluster& cluster_config,
Event::Dispatcher& dispatcher, Runtime::Loader& runtime, EventLoggerSharedPtr event_logger,
Random::RandomGenerator& random) {
Expand Down Expand Up @@ -284,7 +284,7 @@ DetectorImpl::~DetectorImpl() {
}
}

std::shared_ptr<DetectorImpl>
absl::StatusOr<std::shared_ptr<DetectorImpl>>
DetectorImpl::create(Cluster& cluster, const envoy::config::cluster::v3::OutlierDetection& config,
Event::Dispatcher& dispatcher, Runtime::Loader& runtime,
TimeSource& time_source, EventLoggerSharedPtr event_logger,
Expand All @@ -293,7 +293,7 @@ DetectorImpl::create(Cluster& cluster, const envoy::config::cluster::v3::Outlier
new DetectorImpl(cluster, config, dispatcher, runtime, time_source, event_logger, random));

if (detector->config().maxEjectionTimeMs() < detector->config().baseEjectionTimeMs()) {
throwEnvoyExceptionOrPanic(
return absl::InvalidArgumentError(
"outlier detector's max_ejection_time cannot be smaller than base_ejection_time");
}
detector->initialize(cluster);
Expand Down
4 changes: 2 additions & 2 deletions source/common/upstream/outlier_detection_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ namespace Outlier {
*/
class DetectorImplFactory {
public:
static DetectorSharedPtr
static absl::StatusOr<DetectorSharedPtr>
createForCluster(Cluster& cluster, const envoy::config::cluster::v3::Cluster& cluster_config,
Event::Dispatcher& dispatcher, Runtime::Loader& runtime,
EventLoggerSharedPtr event_logger, Random::RandomGenerator& random);
Expand Down Expand Up @@ -372,7 +372,7 @@ class DetectorConfig {
*/
class DetectorImpl : public Detector, public std::enable_shared_from_this<DetectorImpl> {
public:
static std::shared_ptr<DetectorImpl>
static absl::StatusOr<std::shared_ptr<DetectorImpl>>
create(Cluster& cluster, const envoy::config::cluster::v3::OutlierDetection& config,
Event::Dispatcher& dispatcher, Runtime::Loader& runtime, TimeSource& time_source,
EventLoggerSharedPtr event_logger, Random::RandomGenerator& random);
Expand Down
Loading