diff --git a/Cargo.lock b/Cargo.lock index db400255..5266e0a5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1644,7 +1644,7 @@ dependencies = [ [[package]] name = "k8s-version" version = "0.1.3" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.100.1#184423db7409f853bd69db7eeecd1affbf97ef40" +source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.100.3#d74c0ce53a12375876c489996c262f6037c099d2" dependencies = [ "darling", "regex", @@ -3365,7 +3365,7 @@ checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596" [[package]] name = "stackable-certs" version = "0.4.0" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.100.1#184423db7409f853bd69db7eeecd1affbf97ef40" +source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.100.3#d74c0ce53a12375876c489996c262f6037c099d2" dependencies = [ "const-oid", "ecdsa", @@ -3408,8 +3408,8 @@ dependencies = [ [[package]] name = "stackable-operator" -version = "0.100.1" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.100.1#184423db7409f853bd69db7eeecd1affbf97ef40" +version = "0.100.3" +source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.100.3#d74c0ce53a12375876c489996c262f6037c099d2" dependencies = [ "chrono", "clap", @@ -3434,7 +3434,7 @@ dependencies = [ "snafu 0.8.9", "stackable-operator-derive", "stackable-shared", - "stackable-telemetry 0.6.1 (git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.100.1)", + "stackable-telemetry 0.6.1 (git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.100.3)", "stackable-versioned", "stackable-webhook", "strum", @@ -3448,7 +3448,7 @@ dependencies = [ [[package]] name = "stackable-operator-derive" version = "0.3.1" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.100.1#184423db7409f853bd69db7eeecd1affbf97ef40" +source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.100.3#d74c0ce53a12375876c489996c262f6037c099d2" dependencies = [ "darling", "proc-macro2", @@ -3529,7 +3529,7 @@ dependencies = [ [[package]] name = "stackable-shared" version = "0.0.3" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.100.1#184423db7409f853bd69db7eeecd1affbf97ef40" +source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.100.3#d74c0ce53a12375876c489996c262f6037c099d2" dependencies = [ "chrono", "k8s-openapi", @@ -3546,7 +3546,7 @@ dependencies = [ [[package]] name = "stackable-telemetry" version = "0.6.1" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.100.1#184423db7409f853bd69db7eeecd1affbf97ef40" +source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.100.3#d74c0ce53a12375876c489996c262f6037c099d2" dependencies = [ "axum", "clap", @@ -3594,7 +3594,7 @@ dependencies = [ [[package]] name = "stackable-versioned" version = "0.8.3" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.100.1#184423db7409f853bd69db7eeecd1affbf97ef40" +source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.100.3#d74c0ce53a12375876c489996c262f6037c099d2" dependencies = [ "schemars", "serde", @@ -3607,7 +3607,7 @@ dependencies = [ [[package]] name = "stackable-versioned-macros" version = "0.8.3" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.100.1#184423db7409f853bd69db7eeecd1affbf97ef40" +source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.100.3#d74c0ce53a12375876c489996c262f6037c099d2" dependencies = [ "convert_case", "darling", @@ -3623,8 +3623,8 @@ dependencies = [ [[package]] name = "stackable-webhook" -version = "0.7.0" -source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.100.1#184423db7409f853bd69db7eeecd1affbf97ef40" +version = "0.7.1" +source = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.100.3#d74c0ce53a12375876c489996c262f6037c099d2" dependencies = [ "arc-swap", "axum", @@ -3640,7 +3640,7 @@ dependencies = [ "snafu 0.8.9", "stackable-certs", "stackable-shared", - "stackable-telemetry 0.6.1 (git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.100.1)", + "stackable-telemetry 0.6.1 (git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.100.3)", "tokio", "tokio-rustls", "tower", diff --git a/Cargo.nix b/Cargo.nix index 7d8107b9..0a890cd1 100644 --- a/Cargo.nix +++ b/Cargo.nix @@ -3517,15 +3517,15 @@ rec { }; resolvedDefaultFeatures = [ "std" ]; }; - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.100.1#stackable-telemetry@0.6.1" = rec { + "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.100.3#stackable-telemetry@0.6.1" = rec { crateName = "stackable-telemetry"; version = "0.6.1"; edition = "2024"; workspace_member = null; src = pkgs.fetchgit { url = "https://github.com/stackabletech/operator-rs.git"; - rev = "184423db7409f853bd69db7eeecd1affbf97ef40"; - sha256 = "1a98klljvifnc168f1wc3d6szcry1lamxgjjdq89plr99p4b953l"; + rev = "d74c0ce53a12375876c489996c262f6037c099d2"; + sha256 = "0w54yii3chcw18lkl3bm1ay504vf0m8ais8mrifzvas2vcxibbzb"; }; libName = "stackable_telemetry"; authors = [ @@ -5459,8 +5459,8 @@ rec { workspace_member = null; src = pkgs.fetchgit { url = "https://github.com/stackabletech/operator-rs.git"; - rev = "184423db7409f853bd69db7eeecd1affbf97ef40"; - sha256 = "1a98klljvifnc168f1wc3d6szcry1lamxgjjdq89plr99p4b953l"; + rev = "d74c0ce53a12375876c489996c262f6037c099d2"; + sha256 = "0w54yii3chcw18lkl3bm1ay504vf0m8ais8mrifzvas2vcxibbzb"; }; libName = "k8s_version"; authors = [ @@ -11456,8 +11456,8 @@ rec { workspace_member = null; src = pkgs.fetchgit { url = "https://github.com/stackabletech/operator-rs.git"; - rev = "184423db7409f853bd69db7eeecd1affbf97ef40"; - sha256 = "1a98klljvifnc168f1wc3d6szcry1lamxgjjdq89plr99p4b953l"; + rev = "d74c0ce53a12375876c489996c262f6037c099d2"; + sha256 = "0w54yii3chcw18lkl3bm1ay504vf0m8ais8mrifzvas2vcxibbzb"; }; libName = "stackable_certs"; authors = [ @@ -11637,13 +11637,13 @@ rec { }; "stackable-operator" = rec { crateName = "stackable-operator"; - version = "0.100.1"; + version = "0.100.3"; edition = "2024"; workspace_member = null; src = pkgs.fetchgit { url = "https://github.com/stackabletech/operator-rs.git"; - rev = "184423db7409f853bd69db7eeecd1affbf97ef40"; - sha256 = "1a98klljvifnc168f1wc3d6szcry1lamxgjjdq89plr99p4b953l"; + rev = "d74c0ce53a12375876c489996c262f6037c099d2"; + sha256 = "0w54yii3chcw18lkl3bm1ay504vf0m8ais8mrifzvas2vcxibbzb"; }; libName = "stackable_operator"; authors = [ @@ -11688,7 +11688,7 @@ rec { } { name = "stackable-telemetry"; - packageId = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.100.1#stackable-telemetry@0.6.1"; + packageId = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.100.3#stackable-telemetry@0.6.1"; optional = true; features = [ "clap" ]; } @@ -11816,8 +11816,8 @@ rec { workspace_member = null; src = pkgs.fetchgit { url = "https://github.com/stackabletech/operator-rs.git"; - rev = "184423db7409f853bd69db7eeecd1affbf97ef40"; - sha256 = "1a98klljvifnc168f1wc3d6szcry1lamxgjjdq89plr99p4b953l"; + rev = "d74c0ce53a12375876c489996c262f6037c099d2"; + sha256 = "0w54yii3chcw18lkl3bm1ay504vf0m8ais8mrifzvas2vcxibbzb"; }; procMacro = true; libName = "stackable_operator_derive"; @@ -12146,8 +12146,8 @@ rec { workspace_member = null; src = pkgs.fetchgit { url = "https://github.com/stackabletech/operator-rs.git"; - rev = "184423db7409f853bd69db7eeecd1affbf97ef40"; - sha256 = "1a98klljvifnc168f1wc3d6szcry1lamxgjjdq89plr99p4b953l"; + rev = "d74c0ce53a12375876c489996c262f6037c099d2"; + sha256 = "0w54yii3chcw18lkl3bm1ay504vf0m8ais8mrifzvas2vcxibbzb"; }; libName = "stackable_shared"; authors = [ @@ -12228,8 +12228,8 @@ rec { workspace_member = null; src = pkgs.fetchgit { url = "https://github.com/stackabletech/operator-rs.git"; - rev = "184423db7409f853bd69db7eeecd1affbf97ef40"; - sha256 = "1a98klljvifnc168f1wc3d6szcry1lamxgjjdq89plr99p4b953l"; + rev = "d74c0ce53a12375876c489996c262f6037c099d2"; + sha256 = "0w54yii3chcw18lkl3bm1ay504vf0m8ais8mrifzvas2vcxibbzb"; }; libName = "stackable_versioned"; authors = [ @@ -12272,8 +12272,8 @@ rec { workspace_member = null; src = pkgs.fetchgit { url = "https://github.com/stackabletech/operator-rs.git"; - rev = "184423db7409f853bd69db7eeecd1affbf97ef40"; - sha256 = "1a98klljvifnc168f1wc3d6szcry1lamxgjjdq89plr99p4b953l"; + rev = "d74c0ce53a12375876c489996c262f6037c099d2"; + sha256 = "0w54yii3chcw18lkl3bm1ay504vf0m8ais8mrifzvas2vcxibbzb"; }; procMacro = true; libName = "stackable_versioned_macros"; @@ -12331,13 +12331,13 @@ rec { }; "stackable-webhook" = rec { crateName = "stackable-webhook"; - version = "0.7.0"; + version = "0.7.1"; edition = "2024"; workspace_member = null; src = pkgs.fetchgit { url = "https://github.com/stackabletech/operator-rs.git"; - rev = "184423db7409f853bd69db7eeecd1affbf97ef40"; - sha256 = "1a98klljvifnc168f1wc3d6szcry1lamxgjjdq89plr99p4b953l"; + rev = "d74c0ce53a12375876c489996c262f6037c099d2"; + sha256 = "0w54yii3chcw18lkl3bm1ay504vf0m8ais8mrifzvas2vcxibbzb"; }; libName = "stackable_webhook"; authors = [ @@ -12359,7 +12359,7 @@ rec { } { name = "stackable-telemetry"; - packageId = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.100.1#stackable-telemetry@0.6.1"; + packageId = "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.100.3#stackable-telemetry@0.6.1"; } { name = "hyper"; diff --git a/Cargo.toml b/Cargo.toml index 22f9e7de..701c2290 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -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", "webhook"], tag = "stackable-operator-0.100.1" } +stackable-operator = { git = "https://github.com/stackabletech/operator-rs.git", features = ["time", "telemetry", "versioned", "webhook"], tag = "stackable-operator-0.100.3" } krb5 = { git = "https://github.com/stackabletech/krb5-rs.git", tag = "v0.1.0" } anyhow = "1.0" diff --git a/crate-hashes.json b/crate-hashes.json index fb762a1e..ac2c4653 100644 --- a/crate-hashes.json +++ b/crate-hashes.json @@ -1,15 +1,15 @@ { "git+https://github.com/stackabletech/krb5-rs.git?tag=v0.1.0#krb5-sys@0.1.0": "148zr0q04163hpirkrff5q7cbxqgwzzxh0091zr4g23x7l64jh39", "git+https://github.com/stackabletech/krb5-rs.git?tag=v0.1.0#krb5@0.1.0": "148zr0q04163hpirkrff5q7cbxqgwzzxh0091zr4g23x7l64jh39", - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.100.1#k8s-version@0.1.3": "1a98klljvifnc168f1wc3d6szcry1lamxgjjdq89plr99p4b953l", - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.100.1#stackable-certs@0.4.0": "1a98klljvifnc168f1wc3d6szcry1lamxgjjdq89plr99p4b953l", - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.100.1#stackable-operator-derive@0.3.1": "1a98klljvifnc168f1wc3d6szcry1lamxgjjdq89plr99p4b953l", - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.100.1#stackable-operator@0.100.1": "1a98klljvifnc168f1wc3d6szcry1lamxgjjdq89plr99p4b953l", - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.100.1#stackable-shared@0.0.3": "1a98klljvifnc168f1wc3d6szcry1lamxgjjdq89plr99p4b953l", - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.100.1#stackable-telemetry@0.6.1": "1a98klljvifnc168f1wc3d6szcry1lamxgjjdq89plr99p4b953l", - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.100.1#stackable-versioned-macros@0.8.3": "1a98klljvifnc168f1wc3d6szcry1lamxgjjdq89plr99p4b953l", - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.100.1#stackable-versioned@0.8.3": "1a98klljvifnc168f1wc3d6szcry1lamxgjjdq89plr99p4b953l", - "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.100.1#stackable-webhook@0.7.0": "1a98klljvifnc168f1wc3d6szcry1lamxgjjdq89plr99p4b953l", + "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.100.3#k8s-version@0.1.3": "0w54yii3chcw18lkl3bm1ay504vf0m8ais8mrifzvas2vcxibbzb", + "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.100.3#stackable-certs@0.4.0": "0w54yii3chcw18lkl3bm1ay504vf0m8ais8mrifzvas2vcxibbzb", + "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.100.3#stackable-operator-derive@0.3.1": "0w54yii3chcw18lkl3bm1ay504vf0m8ais8mrifzvas2vcxibbzb", + "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.100.3#stackable-operator@0.100.3": "0w54yii3chcw18lkl3bm1ay504vf0m8ais8mrifzvas2vcxibbzb", + "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.100.3#stackable-shared@0.0.3": "0w54yii3chcw18lkl3bm1ay504vf0m8ais8mrifzvas2vcxibbzb", + "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.100.3#stackable-telemetry@0.6.1": "0w54yii3chcw18lkl3bm1ay504vf0m8ais8mrifzvas2vcxibbzb", + "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.100.3#stackable-versioned-macros@0.8.3": "0w54yii3chcw18lkl3bm1ay504vf0m8ais8mrifzvas2vcxibbzb", + "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.100.3#stackable-versioned@0.8.3": "0w54yii3chcw18lkl3bm1ay504vf0m8ais8mrifzvas2vcxibbzb", + "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-operator-0.100.3#stackable-webhook@0.7.1": "0w54yii3chcw18lkl3bm1ay504vf0m8ais8mrifzvas2vcxibbzb", "git+https://github.com/stackabletech/operator-rs.git?tag=stackable-telemetry-0.6.1#stackable-telemetry@0.6.1": "0hiymhr40ix4jv9dmvp5d009xs6v0frvllr2xkf5mw43rcg44mgd", "git+https://github.com/stackabletech/product-config.git?tag=0.8.0#product-config@0.8.0": "1dz70kapm2wdqcr7ndyjji0lhsl98bsq95gnb2lw487wf6yr7987" } \ No newline at end of file diff --git a/default.nix b/default.nix index 071adcb2..e467de8e 100644 --- a/default.nix +++ b/default.nix @@ -5,7 +5,7 @@ # on Darwin (macOS), but doesn't seem to actually be necessary beyond # production hardening. fakeroot = - if self.buildPlatform.isDarwin then + if self.stdenv.buildPlatform.isDarwin then self.writeScriptBin "fakeroot" ''exec "$@"'' else super.fakeroot; @@ -14,7 +14,7 @@ # (non-Nix build tools like Tilt, as well as the container composition scripts) , pkgsLocal ? import nixpkgs { inherit overlays; } # Default to building for the local CPU architecture -, targetArch ? pkgsLocal.hostPlatform.linuxArch +, targetArch ? pkgsLocal.stdenv.hostPlatform.linuxArch , targetSystem ? "${targetArch}-unknown-linux-gnu" , pkgsTarget ? import nixpkgs { inherit overlays; diff --git a/nix/sources.json b/nix/sources.json index 1b5af204..f79c2cf0 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -29,10 +29,10 @@ "homepage": "", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9b008d60392981ad674e04016d25619281550a9d", - "sha256": "1pxnwzrwcgasascapd6f0l8ricv6dgads3rgz2m45hyny80720cs", + "rev": "a7fc11be66bdfb5cdde611ee5ce381c183da8386", + "sha256": "0h3gvjbrlkvxhbxpy01n603ixv0pjy19n9kf73rdkchdvqcn70j2", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/9b008d60392981ad674e04016d25619281550a9d.tar.gz", + "url": "https://github.com/NixOS/nixpkgs/archive/a7fc11be66bdfb5cdde611ee5ce381c183da8386.tar.gz", "url_template": "https://github.com///archive/.tar.gz" } }