@leverege/build-tools 2.4.2 → 2.4.4

package/lib/server/helmify/helm.js

@@ -35,24 +35,8 @@ function transformGoFormat(input) {
   return input.replace(/-/g, '_');
 }
 
-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, serviceType) {
-  const openPort = serviceType !== 'none';
+async function createValuesYAML(name, version, redisAccess, securityContext, preemptible, protocol, scaler, cloud) {
+  const openPort = protocol !== 'none';
   const portFromEnv = process.env.PORT || process.env.SERVER_PORT;
   const portNumber = parseInt(portFromEnv) || 8080;
   let values = {
@@ -70,7 +54,7 @@ async function createValuesYAML(name, version, redisAccess, securityContext, pre
       "readOnlyRootFs": !securityContext
     },
     "cloud": {
-      "provider": "gcp",
+      "provider": cloud,
       "project": "",
       "region": "",
       "sqlInstance": ""
@@ -84,7 +68,7 @@ async function createValuesYAML(name, version, redisAccess, securityContext, pre
     }
   };
 
-  if (serviceType) {
+  if (scaler) {
     values = Object.assign(values, scalerValues);
   }
 
@@ -105,9 +89,9 @@ async function createChartYAML(chart) {
   }
 }
 
-async function createServiceYAML(name, serviceType) {
+async function createServiceYAML(name, serviceType, protocol) {
   try {
-    await execa('helminit-svc', [name, serviceType]);
+    await execa('helminit-svc', [name, serviceType, protocol]);
   } catch (err) {
     console.error('Failed to create service.yaml file', chalk.red.bold('ERROR'));
     process.exit(1);
@@ -144,12 +128,13 @@ async function createTemplates() {
   }, {
     name: 'securityContext',
     type: 'confirm',
-    message: 'Does this server need special write access to filesystem?'
+    message: 'Does this server need special write access to filesystem?',
+    default: false
   }, {
-    name: 'service',
+    name: 'protocol',
     type: 'rawlist',
-    message: 'Does this server need a TCP port open for internal or external access?',
-    choices: ['none', 'internal', 'external'],
+    message: 'Does this server require a TCP or UDP port open for communication?',
+    choices: ['none', 'UDP', 'TCP'],
     default: ['none']
   }, {
     name: 'scaler',
@@ -159,8 +144,8 @@ async function createTemplates() {
     name: 'cloud',
     type: 'rawlist',
     message: 'By default, which cloud platform will this server be deployed on?',
-    choices: ['GCP', 'AWS'],
-    default: ['GCP']
+    choices: ['gcp', 'aws'],
+    default: ['gcp']
   }, {
     name: 'cloudServices',
     type: 'checkbox',
@@ -220,17 +205,26 @@ module.exports = {
     await createChartYAML(chart);
     const templateOpts = await createTemplates();
     const {
-      service,
+      protocol,
       scaler,
       cloudServices,
       redisAccess,
       securityContext,
-      preemptible
-    } = templateOpts;
-    const serviceType = mapServiceToType(service);
-
-    if (serviceType) {
-      await createServiceYAML(chartSafeName, serviceType);
+      preemptible,
+      cloud
+    } = templateOpts; // Based on protocol, ask about serviceType 
+
+    if (protocol !== 'none') {
+      const servicesQ = [{
+        name: 'service',
+        type: 'rawlist',
+        message: 'What kind of service does your server need (ClusterIP for internal, NodePort/LB for external)?',
+        choices: ['ClusterIP', 'NodePort', 'LoadBalancer'],
+        default: ['ClusterIP']
+      }];
+      const ans = await inquirer.prompt(servicesQ);
+      const serviceType = ans.service;
+      await createServiceYAML(chartSafeName, serviceType, protocol);
     }
 
     if (scaler) {
@@ -240,7 +234,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, serviceType);
+    await createValuesYAML(chartSafeName, appVersion, redisAccess, securityContext, preemptible, protocol, scaler, cloud);
     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.4.2",
+  "version": "2.4.4",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "scripts": {

package/src/helminit-svc

@@ -2,6 +2,7 @@
 
 chartName=$1
 serviceType=$2
+protocol=$3
 
 touch helm/templates/service.yaml
 
@@ -15,7 +16,7 @@ spec:
   selector:
     app: {{ .Chart.Name }}
   ports:
-  - protocol: TCP
+  - protocol: $protocol
     port: {{ .Values.$chartName.port }}
     targetPort: api
 EOSERVICE

package/src/helmup

@@ -298,6 +298,7 @@ function installVelero() {
     --set "initContainers[0].volumeMounts[0].name"="plugins" \
     --set schedules.timescale.schedule="0 3 * * *" \
     --set schedules.timescale.template.ttl="720h" \
+    --set schedules.timescale.template.labelSelector.matchLabels.release="timescale-db" \
     --set schedules.timescale.template.labelSelector.matchLabels.app="postgresql" \
     --set schedules.timescale.template.snapshotVolumes="true"