@leverege/build-tools 2.2.9 → 2.2.11

package/lib/server/helmify/helm.js

@@ -35,20 +35,27 @@ function transformGoFormat(input) {
   return input.replace(/-/g, '_');
 }
 
-async function createChartYAML(chart) {
-  try {
-    await fsp.writeFile('helm/Chart.yaml', yaml.safeDump(chart), 'utf8');
-  } catch (err) {
-    console.error('Failed to create Chart.yaml file', chalk.red.bold('ERROR'));
-    process.exit(1);
+function mapServiceToType(service) {
+  switch (service) {
+    case 'none':
+      return null;
+
+    case 'internal':
+      return 'ClusterIP';
+
+    case 'external':
+      return 'NodePort';
+
+    default:
+      return null;
   }
 }
 
-async function createValuesYAML(name, version, redisAccess, securityContext, preemptible, service) {
+async function createValuesYAML(name, version, redisAccess, securityContext, preemptible, serviceType) {
   const openPort = service !== 'none';
   const portFromEnv = process.env.PORT || process.env.SERVER_PORT;
   const portNumber = parseInt(portFromEnv) || 8080;
-  const values = {
+  let values = {
     [name]: {
       "VERSION": version,
       "PREMPTIBLE": preemptible,
@@ -69,6 +76,17 @@ async function createValuesYAML(name, version, redisAccess, securityContext, pre
       "sqlInstance": ""
     }
   };
+  const scalerValues = {
+    "horizontalScaler": {
+      "minReplicas": 1,
+      "maxReplicas": 3,
+      "maxCPU": 75
+    }
+  };
+
+  if (serviceType) {
+    values = Object.assign(values, scalerValues);
+  }
 
   try {
     await fsp.writeFile('helm/values.yaml', yaml.safeDump(values), 'utf8');
@@ -78,6 +96,15 @@ async function createValuesYAML(name, version, redisAccess, securityContext, pre
   }
 }
 
+async function createChartYAML(chart) {
+  try {
+    await fsp.writeFile('helm/Chart.yaml', yaml.safeDump(chart), 'utf8');
+  } catch (err) {
+    console.error('Failed to create Chart.yaml file', chalk.red.bold('ERROR'));
+    process.exit(1);
+  }
+}
+
 async function createServiceYAML(name, serviceType) {
   try {
     await execa('helminit-svc', [name, serviceType]);
@@ -177,7 +204,7 @@ module.exports = {
     console.log(chalk.green(`\nBootstrapping a new Helm chart for ${name}...\n`));
     const chart = {
       name,
-      version: "1.0.0",
+      version: '1.0.0',
       appVersion
     };
     const chartSafeName = transformGoFormat(name);
@@ -190,7 +217,7 @@ module.exports = {
       process.exit(1);
     }
 
-    await createChartYaml(chart);
+    await createChartYAML(chart);
     const templateOpts = await createTemplates();
     const {
       service,
@@ -200,9 +227,9 @@ module.exports = {
       securityContext,
       preemptible
     } = templateOpts;
+    const serviceType = mapServiceToType(service);
 
-    if (service !== 'none') {
-      const serviceType = service === 'internal' ? 'ClusterIP' : 'NodePort';
+    if (serviceType) {
       await createServiceYAML(chartSafeName, serviceType);
     }
 
@@ -213,7 +240,7 @@ module.exports = {
     const enableFirebase = cloudServices.includes('firebase');
     const enableBigQuery = cloudServices.includes('bigquery');
     await createDeploymentYAML(name, enableFirebase, enableBigQuery);
-    await createValuesYAML(chartSafeName, appVersion, redisAccess, securityContext, preemptible, service);
+    await createValuesYAML(chartSafeName, appVersion, redisAccess, securityContext, preemptible, serviceType);
     console.log(chalk.green.bold(`\n\n Helm chart for ${name} is now ready \n`));
     console.log(chalk.yellow.bold('Add any additional env vars to value.yaml and deployment.yaml prior to deployment'));
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.2.9",
+  "version": "2.2.11",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "scripts": {

package/src/helminit-svc

@@ -16,6 +16,6 @@ spec:
     app: {{ .Chart.Name }}
   ports:
   - protocol: TCP
-    port: {{ .Values.$chartName.serverPort }}
+    port: {{ .Values.$chartName.port }}
     targetPort: api
 EOSERVICE