Skip to content

Commit 3661e2e

Browse files
committed
Merge branch 'main' into feat/request-secret-lifetime
2 parents 820ce1b + 2512a17 commit 3661e2e

18 files changed

+937
-165
lines changed

crates/stackable-versioned-macros/fixtures/inputs/k8s/basic.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@
1010
)
1111
)]
1212
// ---
13-
#[derive(Clone, Debug, serde::Deserialize, serde::Serialize, schemars::JsonSchema)]
13+
#[derive(
14+
Clone, Debug, serde::Deserialize, serde::Serialize, schemars::JsonSchema, kube::CustomResource,
15+
)]
1416
pub struct FooSpec {
1517
#[versioned(
1618
added(since = "v1beta1"),
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
#[versioned(
2+
version(name = "v1alpha1"),
3+
version(name = "v1beta1"),
4+
version(name = "v1"),
5+
k8s(
6+
group = "foo.example.org",
7+
singular = "foo",
8+
plural = "foos",
9+
namespaced,
10+
crates(
11+
kube_core = ::kube::core
12+
)
13+
)
14+
)]
15+
// ---
16+
#[derive(
17+
Clone, Debug, serde::Deserialize, serde::Serialize, schemars::JsonSchema, kube::CustomResource,
18+
)]
19+
pub struct FooSpec {
20+
#[versioned(
21+
added(since = "v1beta1"),
22+
changed(since = "v1", from_name = "bah", from_type = "u16")
23+
)]
24+
bar: usize,
25+
baz: bool,
26+
}

crates/stackable-versioned-macros/fixtures/inputs/k8s/module.rs

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,14 @@ pub(crate) mod versioned {
1212
}
1313

1414
#[versioned(k8s(group = "foo.example.org", plural = "foos", namespaced))]
15+
#[derive(
16+
Clone,
17+
Debug,
18+
serde::Deserialize,
19+
serde::Serialize,
20+
schemars::JsonSchema,
21+
kube::CustomResource,
22+
)]
1523
pub struct FooSpec {
1624
bar: usize,
1725

@@ -23,6 +31,14 @@ pub(crate) mod versioned {
2331
}
2432

2533
#[versioned(k8s(group = "bar.example.org", plural = "bars"))]
34+
#[derive(
35+
Clone,
36+
Debug,
37+
serde::Deserialize,
38+
serde::Serialize,
39+
schemars::JsonSchema,
40+
kube::CustomResource,
41+
)]
2642
pub struct BarSpec {
2743
baz: String,
2844
}

crates/stackable-versioned-macros/fixtures/inputs/k8s/module_preserve.rs

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,14 @@ pub(crate) mod versioned {
1313
}
1414

1515
#[versioned(k8s(group = "foo.example.org", plural = "foos", namespaced))]
16+
#[derive(
17+
Clone,
18+
Debug,
19+
serde::Deserialize,
20+
serde::Serialize,
21+
schemars::JsonSchema,
22+
kube::CustomResource,
23+
)]
1624
pub struct FooSpec {
1725
bar: usize,
1826

@@ -24,6 +32,14 @@ pub(crate) mod versioned {
2432
}
2533

2634
#[versioned(k8s(group = "bar.example.org", plural = "bars"))]
35+
#[derive(
36+
Clone,
37+
Debug,
38+
serde::Deserialize,
39+
serde::Serialize,
40+
schemars::JsonSchema,
41+
kube::CustomResource,
42+
)]
2743
pub struct BarSpec {
2844
baz: String,
2945
}
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
#[versioned(
2+
version(name = "v1alpha1"),
3+
version(name = "v1beta1"),
4+
version(name = "v1"),
5+
k8s(
6+
group = "stackable.tech",
7+
kind = "FooBar",
8+
singular = "foo",
9+
plural = "foos",
10+
namespaced,
11+
)
12+
)]
13+
// ---
14+
#[derive(
15+
Clone, Debug, serde::Deserialize, serde::Serialize, schemars::JsonSchema, kube::CustomResource,
16+
)]
17+
pub struct FooSpec {
18+
#[versioned(
19+
added(since = "v1beta1"),
20+
changed(since = "v1", from_name = "bah", from_type = "u16")
21+
)]
22+
bar: usize,
23+
baz: bool,
24+
}

crates/stackable-versioned-macros/fixtures/inputs/k8s/skip.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@
1111
)
1212
)]
1313
// ---
14-
#[derive(Clone, Debug, serde::Deserialize, serde::Serialize, schemars::JsonSchema)]
14+
#[derive(
15+
Clone, Debug, serde::Deserialize, serde::Serialize, schemars::JsonSchema, kube::CustomResource,
16+
)]
1517
pub struct FooSpec {
1618
#[versioned(
1719
added(since = "v1beta1"),

crates/stackable-versioned-macros/fixtures/snapshots/[email protected]

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

crates/stackable-versioned-macros/fixtures/snapshots/stackable_versioned_macros__test__k8s_snapshots@crate_overrides.rs.snap

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

0 commit comments

Comments
 (0)