Skip to content

Commit

Permalink
Merge branch 'main' into feat/graceful-shutdown
Browse files Browse the repository at this point in the history
  • Loading branch information
sbernauer authored Oct 18, 2023
2 parents c10c5da + 7332e31 commit 091a40a
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ jobs:
steps:
- name: Install preflight
run: |
wget https://github.com/redhat-openshift-ecosystem/openshift-preflight/releases/latest/download/preflight-linux-amd64
wget https://github.com/redhat-openshift-ecosystem/openshift-preflight/releases/download/1.6.11/preflight-linux-amd64
chmod +x preflight-linux-amd64
- name: Check container
run: ./preflight-linux-amd64 check container "$IMAGE_TAG" > preflight.out
Expand Down
2 changes: 1 addition & 1 deletion .readme/partials/borrowed/footer.md.j2
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## About The Stackable Data Platform

This operator is written and maintained by [Stackable](https://www.stackable.tech) and it is part of a larger data platform.
This operator is written and maintained by [Stackable](https://stackable.tech) and it is part of a larger data platform.

![Stackable Data Platform Overview](./.readme/static/borrowed/sdp_overview.png)

Expand Down
2 changes: 1 addition & 1 deletion .readme/partials/borrowed/overview_blurb.md.j2
Original file line number Diff line number Diff line change
@@ -1 +1 @@
It is part of the Stackable Data Platform, a curated selection of the best open source data apps like Kafka, Druid, Trino or Spark, [all](#other-operators) working together seamlessly. Based on Kubernetes, it runs everywhere – [on prem or in the cloud](#supported-platforms).
It is part of the Stackable Data Platform, a curated selection of the best open source data apps like Apache Kafka, Apache Druid, Trino or Apache Spark, [all](#our-operators) working together seamlessly. Based on Kubernetes, it runs everywhere – [on prem or in the cloud](#supported-platforms).
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

This is a Kubernetes operator to manage [Apache HBase](https://hbase.apache.org/) clusters.

It is part of the Stackable Data Platform, a curated selection of the best open source data apps like Kafka, Druid, Trino or Spark, [all](#other-operators) working together seamlessly. Based on Kubernetes, it runs everywhere – [on prem or in the cloud](#supported-platforms).
It is part of the Stackable Data Platform, a curated selection of the best open source data apps like Apache Kafka, Apache Druid, Trino or Apache Spark, [all](#our-operators) working together seamlessly. Based on Kubernetes, it runs everywhere – [on prem or in the cloud](#supported-platforms).

## Installation

Expand All @@ -37,7 +37,7 @@ If you have a question about the Stackable Data Platform contact us via our [hom

## About The Stackable Data Platform

This operator is written and maintained by [Stackable](https://www.stackable.tech) and it is part of a larger data platform.
This operator is written and maintained by [Stackable](https://stackable.tech) and it is part of a larger data platform.

![Stackable Data Platform Overview](./.readme/static/borrowed/sdp_overview.png)

Expand Down
4 changes: 2 additions & 2 deletions rust/operator-binary/src/hbase_controller.rs
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ use stackable_operator::{
product_image_selection::ResolvedProductImage,
rbac::{build_rbac_resources, service_account_name},
},
duration::Duration,
k8s_openapi::{api::core::v1::Volume, DeepMerge},
k8s_openapi::{
api::{
Expand Down Expand Up @@ -65,7 +66,6 @@ use std::{
collections::{BTreeMap, HashMap},
str::FromStr,
sync::Arc,
time::Duration,
};
use strum::{EnumDiscriminants, IntoStaticStr};

Expand Down Expand Up @@ -892,7 +892,7 @@ where
}

pub fn error_policy(_obj: Arc<HbaseCluster>, _error: &Error, _ctx: Arc<Ctx>) -> Action {
Action::requeue(Duration::from_secs(5))
Action::requeue(*Duration::from_secs(5))
}

pub fn build_recommended_labels<'a>(
Expand Down

0 comments on commit 091a40a

Please sign in to comment.