Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Some improvements for the overall project layout (see #3) #4

Merged
merged 1 commit into from
Jan 15, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
tmp/
dist
node_modules
85 changes: 58 additions & 27 deletions node/package-lock.json → node-client/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 1 addition & 3 deletions node/package.json → node-client/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,16 @@
"scripts": {
"clean": "rm -Rf node_modules/ dist/",
"build": "tsc",
"test": "mocha -r ts-node/register *_test.ts"
"test": "mocha -r ts-node/register src/**/*_test.ts"
},
"author": "Kubernetes Authors",
"license": "Apache-2.0",
"dependencies": {
"base-64": "^0.1.0",
"bluebird": "^3.3.5",
"byline": "^5.0.0",
"chai": "^4.1.0",
"js-yaml": "^3.5.2",
"jsonpath": "^0.2.11",
"mocha": "^3.4.2",
"request": "^2.72.0",
"shelljs": "^0.7.8 ",
"underscore": "^1.8.3",
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion node/attach.ts → node-client/src/attach.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import querystring = require('querystring');
import stream = require('stream');

import { WebSocketHandler } from './web-socket-handler';
import { KubeConfig } from '@kubernetes/client-node';
import { KubeConfig } from './config';

export class Attach {
'handler': WebSocketHandler;
Expand Down
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion node/config_test.ts → node-client/src/config_test.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { KubeConfig, Config } from './config';
import { expect } from 'chai';
import { describe, it } from 'jasmine';
import 'mocha';

const kcFileName = "testdata/kubeconfig.yaml";

Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion node/exec.ts → node-client/src/exec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import querystring = require('querystring');
import stream = require('stream');

import { WebSocketHandler } from './web-socket-handler';
import { KubeConfig } from '@kubernetes/client-node';
import { KubeConfig } from './config';

export class Exec {
'handler': WebSocketHandler;
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion node/watch.ts → node-client/src/watch.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import request = require('request');
import { LineStream } from 'byline';
import { KubeConfig } from '@kubernetes/client-node';
import { KubeConfig } from './config';

export class Watch {
'config': KubeConfig;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import stream = require('stream');

import ws = require('websocket');
import { KubeConfig } from '@kubernetes/client-node';
import { V1Status } from '@kubernetes/client-node';
import { KubeConfig } from './config';
import { V1Status } from './api';


const protocols = [
"v4.channel.k8s.io",
Expand Down
File renamed without changes.