Skip to content
Open
Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
dd0c321
feat: Introduce CRD versioning
sbernauer Aug 22, 2025
fae2648
Merge remote-tracking branch 'origin/main' into feat/crd-versioning
sbernauer Sep 2, 2025
3bc0563
Add SecretClass and TrustStore to conversion webhook
sbernauer Sep 2, 2025
ffcc13d
Remove testing Person struct
sbernauer Sep 2, 2025
82138a5
temp: Temporarily patch stackable-operator
Techassi Sep 5, 2025
781bdb5
chore: Handle CRD management CLI flag
Techassi Sep 5, 2025
bb3f331
feat: Add v1alpha2, rename experimentalGenerateSamAccountName
Techassi Sep 5, 2025
f6088b7
chore: Add rendered CRD
Techassi Sep 5, 2025
5b29a38
chore: Enable trace console logging in Tiltfile
Techassi Sep 5, 2025
b6ac8a1
chore: Remove commented-out macro argument
Techassi Sep 5, 2025
5935ac1
chore: Separate SecretClass and TrustStore specs
Techassi Sep 5, 2025
aaa53f3
chore: Merge branch 'main' into feat/crd-versioning
Techassi Sep 9, 2025
2c40510
chore: Move generated CRDs into folder
Techassi Sep 9, 2025
2ea2060
chore: Use main branch for stackable-operator
Techassi Sep 9, 2025
0f9fa29
docs: Fix TrustStore reference
Techassi Sep 9, 2025
c532029
chore: Use single try_join!
Techassi Sep 9, 2025
3e7f87a
chore: Use default socket address constant
Techassi Sep 9, 2025
29ccbdf
Use op-rs 0.97.0
sbernauer Sep 16, 2025
09cbad6
nix
sbernauer Sep 16, 2025
8098b86
Merge remote-tracking branch 'origin/main' into feat/crd-versioning
sbernauer Sep 16, 2025
4a0c0b8
feat: Add simple CR applier
Techassi Oct 1, 2025
5c54a30
chore: Update CRD schema descriptions
Techassi Oct 1, 2025
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
450 changes: 437 additions & 13 deletions Cargo.lock

Large diffs are not rendered by default.

1,746 changes: 1,652 additions & 94 deletions Cargo.nix

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ edition = "2021"
repository = "https://github.com/stackabletech/secret-operator"

[workspace.dependencies]
stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", features = ["time", "telemetry", "versioned"], tag = "stackable-operator-0.96.0" }
stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", features = ["time", "telemetry", "versioned", "webhook"], tag = "stackable-operator-0.96.0" }
krb5 = { git = "https://github.com/stackabletech/krb5-rs.git", tag = "v0.1.0" }

anyhow = "1.0"
Expand Down Expand Up @@ -54,4 +54,4 @@ yasna = "0.5"

[patch."https://github.com/stackabletech/operator-rs.git"]
# stackable-operator = { path = "../operator-rs/crates/stackable-operator" }
# stackable-operator = { git = "https://github.com/stackabletech//operator-rs.git", branch = "main" }
stackable-operator = { git = "https://github.com/stackabletech//operator-rs.git", branch = "feat/stackable-versioned-hint-wrapped" }
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,6 @@ compile-chart: version crds config

chart-clean:
rm -rf "deploy/helm/${OPERATOR_NAME}/configs"
rm -rf "deploy/helm/${OPERATOR_NAME}/crds"

version:
cat "deploy/helm/${OPERATOR_NAME}/Chart.yaml" | yq ".version = \"${VERSION}\" | .appVersion = \"${VERSION}\"" > "deploy/helm/${OPERATOR_NAME}/Chart.yaml.new"
Expand All @@ -117,9 +116,10 @@ config:
cp -r deploy/config-spec/* "deploy/helm/${OPERATOR_NAME}/configs";\
fi

# We generate a crds.yaml, so that the effect of code changes are visible.
# The operator will take care of the CRD rollout itself.
crds:
mkdir -p deploy/helm/"${OPERATOR_NAME}"/crds
cargo run --bin stackable-"${OPERATOR_NAME}" -- crd | yq eval '.metadata.annotations["helm.sh/resource-policy"]="keep"' - > "deploy/helm/${OPERATOR_NAME}/crds/crds.yaml"
cargo run --bin stackable-"${OPERATOR_NAME}" -- crd > crds.yaml

chart-lint: compile-chart
docker run -it -v $(shell pwd):/build/helm-charts -w /build/helm-charts quay.io/helmpack/chart-testing:v3.5.0 ct lint --config deploy/helm/ct.yaml
Expand Down
28 changes: 9 additions & 19 deletions Tiltfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,27 +17,17 @@ custom_build(
outputs_image_ref_to='result/ref',
)

# Load the latest CRDs from Nix
watch_file('result')
if os.path.exists('result'):
k8s_yaml('result/crds.yaml')

# We need to set the correct image annotation on the operator Deployment to use e.g.
# oci.stackable.tech/sandbox/opa-operator:7y19m3d8clwxlv34v5q2x4p7v536s00g instead of
# oci.stackable.tech/sandbox/opa-operator:0.0.0-dev (which does not exist)
k8s_kind('Deployment', image_json_path='{.spec.template.metadata.annotations.internal\\.stackable\\.tech/image}')

# Exclude stale CRDs from Helm chart, and apply the rest
helm_crds, helm_non_crds = filter_yaml(
helm(
'deploy/helm/' + operator_name,
name=operator_name,
namespace="stackable-operators",
set=[
'image.repository=' + registry + '/' + operator_name,
],
),
api_version = "^apiextensions\\.k8s\\.io/.*$",
kind = "^CustomResourceDefinition$",
)
k8s_yaml(helm_non_crds)
k8s_yaml(helm(
'deploy/helm/' + operator_name,
name=operator_name,
namespace="stackable-operators",
set=[
'image.repository=' + registry + '/' + operator_name,
'telemetry.consoleLog.level=trace,h2=off',
],
))
Comment on lines 25 to 33
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also needs to be upstreamed into operator-templating.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Added a comment in the PR description about this

16 changes: 9 additions & 7 deletions crate-hashes.json

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

Loading