Skip to content

Commit 7b446a5

Browse files
authored
fix: pin Helm to <=3.17.0 (#7523)
* fix: pin helm * Revert "wip: temporary fix for node purpose (#7516)" This reverts commit 3459cfc.
1 parent bec1b4b commit 7b446a5

File tree

3 files changed

+25
-6
lines changed

3 files changed

+25
-6
lines changed

config/clusters/projectpythia-binder/binderhub.values.yaml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,14 +120,11 @@ binderhub-service:
120120
- binder.projectpythia.org
121121
dockerApi:
122122
nodeSelector:
123+
hub.jupyter.org/node-purpose:
123124
capi.stackhpc.com/node-group: user-m3-large
124125
storage:
125126
emptyDir:
126127
sizeLimit: 15Gi
127-
extraConfig:
128-
00-temp-fix-selector.py: |
129-
if isinstance(c.KubernetesBuildExecutor.node_selector, dict):
130-
c.KubernetesBuildExecutor.node_selector.pop("hub.jupyter.org/node-purpose", None)
131128
config:
132129
GitHubRepoProvider:
133130
allowed_specs:

flake.lock

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

flake.nix

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,22 @@
77
inputs = {
88
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
99
flake-utils.url = "github:numtide/flake-utils";
10+
nixpkgs-helm.url = "github:NixOS/nixpkgs/9b100cfb67ccb2ff6e723b78d4ae2f9c88654a1c";
1011
};
1112
outputs = {
1213
self,
1314
nixpkgs,
15+
nixpkgs-helm,
1416
flake-utils,
1517
}:
1618
flake-utils.lib.eachDefaultSystem (system: let
1719
pkgs = import nixpkgs {
1820
inherit system;
1921
config.allowUnfree = true;
2022
};
23+
pkgs-helm = import nixpkgs-helm {
24+
inherit system;
25+
};
2126
inherit (pkgs) lib;
2227

2328
gdk = pkgs.google-cloud-sdk.withExtraComponents (with pkgs.google-cloud-sdk.components; [
@@ -44,7 +49,7 @@
4449
# Infra packages
4550
age
4651
go-jsonnet
47-
kubernetes-helm
52+
pkgs-helm.kubernetes-helm
4853
kubectl
4954
sops
5055
gdk

0 commit comments

Comments
 (0)