From 7d6dba4bd3034c24b61e37307c53be6f00927103 Mon Sep 17 00:00:00 2001 From: Vincent Demeester Date: Wed, 20 Dec 2023 12:03:57 +0100 Subject: [PATCH 1/2] Switch `.envrc` to use_flake Signed-off-by: Vincent Demeester --- .envrc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.envrc b/.envrc index 5eed2ee..7e7017b 100644 --- a/.envrc +++ b/.envrc @@ -1,3 +1,3 @@ -# use flake # test -f .secrets && source .secrets || echo "no secrets" -eval "$(lorri direnv)" +use_flake + From 586056f24a183c6e79fd61fe928a26c2f17adb10 Mon Sep 17 00:00:00 2001 From: Vincent Demeester Date: Wed, 20 Dec 2023 12:06:55 +0100 Subject: [PATCH 2/2] Add operator-sdk 1.33 Signed-off-by: Vincent Demeester --- overlays/openshift.nix | 1 + packages/operator-sdk.nix | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/overlays/openshift.nix b/overlays/openshift.nix index 176d8ca..edd4d8c 100644 --- a/overlays/openshift.nix +++ b/overlays/openshift.nix @@ -53,6 +53,7 @@ in # Operator SDK inherit (super.callPackage ../packages/operator-sdk.nix { }) operator-sdk_1 + operator-sdk_1_33 operator-sdk_1_32 operator-sdk_1_31 operator-sdk_1_30 diff --git a/packages/operator-sdk.nix b/packages/operator-sdk.nix index b427fad..6c55a33 100644 --- a/packages/operator-sdk.nix +++ b/packages/operator-sdk.nix @@ -119,6 +119,12 @@ rec { sha256 = "sha256-sWnHx9IKwr6um9YlrF2ULQ7HZo0TNC4MpWHTVpmWqFs="; vendorHash = "sha256-Gl0LUlMLeku2B5DkWpzeoXfMLb/OnOx4Urw4RF4cuTQ="; }; - operator-sdk_1 = operator-sdk_1_32; + operator-sdk_1_33 = makeOverridable operatorSdkGen { + version = "1.33.0"; + k8sVersion = "1.27"; + sha256 = "sha256-Q8G/B9apvjvW45WSPXHSn6e5mZSsahNl6ymfguOeSa0="; + vendorHash = "sha256-WoebO6RDwDyflXwHTJxRLAyNpmic2gahIaLO/i6Q1cc="; + }; + operator-sdk_1 = operator-sdk_1_33; operator-sdk = operator-sdk_1; }