Skip to content

Commit b7a2509

Browse files
authored
Merge branch 'release-1.x' into proxy-url-release-1.x
2 parents d02abae + 722b826 commit b7a2509

18 files changed

+164
-304
lines changed

.github/workflows/release.yml

Lines changed: 56 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,61 @@
11
name: Release
22

33
on:
4-
workflow_dispatch:
5-
inputs:
6-
releaseVersion:
7-
type: string
8-
required: true
9-
description: The version of this release. Must be a semantic version of the form X.Y.Z.
10-
dry_run:
11-
type: boolean
12-
required: true
13-
default: false
14-
description: Dry run, will not push branches or upload the artifacts.
15-
skip_tag:
16-
type: boolean
17-
required: true
18-
default: false
19-
description: If true, don't tag this release, just push it.
4+
workflow_dispatch:
5+
inputs:
6+
releaseVersion:
7+
type: string
8+
required: true
9+
description: The version of this release. Must be a semantic version of the form X.Y.Z.
10+
dry_run:
11+
type: boolean
12+
required: true
13+
default: false
14+
description: Dry run, will not push branches or upload the artifacts.
15+
skip_tag:
16+
type: boolean
17+
required: true
18+
default: false
19+
description: If true, don't tag this release, just push it.
20+
pre_release:
21+
type: boolean
22+
required: true
23+
default: false
24+
description: If true, mark this as a pre-release
2025

2126
jobs:
22-
release:
23-
runs-on: ubuntu-latest
24-
environment: production
25-
steps:
26-
- name: Checkout Javascript
27-
uses: actions/checkout@v4
28-
- name: Setup Node
29-
uses: actions/setup-node@v4
30-
with:
31-
node-version: '20'
32-
registry-url: 'https://registry.npmjs.org'
33-
- name: Install dependencies
34-
run: npm install
35-
- name: Package
36-
run: ./build-package.sh
37-
- name: Upload pre-release
38-
if: ${{ github.event.inputs.dry_run != 'true' }}
39-
run: npm publish --tag next
40-
env:
41-
NODE_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}
42-
- name: Tag release
43-
if: ${{ github.event.inputs.skip_tag != 'true' }}
44-
run: |
45-
git config --global user.name 'Github Bot'
46-
git config --global user.email '<>'
47-
git tag ${{ github.events.inputs.version }}
48-
- name: Push tag
49-
if: ${{ github.event.inputs.dry_run != 'true' }}
50-
run: |
51-
git push ${{ github.events.inputs.version }}
27+
release:
28+
runs-on: ubuntu-latest
29+
environment: production
30+
steps:
31+
- name: Checkout Javascript
32+
uses: actions/checkout@v4
33+
- name: Setup Node
34+
uses: actions/setup-node@v4
35+
with:
36+
node-version: '20'
37+
registry-url: 'https://registry.npmjs.org'
38+
- name: Install dependencies
39+
run: npm install
40+
- name: Package
41+
run: ./build-package.sh
42+
- name: Upload release
43+
if: ${{ github.event.inputs.dry_run != 'true' && github.event.inputs.pre_release != 'true' }}
44+
run: npm publish
45+
env:
46+
NODE_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}
47+
- name: Upload pre-release
48+
if: ${{ github.event.inputs.dry_run != 'true' && github.event.inputs.pre_release == 'true' }}
49+
run: npm publish --tag next
50+
env:
51+
NODE_AUTH_TOKEN: ${{ secrets.NPM_AUTH_TOKEN }}
52+
- name: Tag release
53+
if: ${{ github.event.inputs.skip_tag != 'true' }}
54+
run: |
55+
git config --global user.name 'Github Bot'
56+
git config --global user.email '<>'
57+
git tag ${{ github.events.inputs.version }}
58+
- name: Push tag
59+
if: ${{ github.event.inputs.dry_run != 'true' }}
60+
run: |
61+
git push ${{ github.events.inputs.version }}

CHANGELOG.md

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

package-lock.json

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

package.json

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@kubernetes/client-node",
3-
"version": "1.0.0-rc7",
3+
"version": "1.0.0",
44
"description": "NodeJS client for kubernetes",
55
"type": "module",
66
"repository": {
@@ -37,7 +37,8 @@
3737
"exclude": [
3838
"src/gen/*/**.ts",
3939
"src/index.ts",
40-
"src/*_test.ts"
40+
"src/*_test.ts",
41+
"src/test"
4142
],
4243
"extension": [
4344
".ts"
@@ -73,7 +74,6 @@
7374
"stream-buffers": "^3.0.2",
7475
"tar": "^7.0.0",
7576
"tmp-promise": "^3.0.2",
76-
"tslib": "^2.5.0",
7777
"ws": "^8.18.0"
7878
},
7979
"devDependencies": {
@@ -85,13 +85,11 @@
8585
"chai": "^5.1.2",
8686
"chai-as-promised": "^8.0.0",
8787
"husky": "^9.0.6",
88-
"jasmine": "^5.0.0",
8988
"mocha": "^11.0.1",
9089
"mock-fs": "^5.2.0",
9190
"nock": "^13.2.9",
9291
"prettier": "^3.0.0",
9392
"pretty-quick": "^4.0.0",
94-
"source-map-support": "^0.5.9",
9593
"ts-mockito": "^2.3.1",
9694
"tslint": "^6.1.3",
9795
"tsx": "^4.19.1",
@@ -114,7 +112,6 @@
114112
"arrowParens": "always"
115113
},
116114
"overrides": {
117-
"colors": "1.4.0",
118115
"whatwg-url@<12.0.1": "12.0.1"
119116
}
120117
}

src/attach_test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import WebSocket from 'isomorphic-ws';
33
import { ReadableStreamBuffer, WritableStreamBuffer } from 'stream-buffers';
44
import { anyFunction, anything, capture, instance, mock, verify, when } from 'ts-mockito';
55

6-
import { CallAwaiter, matchBuffer, ResizableWriteableStreamBuffer } from '../test';
6+
import { CallAwaiter, matchBuffer, ResizableWriteableStreamBuffer } from './test';
77
import { Attach } from './attach.js';
88
import { KubeConfig } from './config.js';
99
import { TerminalSize } from './terminal-size-queue.js';

0 commit comments

Comments
 (0)