Skip to content

Commit 88710df

Browse files
committed
Merge branch 'main' of https://github.com/stackabletech/operator-rs into feat/config-overrides-json
2 parents cb02cb1 + a000311 commit 88710df

File tree

29 files changed

+69
-69
lines changed

29 files changed

+69
-69
lines changed

crates/k8s-version/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
//!
2424
//! ### Constructing
2525
//!
26-
//! Alternatively, they can be constructed programatically using the
26+
//! Alternatively, they can be constructed programmatically using the
2727
//! [`ApiVersion::new()`] and [`ApiVersion::try_new()`] functions.
2828
//!
2929
//! ```

crates/stackable-certs/CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ All notable changes to this project will be documented in this file.
1414

1515
- BREAKING: The functions `generate_leaf_certificate`, `generate_rsa_leaf_certificate` and
1616
`generate_ecdsa_leaf_certificate` of `CertificateAuthority` accept an additional parameter
17-
`subject_alterative_dns_names` ([#1057]).
17+
`subject_alternative_dns_names` ([#1057]).
1818
- The passed SANs are added to the generated certificate, this is needed when the HTTPS server is
1919
accessible on multiple DNS names and/or IPs.
2020
- Pass an empty list (`[]`) to keep the existing behavior.

crates/stackable-certs/src/ca/mod.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ where
163163
}
164164

165165
/// A certificate authority (CA) which is used to generate and sign
166-
/// intermidiate or leaf certificates.
166+
/// intermediate or leaf certificates.
167167
#[derive(Debug)]
168168
pub struct CertificateAuthority<S>
169169
where
@@ -298,7 +298,7 @@ where
298298
key_pair: T,
299299
name: &str,
300300
scope: &str,
301-
subject_alterative_dns_names: impl IntoIterator<Item = &'a str> + Debug,
301+
subject_alternative_dns_names: impl IntoIterator<Item = &'a str> + Debug,
302302
validity: Duration,
303303
) -> Result<CertificatePair<T>>
304304
where
@@ -353,7 +353,7 @@ where
353353
]))
354354
.context(AddCertificateExtensionSnafu)?;
355355

356-
let sans = subject_alterative_dns_names
356+
let sans = subject_alternative_dns_names
357357
.into_iter()
358358
.map(|dns_name| {
359359
let ia5_dns_name =
@@ -385,11 +385,11 @@ where
385385
&mut self,
386386
name: &str,
387387
scope: &str,
388-
subject_alterative_dns_names: impl IntoIterator<Item = &'a str> + Debug,
388+
subject_alternative_dns_names: impl IntoIterator<Item = &'a str> + Debug,
389389
validity: Duration,
390390
) -> Result<CertificatePair<rsa::SigningKey>> {
391391
let key = rsa::SigningKey::new().context(GenerateRsaSigningKeySnafu)?;
392-
self.generate_leaf_certificate(key, name, scope, subject_alterative_dns_names, validity)
392+
self.generate_leaf_certificate(key, name, scope, subject_alternative_dns_names, validity)
393393
}
394394

395395
/// Generates an ECDSAasync -based leaf certificate which is signed by this CA.
@@ -401,11 +401,11 @@ where
401401
&mut self,
402402
name: &str,
403403
scope: &str,
404-
subject_alterative_dns_names: impl IntoIterator<Item = &'a str> + Debug,
404+
subject_alternative_dns_names: impl IntoIterator<Item = &'a str> + Debug,
405405
validity: Duration,
406406
) -> Result<CertificatePair<ecdsa::SigningKey>> {
407407
let key = ecdsa::SigningKey::new().context(GenerateEcdsaSigningKeySnafu)?;
408-
self.generate_leaf_certificate(key, name, scope, subject_alterative_dns_names, validity)
408+
self.generate_leaf_certificate(key, name, scope, subject_alternative_dns_names, validity)
409409
}
410410

411411
/// Create a [`CertificateAuthority`] from a Kubernetes [`Secret`].

crates/stackable-certs/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ pub enum CertificatePairError<E>
4343
where
4444
E: std::error::Error + 'static,
4545
{
46-
#[snafu(display("failed to seralize certificate as {key_encoding}"))]
46+
#[snafu(display("failed to serialize certificate as {key_encoding}"))]
4747
SerializeCertificate {
4848
source: x509_cert::der::Error,
4949
key_encoding: KeyEncoding,

crates/stackable-operator/CHANGELOG.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1501,7 +1501,7 @@ Only rust documentation was changed.
15011501
- status::condition module to compute the cluster resource status ([#571]).
15021502
- Helper function to build RBAC resources ([#572]).
15031503
- Add `ClusterResourceApplyStrategy` to `ClusterResource` ([#573]).
1504-
- Add `ClusterOperation` common struct with `reconcilation_paused` and `stopped` flags ([#573]).
1504+
- Add `ClusterOperation` common struct with `reconciliation_paused` and `stopped` flags ([#573]).
15051505

15061506
[#571]: https://github.com/stackabletech/operator-rs/pull/571
15071507
[#572]: https://github.com/stackabletech/operator-rs/pull/572
@@ -1846,7 +1846,7 @@ This is a rerelease of 0.25.1 which some last-minute incompatible API changes to
18461846

18471847
### Changed
18481848

1849-
- BREAKING: Removed `commons::s3::S3ConnectionImplementation`. `commons::s3::InlinedBucketSpec::endpoint()` doesn't take arguments since the protocol decision is now based on the existance of TLS configuration ([#390]).
1849+
- BREAKING: Removed `commons::s3::S3ConnectionImplementation`. `commons::s3::InlinedBucketSpec::endpoint()` doesn't take arguments since the protocol decision is now based on the existence of TLS configuration ([#390]).
18501850
- BREAKING: Changes to resource requirements structs to enable deep merging ([#392])
18511851
- Changed fields in `Resources` to no longer be optional
18521852
- Changed atomic fields in `MemoryLimits`, `JvmHeapLimits`, `CpuLimits` and `PvcConfig` to be optional
@@ -1882,7 +1882,7 @@ This is a rerelease of 0.25.1 which some last-minute incompatible API changes to
18821882
### Added
18831883

18841884
- Export logs to Jaeger ([#360]).
1885-
- Added common datastructures shared between all operators like `Tls` oder `AuthenticationClass` ([#366]).
1885+
- Added common datastructures shared between all operators like `Tls` or `AuthenticationClass` ([#366]).
18861886
- Added helpers for env variables from Secrets or ConfigMaps ([#370]).
18871887

18881888
### Changed
@@ -2096,7 +2096,7 @@ This is a rerelease of 0.25.1 which some last-minute incompatible API changes to
20962096
### Changed
20972097

20982098
- BREAKING: In builder: `add_stackable_agent_tolerations` to `add_tolerations` ([#255]).
2099-
- Generic `VALUE` paramters to `impl Into<_>` arguments for consistency ([#253]).
2099+
- Generic `VALUE` parameters to `impl Into<_>` arguments for consistency ([#253]).
21002100

21012101
### Removed
21022102

crates/stackable-operator/crds/DummyCluster.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -650,7 +650,7 @@ spec:
650650
type: object
651651
type: object
652652
enableVectorAgent:
653-
description: Wether or not to deploy a container with the Vector log agent.
653+
description: Whether or not to deploy a container with the Vector log agent.
654654
nullable: true
655655
type: boolean
656656
type: object
@@ -1302,7 +1302,7 @@ spec:
13021302
type: object
13031303
type: object
13041304
enableVectorAgent:
1305-
description: Wether or not to deploy a container with the Vector log agent.
1305+
description: Whether or not to deploy a container with the Vector log agent.
13061306
nullable: true
13071307
type: boolean
13081308
type: object

crates/stackable-operator/src/builder/pdb.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ pub enum Error {
4545
pub struct PodDisruptionBudgetBuilder<ObjectMeta, LabelSelector, PodDisruptionBudgetConstraint> {
4646
metadata: ObjectMeta,
4747
selector: LabelSelector,
48-
/// Tracks wether either `maxUnavailable` or `minAvailable` is set.
48+
/// Tracks whether either `maxUnavailable` or `minAvailable` is set.
4949
constraint: Option<PodDisruptionBudgetConstraint>,
5050
}
5151

crates/stackable-operator/src/builder/pod/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -667,7 +667,7 @@ mod tests {
667667
.build()
668668
}
669669

670-
/// A [`PodBuilder`] that already contains the minum setup to build a Pod (name and container).
670+
/// A [`PodBuilder`] that already contains the minimum setup to build a Pod (name and container).
671671
#[fixture]
672672
fn pod_builder_with_name_and_container(dummy_container: Container) -> PodBuilder {
673673
let mut builder = PodBuilder::new();

crates/stackable-operator/src/client.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -590,7 +590,7 @@ impl Client {
590590
pub trait GetApi: Resource + Sized {
591591
/// The namespace type for `Self`'s scope.
592592
///
593-
/// This will be [`str`] for namespaced resource, and [`()`] for cluster-scoped resources.
593+
/// This will be [`str`] for namespaced resource, and `()` for cluster-scoped resources.
594594
type Namespace: ?Sized;
595595
/// Get a [`kube::Api`] for `Self`'s native scope..
596596
fn get_api(client: kube::Client, ns: &Self::Namespace) -> kube::Api<Self>

crates/stackable-operator/src/commons/resources.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ pub enum ResourceRequirementsType {
384384
// We currently don't use claims in our container builder and thus also
385385
// do not support setting and validating them. When we do support claims
386386
// in the future, we can just remove the comment to get support for it
387-
// immediatly.
387+
// immediately.
388388
// Claims,
389389
}
390390

@@ -407,7 +407,7 @@ pub trait ResourceRequirementsExt {
407407
resource: &str,
408408
) -> Result<()>;
409409

410-
/// Returns wether the implementor has a [`ResourceRequirementsType`] set
410+
/// Returns whether the implementor has a [`ResourceRequirementsType`] set
411411
/// for a `resource`.
412412
fn has_resource_requirement(&self, rr_type: ResourceRequirementsType, resource: &str) -> bool {
413413
self.check_resource_requirement(rr_type, resource).is_ok()
@@ -427,7 +427,7 @@ pub trait ResourceRequirementsExt {
427427
Ok(())
428428
}
429429

430-
/// Returns wether the implementor has all [`ResourceRequirementsType`]s set
430+
/// Returns whether the implementor has all [`ResourceRequirementsType`]s set
431431
/// for a `resource`.
432432
fn has_resource_requirements(
433433
&self,

0 commit comments

Comments
 (0)