Skip to content

Commit 8bd6f99

Browse files
committed
adapter-k8s, remove old adapters package
1 parent c348536 commit 8bd6f99

33 files changed

+2494
-3985
lines changed

package-lock.json

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

packages/adapter-docker/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
},
3333
"devDependencies": {
3434
"@scramjet/types": "^0.34.4",
35+
"@types/dockerode": "<=3.3.3",
3536
"@types/js-yaml": "4.0.5",
3637
"@types/node": "15.12.5",
3738
"@types/request": "2.48.8",
File renamed without changes.
File renamed without changes.
File renamed without changes.

packages/adapters/package.json renamed to packages/adapter-k8s/package.json

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "@scramjet/adapters",
2+
"name": "@scramjet/adapter-k8s",
33
"version": "0.34.4",
44
"description": "This package is part of Scramjet Transform Hub. This module holds the docker adapters utilized by Scramjet Transform Hub",
55
"main": "./src/index.ts",
@@ -15,7 +15,6 @@
1515
"author": "Scramjet <[email protected]>",
1616
"license": "AGPL-3.0",
1717
"dependencies": {
18-
"@kubernetes/client-node": "^0.17.1",
1918
"@scramjet/model": "^0.34.4",
2019
"@scramjet/obj-logger": "^0.34.4",
2120
"@scramjet/pre-runner": "^0.34.4",
@@ -24,15 +23,15 @@
2423
"@scramjet/sth-config": "^0.34.4",
2524
"@scramjet/symbols": "^0.34.4",
2625
"@scramjet/utility": "^0.34.4",
27-
"dockerode": "^3.3.4",
26+
"@scramjet/adapters-utils": "^0.34.4",
27+
"@kubernetes/client-node": "^0.17.1",
2828
"scramjet": "^4.36.9",
2929
"shell-escape": "^0.2.0",
3030
"systeminformation": "^5.12.7",
3131
"ts.data.json": "^2.2.0"
3232
},
3333
"devDependencies": {
3434
"@scramjet/types": "^0.34.4",
35-
"@types/dockerode": "<=3.3.3",
3635
"@types/js-yaml": "4.0.5",
3736
"@types/node": "15.12.5",
3837
"@types/request": "2.48.8",

packages/adapter-k8s/src/index.ts

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
/**
2+
* Adapter module must provide SequenceAdapter, InstanceAdapter classes, init method and name field.
3+
*/
4+
export { KubernetesSequenceAdapter as SequenceAdapter } from "./kubernetes-sequence-adapter";
5+
export { KubernetesInstanceAdapter as InstanceAdapter } from "./kubernetes-instance-adapter";
6+
7+
export const init = (..._args: any[]) => {
8+
return true;
9+
};
10+
11+
export const name = "kubernetes";

packages/adapters/src/kubernetes-instance-adapter.ts renamed to packages/adapter-k8s/src/kubernetes-instance-adapter.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import { ObjLogger } from "@scramjet/obj-logger";
1717
import { createReadStream } from "fs";
1818
import { KubernetesClientAdapter } from "./kubernetes-client-adapter";
1919
import { adapterConfigDecoder } from "./kubernetes-config-decoder";
20-
import { getRunnerEnvEntries } from "./get-runner-env";
20+
import { getRunnerEnvEntries } from "@scramjet/adapters-utils";
2121
import { PassThrough } from "stream";
2222
import { RunnerExitCode } from "@scramjet/symbols";
2323

packages/adapters/src/kubernetes-sequence-adapter.ts renamed to packages/adapter-k8s/src/kubernetes-sequence-adapter.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,8 @@ import fs from "fs/promises";
1313
import path from "path";
1414
import { exec } from "child_process";
1515
import { isDefined, readStreamedJSON } from "@scramjet/utility";
16-
import { sequencePackageJSONDecoder } from "./validate-sequence-package-json";
16+
import { detectLanguage, sequencePackageJSONDecoder } from "@scramjet/adapters-utils";
1717
import { adapterConfigDecoder } from "./kubernetes-config-decoder";
18-
import { detectLanguage } from "./utils";
1918

2019
/**
2120
* Returns existing Sequence configuration.

packages/adapters/src/readme.mtpl renamed to packages/adapter-k8s/src/readme.mtpl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
# Scramjet Transform Hub Adapters
22

3-
This module holds two types of adapters utilized by Scramjet Transform Hub: Instance Adapter and Sequence Adapter. These Adapters allows for running the Sequence identification and Instance execution in two basic modes: as a non containerized standalone processes or in a Docker container.
3+
This module holds two types of adapters utilized by Scramjet Transform Hub: Instance Adapter and Sequence Adapter. These Adapters allows for running the Sequence identification and Instance execution in standalone processes.
44

55
The adapter provides two main exports:
66

7-
* [DockerSequenceAdapter](./src/docker-sequence-adapter.ts) - An adapter for preparing Sequence to be run in Docker container.
8-
* [DockerInstanceAdapter](./src/docker-instance-adapter.ts) - An adapter for running Instance by Runner executed in Docker container.
7+
* [SequenceAdapter](./src/process-sequence-adapter.ts) - An adapter for preparing Sequence to be run in subprocess.
8+
* [InstanceAdapter](./src/process-instance-adapter.ts) - An adapter for running Instance by Runner executed in subprocess.
99

1010
## Docs
1111

File renamed without changes.

packages/adapters/src/docker-instance-adapter.ts

Lines changed: 0 additions & 285 deletions
This file was deleted.

0 commit comments

Comments
 (0)