Merge pull request #1039 from cloud-pi-native/develop

Develop
cloud-pi-native · Apr 4, 2024 · 6401baa · 6401baa
2 parents 56d2ef3 + e69f26f
commit 6401baa
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/helm/templates/deployment-postgres.yaml b/helm/templates/deployment-postgres.yaml
@@ -15,6 +15,9 @@ spec:
     metadata:
       annotations:
         {{- include "checksumCm" (list $ "/cm-postgres.yaml") | nindent 8 }}
+        {{- if .Values.postgres.container.annotations }}
+        {{- .Values.postgres.container.annotations | toYaml | nindent 8 }}
+        {{- end }}
       labels:
         app: {{ .Release.Name }}-postgres
     spec:

diff --git a/helm/values.yaml b/helm/values.yaml
@@ -105,6 +105,7 @@ postgres:
     image: docker.io/postgres:15.3
     port: 5432
     imagePullPolicy: Always
+    annotations: {}
     env: #hashmap of custom env
     db: dso-console-db
     user: admin

diff --git a/plugins/kubernetes/package.json b/plugins/kubernetes/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@cpn-console/kubernetes-plugin",
   "description": "",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "private": false,
   "type": "module",
   "main": "dist/index.js",

diff --git a/plugins/kubernetes/src/class.ts b/plugins/kubernetes/src/class.ts
@@ -79,10 +79,10 @@ class KubernetesNamespace {
 
     try {
       await this.anyObjectApi.getNamespacedCustomObject(r.group, r.version, nsName, r.plural, r.name)
-      return await this.anyObjectApi.replaceNamespacedCustomObject(r.group, r.version, nsName, r.plural, r.name, objToCreate)
+      await this.anyObjectApi.deleteNamespacedCustomObject(r.group, r.version, nsName, r.plural, r.name)
     } catch (error) {
-      return this.anyObjectApi.createNamespacedCustomObject(r.group, r.version, nsName, r.plural, objToCreate)
     }
+    return this.anyObjectApi.createNamespacedCustomObject(r.group, r.version, nsName, r.plural, objToCreate)
   }
 
   public async setQuota (quota: ResourceQuotaType) {