Skip to content

Commit 6a7fb74

Browse files
authored
fix: Force apply CRDs (#653)
* fix: Force apply CRDs * fix(nix): Fix the default.nix file These changes are included in stackabletech/operator-templating#557 which will be rolled out at a later point in time. For now, the fixes are included to make this PR completely testable and deployable.
1 parent 5ce8bea commit 6a7fb74

File tree

6 files changed

+51
-51
lines changed

6 files changed

+51
-51
lines changed

Cargo.lock

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

Cargo.nix

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

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ edition = "2021"
1111
repository = "https://github.com/stackabletech/secret-operator"
1212

1313
[workspace.dependencies]
14-
stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", features = ["time", "telemetry", "versioned", "webhook"], tag = "stackable-operator-0.100.1" }
14+
stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", features = ["time", "telemetry", "versioned", "webhook"], tag = "stackable-operator-0.100.3" }
1515
krb5 = { git = "https://github.com/stackabletech/krb5-rs.git", tag = "v0.1.0" }
1616

1717
anyhow = "1.0"

crate-hashes.json

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

default.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# on Darwin (macOS), but doesn't seem to actually be necessary beyond
66
# production hardening.
77
fakeroot =
8-
if self.buildPlatform.isDarwin then
8+
if self.stdenv.buildPlatform.isDarwin then
99
self.writeScriptBin "fakeroot" ''exec "$@"''
1010
else
1111
super.fakeroot;
@@ -14,7 +14,7 @@
1414
# (non-Nix build tools like Tilt, as well as the container composition scripts)
1515
, pkgsLocal ? import nixpkgs { inherit overlays; }
1616
# Default to building for the local CPU architecture
17-
, targetArch ? pkgsLocal.hostPlatform.linuxArch
17+
, targetArch ? pkgsLocal.stdenv.hostPlatform.linuxArch
1818
, targetSystem ? "${targetArch}-unknown-linux-gnu"
1919
, pkgsTarget ? import nixpkgs {
2020
inherit overlays;

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.

0 commit comments

Comments
 (0)