Skip to content

Commit

Permalink
Revert "Add proper startup, liveness and readiness probes (#273)" (#276)
Browse files Browse the repository at this point in the history
This reverts commit 1f2e9a9.

The probes caused test failures when the opa authorizer was used.
See #275 for details.
  • Loading branch information
sbernauer committed Jul 27, 2022
1 parent 1f2e9a9 commit f9511bf
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 80 deletions.
5 changes: 0 additions & 5 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,9 @@ All notable changes to this project will be documented in this file.
- BREAKING: HDFS deep storage now configurable via HDFS discovery config map instead of an url to a HDFS name node ([#262]).
- Include chart name when installing with a custom release name ([#263], [#264]).

### Fixed

- Add proper startup, liveness and readiness probes ([#273])

[#262]: https://github.com/stackabletech/druid-operator/pull/262
[#263]: https://github.com/stackabletech/druid-operator/pull/263
[#264]: https://github.com/stackabletech/druid-operator/pull/264
[#273]: https://github.com/stackabletech/druid-operator/pull/273

## [0.6.0] - 2022-06-30

Expand Down
17 changes: 14 additions & 3 deletions rust/operator-binary/src/druid_controller.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
use crate::{
config::{get_jvm_config, get_log4j_config},
discovery::{self, build_discovery_configmaps},
probes::add_probes,
};

use snafu::{OptionExt, ResultExt, Snafu};
Expand All @@ -26,7 +25,9 @@ use stackable_operator::{
k8s_openapi::{
api::{
apps::v1::{StatefulSet, StatefulSetSpec},
core::v1::{ConfigMap, EnvVar, Service, ServicePort, ServiceSpec},
core::v1::{
ConfigMap, EnvVar, Probe, Service, ServicePort, ServiceSpec, TCPSocketAction,
},
},
apimachinery::pkg::{apis::meta::v1::LabelSelector, util::intstr::IntOrString},
},
Expand Down Expand Up @@ -595,7 +596,17 @@ fn build_rolegroup_statefulset(
.build(),
);

add_probes(&mut cb, &role);
// readiness probe
let probe = Probe {
tcp_socket: Some(TCPSocketAction {
port: IntOrString::Int(role.get_http_port().into()),
..Default::default()
}),
initial_delay_seconds: Some(30),
period_seconds: Some(5),
..Default::default()
};
cb.readiness_probe(probe);

let mut container = cb.build();
container.image_pull_policy = Some("IfNotPresent".to_string());
Expand Down
1 change: 0 additions & 1 deletion rust/operator-binary/src/main.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
mod config;
mod discovery;
mod druid_controller;
mod probes;

use std::sync::Arc;

Expand Down
71 changes: 0 additions & 71 deletions rust/operator-binary/src/probes.rs

This file was deleted.

0 comments on commit f9511bf

Please sign in to comment.