Merge pull request #5 from xtruder/feat/k8s_specs_1_10_and_1_11

feat: add support for k8s 1.10 and 1.11
This commit is contained in:
Jaka Hudoklin 2018-12-06 00:59:29 +01:00 committed by GitHub
commit e63348ba97
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 175228 additions and 9 deletions

View file

@ -1,6 +1,2 @@
language: node_js language: nix
node_js: script: nix-build -A tests
- v5
- v4
- '0.12'
- '0.10'

View file

@ -98,8 +98,20 @@ let
}; };
in pkgs.writeText "resources.json" (builtins.toJSON hashedList); in pkgs.writeText "resources.json" (builtins.toJSON hashedList);
buildTest = test: version: buildResources {
configuration = {
require = [test {
config.kubernetes.version = version;
}];
};
};
in { in {
inherit buildResources; inherit buildResources;
test = buildResources { configuration = ./test/default.nix; }; tests."k8s-1_7" = buildTest ./test/default.nix "1.7";
tests."k8s-1_8" = buildTest ./test/default.nix "1.8";
tests."k8s-1_9" = buildTest ./test/default.nix "1.9";
tests."k8s-1_10" = buildTest ./test/default.nix "1.10";
tests."k8s-1_11" = buildTest ./test/default.nix "1.11";
} }

View file

@ -301,6 +301,8 @@ let
"1.7" = definitionsForKubernetesSpecs ./specs/1.7/swagger.json; "1.7" = definitionsForKubernetesSpecs ./specs/1.7/swagger.json;
"1.8" = definitionsForKubernetesSpecs ./specs/1.8/swagger.json; "1.8" = definitionsForKubernetesSpecs ./specs/1.8/swagger.json;
"1.9" = definitionsForKubernetesSpecs ./specs/1.9/swagger.json; "1.9" = definitionsForKubernetesSpecs ./specs/1.9/swagger.json;
"1.10" = definitionsForKubernetesSpecs ./specs/1.10/swagger.json;
"1.11" = definitionsForKubernetesSpecs ./specs/1.11/swagger.json;
}; };
versionOptions = { versionOptions = {
@ -313,6 +315,8 @@ let
}; };
"1.8" = versionDefinitions."1.8"; "1.8" = versionDefinitions."1.8";
"1.9" = versionDefinitions."1.9"; "1.9" = versionDefinitions."1.9";
"1.10" = versionDefinitions."1.10";
"1.11" = versionDefinitions."1.11";
}; };
defaultOptions = mapAttrs (name: value: mkOption { defaultOptions = mapAttrs (name: value: mkOption {

86851
specs/1.10/swagger.json Normal file

File diff suppressed because it is too large Load diff

88358
specs/1.11/swagger.json Normal file

File diff suppressed because it is too large Load diff

View file

@ -1,7 +1,5 @@
{ config, ... }: { config, ... }:
{ {
kubernetes.version = "1.9";
require = [./modules.nix ./deployment.nix]; require = [./modules.nix ./deployment.nix];
} }