Skip to content

[Merged by Bors] - Refactor merging and validation of the configuration #404

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

Closed
siegfriedweber wants to merge 10 commits into from
Closed

[Merged by Bors] - Refactor merging and validation of the configuration #404

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d23dc38
Use fragments in DruidClusterSpec
siegfriedweber Feb 21, 2023
df661b5
Implement configuration merge
siegfriedweber Feb 22, 2023
22ad147
Add replicas and selector to CommonConfig
siegfriedweber Feb 22, 2023
b244a22
Regenerate charts
siegfriedweber Feb 22, 2023
e7518fc
Remove unused error variants
siegfriedweber Feb 22, 2023
267b31a
Update changelog
siegfriedweber Feb 22, 2023
7ae150a
Upgrade operator-rs to version 0.35.0
siegfriedweber Feb 22, 2023
f768f76
Add code comments
siegfriedweber Feb 22, 2023
9992e71
Merge branch 'main' into fragment-config
siegfriedweber Feb 22, 2023
90bb2e6
Optimize code
siegfriedweber Feb 27, 2023
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
4 changes: 3 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ All notable changes to this project will be documented in this file.

### Changed

- Upgrade to `operator-rs` `0.31.0` ([#374])
- Upgrade to `operator-rs` `0.35.0` ([#374], [#380], [#404])
- Merging and validation of the configuration refactored ([#404]).

### Fixed

Expand All @@ -20,6 +21,7 @@ All notable changes to this project will be documented in this file.
[#374]: https://github.com/stackabletech/druid-operator/pull/374
[#380]: https://github.com/stackabletech/druid-operator/pull/380
[#387]: https://github.com/stackabletech/druid-operator/pull/387
[#404]: https://github.com/stackabletech/druid-operator/pull/404

## [23.1.0] - 2023-01-23

Expand Down
60 changes: 30 additions & 30 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

104 changes: 88 additions & 16 deletions deploy/helm/druid-operator/crds/crds.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,14 @@ spec:
default: {}
properties:
resources:
nullable: true
default:
memory:
limit: null
runtimeLimits: {}
cpu:
min: null
max: null
storage: {}
properties:
cpu:
default:
Expand Down Expand Up @@ -89,7 +96,14 @@ spec:
default: {}
properties:
resources:
nullable: true
default:
memory:
limit: null
runtimeLimits: {}
cpu:
min: null
max: null
storage: {}
properties:
cpu:
default:
Expand Down Expand Up @@ -523,7 +537,14 @@ spec:
default: {}
properties:
resources:
nullable: true
default:
memory:
limit: null
runtimeLimits: {}
cpu:
min: null
max: null
storage: {}
properties:
cpu:
default:
Expand Down Expand Up @@ -576,7 +597,14 @@ spec:
default: {}
properties:
resources:
nullable: true
default:
memory:
limit: null
runtimeLimits: {}
cpu:
min: null
max: null
storage: {}
properties:
cpu:
default:
Expand Down Expand Up @@ -670,7 +698,17 @@ spec:
default: {}
properties:
resources:
nullable: true
default:
memory:
limit: null
runtimeLimits: {}
cpu:
min: null
max: null
storage:
segmentCache:
emptyDir:
capacity: null
properties:
cpu:
default:
Expand Down Expand Up @@ -699,10 +737,8 @@ spec:
properties:
segmentCache:
default:
freePercentage: 5
emptyDir:
capacity: 1G
medium: ''
capacity: null
properties:
emptyDir:
default:
Expand Down Expand Up @@ -749,7 +785,17 @@ spec:
default: {}
properties:
resources:
nullable: true
default:
memory:
limit: null
runtimeLimits: {}
cpu:
min: null
max: null
storage:
segmentCache:
emptyDir:
capacity: null
properties:
cpu:
default:
Expand Down Expand Up @@ -778,10 +824,8 @@ spec:
properties:
segmentCache:
default:
freePercentage: 5
emptyDir:
capacity: 1G
medium: ''
capacity: null
properties:
emptyDir:
default:
Expand Down Expand Up @@ -912,7 +956,14 @@ spec:
default: {}
properties:
resources:
nullable: true
default:
memory:
limit: null
runtimeLimits: {}
cpu:
min: null
max: null
storage: {}
properties:
cpu:
default:
Expand Down Expand Up @@ -965,7 +1016,14 @@ spec:
default: {}
properties:
resources:
nullable: true
default:
memory:
limit: null
runtimeLimits: {}
cpu:
min: null
max: null
storage: {}
properties:
cpu:
default:
Expand Down Expand Up @@ -1059,7 +1117,14 @@ spec:
default: {}
properties:
resources:
nullable: true
default:
memory:
limit: null
runtimeLimits: {}
cpu:
min: null
max: null
storage: {}
properties:
cpu:
default:
Expand Down Expand Up @@ -1112,7 +1177,14 @@ spec:
default: {}
properties:
resources:
nullable: true
default:
memory:
limit: null
runtimeLimits: {}
cpu:
min: null
max: null
storage: {}
properties:
cpu:
default:
Expand Down
2 changes: 1 addition & 1 deletion rust/crd/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ version = "0.0.0-dev"
publish = false

[dependencies]
stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "0.33.0" }
stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", tag = "0.35.0" }

semver = "1.0"
serde = { version = "1.0", features = ["derive"] }
Expand Down
Loading