Skip to content

Commit 262c7bf

Browse files
chore: Generated commit to update templated files since the last template run up to stackabletech/operator-templating@0fd2a1f (#748)
Reference-to: stackabletech/operator-templating@0fd2a1f (Rollout CRD versioning related changes and Nix fix)
1 parent a5b3abd commit 262c7bf

8 files changed

Lines changed: 30 additions & 11 deletions

File tree

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ result
1313
image.tar
1414

1515
tilt_options.json
16+
.values.yaml
1617

1718
.direnv/
1819
.direnvrc

Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ compile-chart: version crds config
3232

3333
chart-clean:
3434
rm -rf "deploy/helm/${OPERATOR_NAME}/configs"
35+
rm -rf "deploy/helm/${OPERATOR_NAME}/crds"
3536

3637
version:
3738
cat "deploy/helm/${OPERATOR_NAME}/Chart.yaml" | yq ".version = \"${VERSION}\" | .appVersion = \"${VERSION}\"" > "deploy/helm/${OPERATOR_NAME}/Chart.yaml.new"
@@ -43,8 +44,8 @@ config:
4344
cp -r deploy/config-spec/* "deploy/helm/${OPERATOR_NAME}/configs";\
4445
fi
4546

46-
## N.B. diverges from templating for operators that have CRD-versioning
47-
## implemented. @adwk67: Do *not* let this be overridden with templating!
47+
# We generate a crds.yaml, so that the effect of code changes are visible.
48+
# The operator will take care of the CRD rollout itself.
4849
crds:
4950
mkdir -p extra
5051
cargo run --bin stackable-"${OPERATOR_NAME}" -- crd > extra/crds.yaml

Tiltfile

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ helm_values = settings.get('helm_values', None)
3030

3131
helm_override_image_repository = 'image.repository=' + registry + '/' + operator_name
3232

33-
# N.B. diverges from templating for operators that have CRD-versioning
34-
# implemented. @adwk67: Do *not* let this be overridden with templating!
3533
k8s_yaml(helm(
3634
'deploy/helm/' + operator_name,
3735
name=operator_name,
@@ -40,4 +38,4 @@ k8s_yaml(helm(
4038
helm_override_image_repository,
4139
],
4240
values=helm_values,
43-
) )
41+
))

deny.toml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,20 @@ ignore = [
2424
#
2525
# https://github.com/RustCrypto/RSA/issues/19 is the tracking issue
2626
"RUSTSEC-2023-0071",
27+
28+
# https://rustsec.org/advisories/RUSTSEC-2024-0436
29+
# The "paste" crate is no longer maintained because the owner states that the implementation is
30+
# finished. There are at least two (forked) alternatives which state to be maintained. They'd
31+
# need to be vetted before a potential switch. Additionally, they'd need to be in a maintained
32+
# state for a couple of years to provide any benefit over using "paste".
33+
#
34+
# This crate is only used in a single place in the xtask package inside the declarative
35+
# "write_crd" macro. The impact of vulnerabilities, if any, should be fairly minimal.
36+
#
37+
# See thread: https://users.rust-lang.org/t/paste-alternatives/126787/4
38+
#
39+
# This can only be removed again if we decide to use a different crate.
40+
"RUSTSEC-2024-0436",
2741
]
2842

2943
[bans]
@@ -67,6 +81,9 @@ license-files = [
6781
[sources]
6882
unknown-registry = "deny"
6983
unknown-git = "deny"
84+
allow-git = [
85+
"https://github.com/kube-rs/kube-rs",
86+
]
7087

7188
[sources.allow-org]
7289
github = ["stackabletech"]

deploy/helm/airflow-operator/templates/deployment.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ spec:
8181
- name: KUBERNETES_CLUSTER_DOMAIN
8282
value: {{ .Values.kubernetesClusterDomain | quote }}
8383
{{- end }}
84+
8485
{{- include "telemetry.envVars" . | nindent 12 }}
8586
{{- include "maintenance.envVars" . | nindent 12 }}
8687
volumes:

deploy/helm/airflow-operator/templates/service.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
12
---
23
apiVersion: v1
34
kind: Service

nix/sources.json

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

shell.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@ in pkgs.mkShell rec {
2121
];
2222

2323
# derivation runtime dependencies
24-
buildInputs = pkgs.lib.concatMap (crate: crate.buildInputs) cargoDependencySet;
24+
buildInputs = pkgs.lib.unique (pkgs.lib.concatMap (crate: crate.buildInputs) cargoDependencySet);
2525

2626
# build time dependencies
27-
nativeBuildInputs = pkgs.lib.concatMap (crate: crate.nativeBuildInputs) cargoDependencySet ++ (with pkgs; [
27+
nativeBuildInputs = pkgs.lib.unique (pkgs.lib.concatMap (crate: crate.nativeBuildInputs) cargoDependencySet ++ (with pkgs; [
2828
beku
2929
docker
3030
gettext # for the proper envsubst
@@ -38,7 +38,7 @@ in pkgs.mkShell rec {
3838
# tilt already defined in default.nix
3939
which
4040
yq-go
41-
]);
41+
]));
4242

4343
LIBCLANG_PATH = "${pkgs.libclang.lib}/lib";
4444
BINDGEN_EXTRA_CLANG_ARGS = "-I${pkgs.glibc.dev}/include -I${pkgs.clang}/resource-root/include";

0 commit comments

Comments
 (0)