Skip to content

Commit 53d9af5

Browse files
committed
Merge the merge into the onto
1 parent 22d1dc6 commit 53d9af5

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

crates/stackable-operator/crds/DummyCluster.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -637,7 +637,7 @@ spec:
637637
objectOverrides:
638638
default: []
639639
description: |-
640-
A list of generic Kubernetes objects, which are merged on the objects that the operator
640+
A list of generic Kubernetes objects, which are merged into the objects that the operator
641641
creates.
642642
643643
List entries are arbitrary YAML objects, which need to be valid Kubernetes objects.

crates/stackable-operator/src/deep_merger/crd.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use crate::utils::crds::raw_object_list_schema;
88

99
#[derive(Clone, Debug, Deserialize, Default, JsonSchema, Serialize, PartialEq)]
1010
pub struct ObjectOverrides(
11-
/// A list of generic Kubernetes objects, which are merged on the objects that the operator
11+
/// A list of generic Kubernetes objects, which are merged into the objects that the operator
1212
/// creates.
1313
///
1414
/// List entries are arbitrary YAML objects, which need to be valid Kubernetes objects.

0 commit comments

Comments
 (0)