Merge pull request #180 from amplication/task/hpa-version-changes-and…

…-configmap-fix feat: hpa version changes and configmap fix
amplication · Oct 2, 2023 · bcd1e01 · bcd1e01
2 parents 4eb3487 + 03ec92e
commit bcd1e01
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 28 deletions.
diff --git a/plugins/deployment-helm-chart/.amplicationrc.json b/plugins/deployment-helm-chart/.amplicationrc.json
@@ -1,23 +1,23 @@
 { 
-    "settings":{ 
-    "root_level" : false,
-    "directory_name" : "helm",
-    "server" : {
-        "chart_version" : "0.0.1",
-        "application_version" : "0.0.1",
-        "repository" : "ghcr.io/NAMESPACE/IMAGE_NAME",
-        "tag" : "latest",
-        "host" : "server.example.com",
-        "port" : "3000"
-    },
-    "admin_ui" : {
-        "enabled" : false,
-        "chart_version" : "0.0.1",
-        "application_version" : "0.0.1",
-        "repository" : "ghcr.io/NAMESPACE/IMAGE_NAME",
-        "tag" : "latest",
-        "host" : "admin.example.com",
-        "port" : "8080"
+    "settings" : {
+        "root_level" : false,
+        "directory_name" : "helm",
+        "server" : {
+            "chart_version" : "0.0.1",
+            "application_version" : "0.0.1",
+            "repository" : "ghcr.io/NAMESPACE/IMAGE_NAME",
+            "tag" : "latest",
+            "host" : "server.example.com",
+            "port" : "3000"
+        },
+        "admin_ui" : {
+            "enabled" : false,
+            "chart_version" : "0.0.1",
+            "application_version" : "0.0.1",
+            "repository" : "ghcr.io/NAMESPACE/IMAGE_NAME",
+            "tag" : "latest",
+            "host" : "admin.example.com",
+            "port" : "8080"
+        }
     }
-}
 }
diff --git a/plugins/deployment-helm-chart/package-lock.json b/plugins/deployment-helm-chart/package-lock.json
diff --git a/plugins/deployment-helm-chart/package.json b/plugins/deployment-helm-chart/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@amplication/plugin-deployment-helm-chart",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "Add helm chart for deployment of the service",
   "main": "dist/index.js",
   "scripts": {

diff --git a/plugins/deployment-helm-chart/src/index.ts b/plugins/deployment-helm-chart/src/index.ts
@@ -3,7 +3,6 @@ import type {
   CreateServerDotEnvParams,
   DsgContext,
   Events,
-  Module,
   ModuleMap,
 } from "@amplication/code-gen-types";
 import {
@@ -65,7 +64,7 @@ class HelmChartPlugin implements AmplicationPlugin {
 
     variables.forEach((variable) => {
       const [name, value] = Object.entries(variable)[0];
-      configmap = `${configmap}\n${configmapIndentation}${name}: ${value}`;
+      configmap = `${configmap}\n${configmapIndentation}${name}: "${value}"`;
     });
 
     /**

diff --git a/plugins/deployment-helm-chart/src/static/chart/templates/hpa.yaml b/plugins/deployment-helm-chart/src/static/chart/templates/hpa.yaml
@@ -1,5 +1,5 @@
 {{- if .Values.autoscaling.enabled }}
-apiVersion: autoscaling/v2beta1
+apiVersion: autoscaling/v2
 kind: HorizontalPodAutoscaler
 metadata:
   name: {{ include "${{ SERVICE_NAME }}.fullname" . }}
@@ -17,12 +17,16 @@ spec:
     - type: Resource
       resource:
         name: cpu
-        targetAverageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
+        target:
+          type: Utilization
+          averageUtilization: {{ .Values.autoscaling.targetCPUUtilizationPercentage }}
     {{- end }}
     {{- if .Values.autoscaling.targetMemoryUtilizationPercentage }}
     - type: Resource
       resource:
         name: memory
-        targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
+        target:
+          type: Utilization
+          averageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
     {{- end }}
 {{- end }}