From 89b5007366c9ce78bc09359648d42ba3170d23d0 Mon Sep 17 00:00:00 2001
From: Jared Tan <jian.tan@daocloud.io>
Date: Thu, 13 Jun 2024 14:25:04 +0800
Subject: [PATCH] bump up chart and fix resource name

---
 charts/cmdb/Chart.yaml                        | 2 +-
 charts/cmdb/templates/api/configmap.yaml      | 2 +-
 charts/cmdb/templates/api/deployment.yaml     | 2 +-
 charts/cmdb/templates/api/service.yaml        | 2 +-
 charts/cmdb/templates/api/serviceaccount.yaml | 2 +-
 charts/cmdb/templates/ui/configmap.yaml       | 2 +-
 charts/cmdb/templates/ui/deployment.yaml      | 2 +-
 charts/cmdb/templates/ui/service.yaml         | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/charts/cmdb/Chart.yaml b/charts/cmdb/Chart.yaml
index f335f33..4016092 100644
--- a/charts/cmdb/Chart.yaml
+++ b/charts/cmdb/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.3
+version: 0.1.4
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
diff --git a/charts/cmdb/templates/api/configmap.yaml b/charts/cmdb/templates/api/configmap.yaml
index 15e7a0a..3effc43 100644
--- a/charts/cmdb/templates/api/configmap.yaml
+++ b/charts/cmdb/templates/api/configmap.yaml
@@ -1,7 +1,7 @@
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: {{ include "cmdb.fullname" . }}-cmdb-api
+  name: {{ include "cmdb.fullname" . }}-api
   labels:
     {{- include "cmdb.labels" . | nindent 4 }}
 data:
diff --git a/charts/cmdb/templates/api/deployment.yaml b/charts/cmdb/templates/api/deployment.yaml
index 4f38c2b..2188dbf 100644
--- a/charts/cmdb/templates/api/deployment.yaml
+++ b/charts/cmdb/templates/api/deployment.yaml
@@ -1,7 +1,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ include "cmdb.fullname" . }}-cmdb-api
+  name: {{ include "cmdb.fullname" . }}-api
   labels:
     {{- include "cmdb.labels" . | nindent 4 }}
 spec:
diff --git a/charts/cmdb/templates/api/service.yaml b/charts/cmdb/templates/api/service.yaml
index 2e1b8df..fde617d 100644
--- a/charts/cmdb/templates/api/service.yaml
+++ b/charts/cmdb/templates/api/service.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "cmdb.fullname" . }}-cmdb-api
+  name: {{ include "cmdb.fullname" . }}-api
   labels:
     {{- include "cmdb.labels" . | nindent 4 }}
 spec:
diff --git a/charts/cmdb/templates/api/serviceaccount.yaml b/charts/cmdb/templates/api/serviceaccount.yaml
index deef37d..59ad56b 100644
--- a/charts/cmdb/templates/api/serviceaccount.yaml
+++ b/charts/cmdb/templates/api/serviceaccount.yaml
@@ -2,7 +2,7 @@
 apiVersion: v1
 kind: ServiceAccount
 metadata:
-  name: {{ include "cmdb.serviceAccountName" . }}-cmdb
+  name: {{ include "cmdb.serviceAccountName" . }}
   labels:
     {{- include "cmdb.labels" . | nindent 4 }}
   {{- with .Values.api.serviceAccount.annotations }}
diff --git a/charts/cmdb/templates/ui/configmap.yaml b/charts/cmdb/templates/ui/configmap.yaml
index 56584cf..5a49738 100644
--- a/charts/cmdb/templates/ui/configmap.yaml
+++ b/charts/cmdb/templates/ui/configmap.yaml
@@ -1,7 +1,7 @@
 kind: ConfigMap
 apiVersion: v1
 metadata:
-  name: {{ include "cmdb.fullname" . }}-cmdb-ui
+  name: {{ include "cmdb.fullname" . }}-ui
   labels:
     {{- include "cmdb.labels" . | nindent 4 }}
 data:
diff --git a/charts/cmdb/templates/ui/deployment.yaml b/charts/cmdb/templates/ui/deployment.yaml
index 99470db..ba1149f 100644
--- a/charts/cmdb/templates/ui/deployment.yaml
+++ b/charts/cmdb/templates/ui/deployment.yaml
@@ -1,7 +1,7 @@
 apiVersion: apps/v1
 kind: Deployment
 metadata:
-  name: {{ include "cmdb.fullname" . }}-cmdb-ui
+  name: {{ include "cmdb.fullname" . }}-ui
   labels:
     {{- include "cmdb.labels" . | nindent 4 }}
 spec:
diff --git a/charts/cmdb/templates/ui/service.yaml b/charts/cmdb/templates/ui/service.yaml
index df9caa3..a7b5c51 100644
--- a/charts/cmdb/templates/ui/service.yaml
+++ b/charts/cmdb/templates/ui/service.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "cmdb.fullname" . }}-cmdb-ui
+  name: {{ include "cmdb.fullname" . }}-ui
   labels:
     {{- include "cmdb.labels" . | nindent 4 }}
 spec: