@leverege/build-tools 2.0.14 → 2.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.0.14",
+  "version": "2.1.0",
   "description": "A package for development build tools.",
   "main": "index.js",
   "scripts": {

package/src/helmup

@@ -79,23 +79,21 @@ function installMonitoringCharts(){
   fi
 
   ## Install Prometheus
-  helm upgrade --install prometheus --namespace monitoring stable/prometheus -f prometheus/values.yaml
+  helm upgrade --install prometheus stable/prometheus \
+    --namespace monitoring \
+    -f prometheus/values.yaml \
+    --version 11.0.0
 
   ## Installing ES exporter
   helm upgrade --install elasticsearch-exporter stable/elasticsearch-exporter \
     --namespace monitoring \
-    --set-string service.annotations."prometheus\.io/port"="9108" \
-    --set-string service.annotations."prometheus\.io/scrape"="true" \
-    --set es.uri="http://databases-elasticsearch.default.svc.cluster.local:9200" \
+    -f elasticsearch-exporter/values-es-exporter.yaml \
     --version 3.0.0
 
   ## Install Grafana  
   helm upgrade --install grafana stable/grafana \
     --namespace monitoring \
-    --set service.type="NodePort" \
-    --set service.port="9000" \
-    --set persistence.enabled="true" \
-    --set persistence.storageClassName="ssd" \
+    -f grafana/values-grafana.yaml \
     --version 5.0.3
 
   ## Print out instructions
@@ -251,6 +249,28 @@ EOK8S
   exit 1
 fi
 
+OLD_MONITORING="${GITTOP}/values-monitoring.yaml"
+if [ -f "$OLD_MONITORING" ];
+then
+  cat<<OLDMON
+
+$RED_ERROR Old monitoring setup detected
+
+  Monitoring now runs in the monitoring namespace, centrally managed via helmup.
+  
+  To migrate to the new setup:
+  1) Delete values-monitoring.yaml
+  2) Grab prometheus/values-local.yaml from master branch (modify as needed for opsgenie config)
+  3) Grab stackdriver-exporter/values-local.yaml from master branch
+  4) Create grafana dir => add .nohelm and values-grafana.yaml
+  5) Create elasticsearch-exporter dir => add .nohelm and values-es-exporter.yaml
+
+  Now run helmup monitoring and follow directions. 
+
+OLDMON
+  exit 1
+fi 
+
 npm run ahoy
 [ $? -ne 0 ] && printf "\n\n***Aborting helmup...\n\n" && exit 1
 

package/src/overwhelm

@@ -200,26 +200,6 @@ const opt = {
 
 const ahoy = glob.sync( '*/', opt )
 
-// Keel supports a "never" policy which will cause it to skip over a release
-// if it is properly set. Adding a .nokeel file to a release directoy will
-// cause the creation of the file if it does not already exist.
-const generateKeelNeverPolicy = ( fileName ) => {
-  if ( fs.existsSync( fileName ) ) return
-  const neverPolicy = `
-keel:
-  # keel policy (all/major/minor/patch/force)
-  policy: "never"
-  # approvals
-# approvals: 1
-# approvalDeadline: 24
-# # images to track and update
-# images:
-#   - repository: never.IMAGE # [1]
-#     tag: never.VERSION  # [2]
-`
-  fs.writeFileSync( fileName, neverPolicy )
-}
-
 // Generate the values.yaml files in directories not marked with .nohelm.
 ahoy.forEach( ( dir ) => {
   if ( !fs.existsSync( `${dir}/.nohelm` ) ) {
@@ -230,10 +210,6 @@ ahoy.forEach( ( dir ) => {
     // Add support for localized values for things like keel (or whatever)
     const valuesLocal = `${dir}values-local.yaml`
 
-    if ( fs.existsSync( `${dir}.nokeel` ) ) {
-      generateKeelNeverPolicy( valuesLocal )
-    }
-
     if ( fs.existsSync( valuesLocal ) ) {
       console.log( `     Local values in ${valuesLocal}` )
       valuesOut += `\n# AHOY => values-local.yaml\n\n`
@@ -246,10 +222,11 @@ ahoy.forEach( ( dir ) => {
   }
 } )
 
+
 // Set the GCP context for safety!
-  const clusterName = over['CLUSTER_NAME']
-  const projectId   = over['PROJECT_ID']
-  const zone = over['GCE_REGION'] + ( over['GCE_ZONE'] ? `-${over['GCE_ZONE']}` : '' )
+  let clusterName = over['CLUSTER_NAME']
+  let projectId   = over['PROJECT_ID']
+  let zone = over['GCE_REGION'] + ( over['GCE_ZONE'] ? `-${over['GCE_ZONE']}` : '' )
 
   if ( !clusterName ) {
     console.log( chalk.yellow(
@@ -278,9 +255,20 @@ ahoy.forEach( ( dir ) => {
   } catch (err) { }
 
   const currentCtx = kubeout.toString().trim()
-  const desiredCtx = `gke_${projectId}_${zone}_${clusterName}`
+  let desiredCtx = `gke_${projectId}_${zone}_${clusterName}`
+  let cmd = `gcloud container clusters get-credentials ${clusterName} --zone ${zone} --project ${projectId}`
+
+  // Check if we are using AWS
+  if(cfgs['CLOUD'] === 'aws'){
+    const awsAcctId = cfgs['AWS_ACCT_ID']
+    zone = over['AWS_REGION']
+    desiredCtx = `arn:aws:eks:${zone}:${awsAcctId}:cluster/${clusterName}`
+    cmd = `aws eks --region ${zone} update-kubeconfig --name ${clusterName}`
+  }
+
+  // TODO - FETCH AWS CLUSTER CREDENTIALS 
+
   const matchedCtx = ( currentCtx === desiredCtx )
-  const cmd = `gcloud container clusters get-credentials ${clusterName} --zone ${zone} --project ${projectId}`
   
   if ( matchedCtx ) {
     console.log( `
@@ -293,21 +281,21 @@ ahoy.forEach( ( dir ) => {
   else {
     console.log( `
 
-  You are about to change your GCP context to:
+  You are about to change your Kubernetes context to:
       CLUSTER_NAME => ${chalk.bold.green(clusterName)}
       PROJECT_ID   => ${chalk.bold.green(projectId)}
-      GCE_REGION   => ${chalk.bold.green(zone)}
+      REGION       => ${chalk.bold.green(zone)}
 
   ` )
   }
   const ans = ask.question( `Enter "${chalk.bold.green( 'yes' )}" if you wish to fetch the credentials => ` )
   if ( ans !== 'yes' ) {
     if ( matchedCtx ) {
-      console.log( chalk.bold.yellow( `\n\nSkipping a refetch of your GCP context and credentials\n\n` ) )
+      console.log( chalk.bold.yellow( `\n\nSkipping a refetch of your Kubernetes context and credentials\n\n` ) )
       process.exit( 0 )
     }
 
-    console.log( chalk.bold.red( `\n\nYour GCP context and credentials do NOT match - this could be bad!\n\n` ) )
+    console.log( chalk.bold.red( `\n\nYour Kubernetes context and credentials do NOT match - this could be bad!\n\n` ) )
     process.exit( 1 )
   }