Skip to content

Commit 380d1dc

Browse files
committed
try to renmae interweb to kubernetesjs name
1 parent 2cfe16a commit 380d1dc

27 files changed

+104
-105
lines changed

docs/kubernetesjs_design_doc.md

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,11 @@ kubernetesjs/
4040
#### 2. Ops CLI (`@kubernetesjs/ops-cli`)
4141
- **Purpose:** Higher‑level operational workflows (migrated from Interweb CLI)
4242
- **Commands:**
43-
- `kjs setup` – Initialize cluster with operators
44-
- `kjs deploy` – Deploy applications
45-
- `kjs status` – Cluster and app status
46-
- `kjs destroy` – Cleanup resources
47-
- `kjs scaffold` – Generate project templates
43+
- `k8sops setup` – Initialize cluster with operators
44+
- `k8sops deploy` – Deploy applications
45+
- `k8sops status` – Cluster and app status
46+
- `k8sops destroy` – Cleanup resources
47+
- `k8sops scaffold` – Generate project templates
4848

4949
#### 3. Client Package (`@kubernetesjs/client`)
5050
- **Purpose:** Enhanced kubernetesjs wrapper
@@ -78,9 +78,9 @@ kubernetesjs/
7878

7979
## Configuration Files
8080

81-
### 1. Cluster Setup Config (`kjs.setup.yaml`)
81+
### 1. Cluster Setup Config (`k8sops.setup.yaml`)
8282
```yaml
83-
apiVersion: kjs.dev/v1
83+
apiVersion: kubernetesjs.dev/v1
8484
kind: ClusterSetup
8585
metadata:
8686
name: dev-cluster
@@ -112,9 +112,9 @@ spec:
112112
domain: "127.0.0.1.nip.io" # Default for development
113113
```
114114
115-
### 2. Application Deploy Config (`kjs.deploy.yaml`)
115+
### 2. Application Deploy Config (`k8sops.deploy.yaml`)
116116
```yaml
117-
apiVersion: kjs.dev/v1
117+
apiVersion: kubernetesjs.dev/v1
118118
kind: Application
119119
metadata:
120120
name: postgres-api-app
@@ -270,12 +270,12 @@ spec:
270270
271271
### Current → KubernetesJS (ops-cli) Mapping
272272
273-
| Current Script | kjs Command | Configuration |
273+
| Current Script | k8sops Command | Configuration |
274274
|---|---|---|
275-
| `00-setup-cluster.sh` | `kjs setup --infrastructure` | `kjs.setup.yaml` (infrastructure section) |
276-
| `01-install-operators.sh` | `kjs setup --operators` | `kjs.setup.yaml` (operators section) |
277-
| `02-deploy-postgres.sh` | `kjs deploy --database` | `kjs.deploy.yaml` (database section) |
278-
| `03-deploy-knative-app.sh` | `kjs deploy --services` | `kjs.deploy.yaml` (services section) |
275+
| `00-setup-cluster.sh` | `k8sops setup --infrastructure` | `k8sops.setup.yaml` (infrastructure section) |
276+
| `01-install-operators.sh` | `k8sops setup --operators` | `k8sops.setup.yaml` (operators section) |
277+
| `02-deploy-postgres.sh` | `k8sops deploy --database` | `k8sops.deploy.yaml` (database section) |
278+
| `03-deploy-knative-app.sh` | `k8sops deploy --services` | `k8sops.deploy.yaml` (services section) |
279279
280280
### Migration Benefits
281281
1. **Declarative**: Configuration over imperative scripts
@@ -291,10 +291,10 @@ spec:
291291
k8s get pods -n default
292292
293293
# Ops CLI (higher-level workflows)
294-
kjs setup
295-
kjs deploy
296-
kjs status
297-
kjs destroy --confirm
294+
k8sops setup
295+
k8sops deploy
296+
k8sops status
297+
k8sops destroy --confirm
298298
```
299299

300300
## Next Steps

packages/client/__fixtures__/config/setup.cnpg-minio.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apiVersion: interweb.dev/v1
1+
apiVersion: kubernetesjs.dev/v1
22
kind: ClusterSetup
33
metadata:
44
name: interweb-data-plane

packages/client/__fixtures__/config/setup.config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apiVersion: interweb.dev/v1
1+
apiVersion: kubernetesjs.dev/v1
22
kind: ClusterSetup
33
metadata:
44
name: dev-cluster
Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apiVersion: interweb.dev/v1
1+
apiVersion: kubernetesjs.dev/v1
22
kind: ClusterSetup
33
metadata:
44
name: e2e-simple
@@ -8,4 +8,3 @@ spec:
88
networking:
99
ingressClass: nginx
1010
domain: example.test
11-

packages/client/__tests__/e2e/e2e.postgres.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ describe("Postgres deploy (CloudNativePG) end-to-end", () => {
3131

3232
// Configuration for CNPG operator installation
3333
const cfg: ClusterSetupConfig = {
34-
apiVersion: "interweb.dev/v1",
34+
apiVersion: "kubernetesjs.dev/v1",
3535
kind: "ClusterSetup",
3636
metadata: { name: "e2e-cnpg-install", namespace: "interweb-system" },
3737
spec: {
@@ -83,7 +83,7 @@ describe("Postgres deploy (CloudNativePG) end-to-end", () => {
8383
namespace: CNPG_NAMESPACE,
8484
} as OperatorConfig;
8585
const cfg: ClusterSetupConfig = {
86-
apiVersion: "interweb.dev/v1",
86+
apiVersion: "kubernetesjs.dev/v1",
8787
kind: "ClusterSetup",
8888
metadata: { name: "e2e-cnpg-install", namespace: "interweb-system" },
8989
spec: {

packages/client/__tests__/e2e/e2e.setup.operator.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ describe("SetupClient E2E (matrix): install operators", () => {
8383
const operators: OperatorConfig[] = resolvedNames.map(buildOperator);
8484

8585
const cfg: ClusterSetupConfig = {
86-
apiVersion: "interweb.dev/v1",
86+
apiVersion: "kubernetesjs.dev/v1",
8787
kind: "ClusterSetup",
8888
metadata: { name: `e2e-${requested[0]}`, namespace: "interweb-system" },
8989
spec: {

packages/client/__tests__/integration/apply.cert-manager.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ describe("SetupClient.installOperators integration", () => {
1212
};
1313

1414
const createConfig = (names: string[]): ClusterSetupConfig => ({
15-
apiVersion: "interweb.dev/v1",
15+
apiVersion: "kubernetesjs.dev/v1",
1616
kind: "ClusterSetup",
1717
metadata: { name: "test-cluster", namespace: "interweb-system" },
1818
spec: {

packages/client/__tests__/unit/config-loader.test.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ describe("ConfigLoader", () => {
2222
it("should return a valid default cluster setup configuration", () => {
2323
const config = ConfigLoader.getDefaultClusterSetup();
2424

25-
expect(config.apiVersion).toBe("interweb.dev/v1");
25+
expect(config.apiVersion).toBe("kubernetesjs.dev/v1");
2626
expect(config.kind).toBe("ClusterSetup");
2727
expect(config.metadata.name).toBe("dev-cluster");
2828
expect(config.spec.operators).toHaveLength(4);
@@ -58,7 +58,7 @@ describe("ConfigLoader", () => {
5858
describe("validation", () => {
5959
it("should throw error for invalid cluster setup config", () => {
6060
const invalidConfig = {
61-
apiVersion: "interweb.dev/v1",
61+
apiVersion: "kubernetesjs.dev/v1",
6262
kind: "ClusterSetup",
6363
metadata: {
6464
// Missing name

packages/client/src/client.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -749,7 +749,7 @@ export class Client {
749749
} else {
750750
// Generate sample application config
751751
const sampleAppConfig = {
752-
apiVersion: "interweb.dev/v1",
752+
apiVersion: "kubernetesjs.dev/v1",
753753
kind: "Application",
754754
metadata: {
755755
name: "sample-app",

packages/client/src/config-loader.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ export class ConfigLoader {
179179
*/
180180
static getDefaultClusterSetup(): ClusterSetupConfig {
181181
return {
182-
apiVersion: 'interweb.dev/v1',
182+
apiVersion: 'kubernetesjs.dev/v1',
183183
kind: 'ClusterSetup',
184184
metadata: {
185185
name: 'dev-cluster'

0 commit comments

Comments
 (0)