Skip to content

Commit 95faf71

Browse files
TechassiTechassi
committed
fix: Use patched kube version
1 parent 29496e7 commit 95faf71

File tree

5 files changed

+63
-57
lines changed

5 files changed

+63
-57
lines changed

‎Cargo.lock‎

Lines changed: 5 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.nix‎

Lines changed: 30 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ built = { version = "0.8", features = ["chrono", "git2"] }
1818
clap = "4.5"
1919
const_format = "0.2"
2020
futures = { version = "0.3", features = ["compat"] }
21+
# We pin the kube version, as we use a patch for 2.0.1 below
22+
kube = "=2.0.1"
2123
rstest = "0.26"
2224
semver = "1.0"
2325
serde = { version = "1.0", features = ["derive"] }
@@ -33,3 +35,6 @@ indoc = "2"
3335
# [patch."https://github.com/stackabletech/operator-rs.git"]
3436
# stackable-operator = { git = "https://github.com/stackabletech//operator-rs.git", branch = "main" }
3537
# stackable-operator = { path = "../operator-rs/crates/stackable-operator" }
38+
39+
[patch.crates-io]
40+
kube = { git = "https://github.com/stackabletech/kube-rs", branch = "2.0.1-fix-schema-hoisting" }

‎crate-hashes.json‎

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎deploy/helm/spark-k8s-operator/crds/crds.yaml‎

Lines changed: 18 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -151,12 +151,11 @@ spec:
151151
- ERROR
152152
- FATAL
153153
- NONE
154-
- null
155154
nullable: true
156155
type: string
157156
type: object
158157
custom:
159-
description: Custom log configuration provided in a ConfigMap
158+
description: Log configuration provided in a ConfigMap
160159
properties:
161160
configMap:
162161
description: ConfigMap containing the log configuration files
@@ -179,7 +178,6 @@ spec:
179178
- ERROR
180179
- FATAL
181180
- NONE
182-
- null
183181
nullable: true
184182
type: string
185183
type: object
@@ -199,7 +197,6 @@ spec:
199197
- ERROR
200198
- FATAL
201199
- NONE
202-
- null
203200
nullable: true
204201
type: string
205202
type: object
@@ -529,12 +526,11 @@ spec:
529526
- ERROR
530527
- FATAL
531528
- NONE
532-
- null
533529
nullable: true
534530
type: string
535531
type: object
536532
custom:
537-
description: Custom log configuration provided in a ConfigMap
533+
description: Log configuration provided in a ConfigMap
538534
properties:
539535
configMap:
540536
description: ConfigMap containing the log configuration files
@@ -557,7 +553,6 @@ spec:
557553
- ERROR
558554
- FATAL
559555
- NONE
560-
- null
561556
nullable: true
562557
type: string
563558
type: object
@@ -577,7 +572,6 @@ spec:
577572
- ERROR
578573
- FATAL
579574
- NONE
580-
- null
581575
nullable: true
582576
type: string
583577
type: object
@@ -887,16 +881,13 @@ spec:
887881
x-kubernetes-preserve-unknown-fields: true
888882
type: object
889883
logFileDirectory:
890-
anyOf:
891-
- oneOf:
892-
- required:
893-
- s3
894-
- required:
895-
- customLogDirectory
896-
- enum:
897-
- null
898-
nullable: true
899884
description: The log file directory definition used by the Spark history server.
885+
nullable: true
886+
oneOf:
887+
- required:
888+
- s3
889+
- required:
890+
- customLogDirectory
900891
properties:
901892
customLogDirectory:
902893
description: A custom log directory
@@ -1095,18 +1086,15 @@ spec:
10951086
- client
10961087
type: string
10971088
s3connection:
1098-
anyOf:
1099-
- oneOf:
1100-
- required:
1101-
- inline
1102-
- required:
1103-
- reference
1104-
- enum:
1105-
- null
1106-
nullable: true
11071089
description: |-
11081090
Configure an S3 connection that the SparkApplication has access to.
11091091
Read more in the [Spark S3 usage guide](https://docs.stackable.tech/home/nightly/spark-k8s/usage-guide/s3).
1092+
nullable: true
1093+
oneOf:
1094+
- required:
1095+
- inline
1096+
- required:
1097+
- reference
11101098
properties:
11111099
inline:
11121100
description: |-
@@ -1701,12 +1689,11 @@ spec:
17011689
- ERROR
17021690
- FATAL
17031691
- NONE
1704-
- null
17051692
nullable: true
17061693
type: string
17071694
type: object
17081695
custom:
1709-
description: Custom log configuration provided in a ConfigMap
1696+
description: Log configuration provided in a ConfigMap
17101697
properties:
17111698
configMap:
17121699
description: ConfigMap containing the log configuration files
@@ -1729,7 +1716,6 @@ spec:
17291716
- ERROR
17301717
- FATAL
17311718
- NONE
1732-
- null
17331719
nullable: true
17341720
type: string
17351721
type: object
@@ -1749,7 +1735,6 @@ spec:
17491735
- ERROR
17501736
- FATAL
17511737
- NONE
1752-
- null
17531738
nullable: true
17541739
type: string
17551740
type: object
@@ -2012,12 +1997,11 @@ spec:
20121997
- ERROR
20131998
- FATAL
20141999
- NONE
2015-
- null
20162000
nullable: true
20172001
type: string
20182002
type: object
20192003
custom:
2020-
description: Custom log configuration provided in a ConfigMap
2004+
description: Log configuration provided in a ConfigMap
20212005
properties:
20222006
configMap:
20232007
description: ConfigMap containing the log configuration files
@@ -2040,7 +2024,6 @@ spec:
20402024
- ERROR
20412025
- FATAL
20422026
- NONE
2043-
- null
20442027
nullable: true
20452028
type: string
20462029
type: object
@@ -2060,7 +2043,6 @@ spec:
20602043
- ERROR
20612044
- FATAL
20622045
- NONE
2063-
- null
20642046
nullable: true
20652047
type: string
20662048
type: object
@@ -2374,12 +2356,11 @@ spec:
23742356
- ERROR
23752357
- FATAL
23762358
- NONE
2377-
- null
23782359
nullable: true
23792360
type: string
23802361
type: object
23812362
custom:
2382-
description: Custom log configuration provided in a ConfigMap
2363+
description: Log configuration provided in a ConfigMap
23832364
properties:
23842365
configMap:
23852366
description: ConfigMap containing the log configuration files
@@ -2402,7 +2383,6 @@ spec:
24022383
- ERROR
24032384
- FATAL
24042385
- NONE
2405-
- null
24062386
nullable: true
24072387
type: string
24082388
type: object
@@ -2422,7 +2402,6 @@ spec:
24222402
- ERROR
24232403
- FATAL
24242404
- NONE
2425-
- null
24262405
nullable: true
24272406
type: string
24282407
type: object
@@ -2664,12 +2643,11 @@ spec:
26642643
- ERROR
26652644
- FATAL
26662645
- NONE
2667-
- null
26682646
nullable: true
26692647
type: string
26702648
type: object
26712649
custom:
2672-
description: Custom log configuration provided in a ConfigMap
2650+
description: Log configuration provided in a ConfigMap
26732651
properties:
26742652
configMap:
26752653
description: ConfigMap containing the log configuration files
@@ -2692,7 +2670,6 @@ spec:
26922670
- ERROR
26932671
- FATAL
26942672
- NONE
2695-
- null
26962673
nullable: true
26972674
type: string
26982675
type: object
@@ -2712,7 +2689,6 @@ spec:
27122689
- ERROR
27132690
- FATAL
27142691
- NONE
2715-
- null
27162692
nullable: true
27172693
type: string
27182694
type: object

0 commit comments

Comments
 (0)