From 6c60bd3c680efdca398c30e8e5693d612db73a66 Mon Sep 17 00:00:00 2001
From: Elad Ben-Israel <eladb@monada.co>
Date: Sun, 4 Aug 2024 22:28:55 +0300
Subject: [PATCH] fix(k8s): remove `chart-app-` prefix from resource names

---
 k8s/examples/nodejs.main.w.snap | 18 +++++++++---------
 k8s/examples/ubuntu.main.w.snap |  6 +++---
 k8s/lib/index.js                |  4 ++--
 k8s/package-lock.json           |  4 ++--
 k8s/package.json                |  2 +-
 k8s/root.test.w                 |  2 +-
 6 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/k8s/examples/nodejs.main.w.snap b/k8s/examples/nodejs.main.w.snap
index ff68e8b9..ff01459a 100644
--- a/k8s/examples/nodejs.main.w.snap
+++ b/k8s/examples/nodejs.main.w.snap
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: chart-app-configmap-c85bc1e0
+  name: configmap-c870426f
 data:
   index.js: console.log("hello, k8s");
 immutable: false
@@ -9,14 +9,14 @@ immutable: false
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: chart-app-deployment-c843205c
+  name: deployment-c87ec702
 spec:
   minReadySeconds: 0
   progressDeadlineSeconds: 600
   replicas: 3
   selector:
     matchLabels:
-      cdk8s.io/metadata.addr: Chart-App-Deployment-c84d7818
+      cdk8s.io/metadata.addr: Deployment-c8c1f37c
   strategy:
     rollingUpdate:
       maxSurge: 25%
@@ -25,7 +25,7 @@ spec:
   template:
     metadata:
       labels:
-        cdk8s.io/metadata.addr: Chart-App-Deployment-c84d7818
+        cdk8s.io/metadata.addr: Deployment-c8c1f37c
     spec:
       automountServiceAccountToken: false
       containers:
@@ -56,7 +56,7 @@ spec:
               port: 80
           volumeMounts:
             - mountPath: /var/lib/app
-              name: configmap-chart-app-configmap-c85bc1e0
+              name: configmap-configmap-c870426f
           workingDir: /var/lib/app
       dnsPolicy: ClusterFirst
       hostNetwork: false
@@ -68,18 +68,18 @@ spec:
       terminationGracePeriodSeconds: 30
       volumes:
         - configMap:
-            name: chart-app-configmap-c85bc1e0
-          name: configmap-chart-app-configmap-c85bc1e0
+            name: configmap-c870426f
+          name: configmap-configmap-c870426f
 ---
 apiVersion: v1
 kind: Service
 metadata:
-  name: chart-app-deployment-service-c857421f
+  name: deployment-service-c8f11c8e
 spec:
   externalIPs: []
   ports:
     - port: 80
       targetPort: 80
   selector:
-    cdk8s.io/metadata.addr: Chart-App-Deployment-c84d7818
+    cdk8s.io/metadata.addr: Deployment-c8c1f37c
   type: LoadBalancer
diff --git a/k8s/examples/ubuntu.main.w.snap b/k8s/examples/ubuntu.main.w.snap
index 8128d5ee..67fd9561 100644
--- a/k8s/examples/ubuntu.main.w.snap
+++ b/k8s/examples/ubuntu.main.w.snap
@@ -1,14 +1,14 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: chart-app-deployment-c843205c
+  name: deployment-c87ec702
 spec:
   minReadySeconds: 0
   progressDeadlineSeconds: 600
   replicas: 3
   selector:
     matchLabels:
-      cdk8s.io/metadata.addr: Chart-App-Deployment-c84d7818
+      cdk8s.io/metadata.addr: Deployment-c8c1f37c
   strategy:
     rollingUpdate:
       maxSurge: 25%
@@ -17,7 +17,7 @@ spec:
   template:
     metadata:
       labels:
-        cdk8s.io/metadata.addr: Chart-App-Deployment-c84d7818
+        cdk8s.io/metadata.addr: Deployment-c8c1f37c
     spec:
       automountServiceAccountToken: false
       containers:
diff --git a/k8s/lib/index.js b/k8s/lib/index.js
index dc4454b3..2af865af 100644
--- a/k8s/lib/index.js
+++ b/k8s/lib/index.js
@@ -9,14 +9,14 @@ exports.Platform = class {
 
     const labels = process.env.WING_K8S_LABELS ? JSON.parse(process.env.WING_K8S_LABELS) : {};
     const namespace = process.env.WING_K8S_NAMESPACE;
-    const chart = new cdk8s.Chart(app, "Chart", { labels, namespace });
+    const chart = new cdk8s.Chart(app, "Default", { labels, namespace });
 
     class App extends core.App {
       _target = "cdk8s";
       outdir = props.outdir;
 
       constructor() {
-        super(chart, "App", props);
+        super(chart, "Default", props);
 
         const root = this.node.root;
         root.new = (fqn, ctor, scope, id, ...args) => this.new(fqn, ctor, scope, id, ...args);
diff --git a/k8s/package-lock.json b/k8s/package-lock.json
index 1e1720f6..81c0028d 100644
--- a/k8s/package-lock.json
+++ b/k8s/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@winglibs/k8s",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@winglibs/k8s",
-      "version": "0.0.6",
+      "version": "0.0.7",
       "license": "MIT",
       "devDependencies": {
         "cdk8s-plus-27": "^2.9.0"
diff --git a/k8s/package.json b/k8s/package.json
index 69dab0ae..c7865732 100644
--- a/k8s/package.json
+++ b/k8s/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@winglibs/k8s",
   "description": "Wing for Kubernetes",
-  "version": "0.0.7",
+  "version": "0.0.8",
   "author": {
     "name": "Elad Ben-Israel",
     "email": "eladb@wing.cloud"
diff --git a/k8s/root.test.w b/k8s/root.test.w
index dc2f65cd..cd283741 100644
--- a/k8s/root.test.w
+++ b/k8s/root.test.w
@@ -3,4 +3,4 @@
 bring expect;
 
 let root = nodeof(this).root;
-expect.equal(nodeof(root).path, "Chart/App/Default");
+expect.equal(nodeof(root).path, "Default/Default/Default");