@leverege/build-tools 2.6.2 → 2.6.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@leverege/build-tools",
-  "version": "2.6.2",
+  "version": "2.6.4",
   "description": "A collection of build / support tools for Leverege developers",
   "main": "index.js",
   "scripts": {
@@ -50,15 +50,15 @@
   "author": "Leverege Devs",
   "license": "SEE LICENSE IN LICENSE.md",
   "dependencies": {
-    "chalk": "^4.1.1",
+    "chalk": "^4.1.2",
     "clear": "^0.1.0",
     "clipboardy": "^2.3.0",
-    "command-line-args": "^5.1.3",
+    "command-line-args": "^5.2.0",
     "command-line-usage": "^6.1.1",
     "deepmerge": "^4.2.2",
     "dotenv": "^10.0.0",
     "execa": "^5.1.1",
-    "figlet": "^1.5.0",
+    "figlet": "^1.5.2",
     "git-branch": "^2.0.1",
     "glob": "^7.1.7",
     "inquirer": "^8.1.2",
@@ -71,14 +71,14 @@
     "parse-gitignore": "^1.0.1",
     "readline-sync": "^1.4.10",
     "semver": "^7.3.5",
-    "simple-git": "^2.41.1"
+    "simple-git": "^2.44.0"
   },
   "devDependencies": {
     "@babel/cli": "^7.14.8",
-    "@babel/core": "^7.14.8",
-    "@babel/node": "^7.14.7",
+    "@babel/core": "^7.15.0",
+    "@babel/node": "^7.14.9",
     "@leverege/babel-preset-leverege-node": "^1.2.0",
     "@leverege/eslint-config-leverege": "^3.0.0",
-    "npm": "^7.20.0"
+    "npm": "^7.20.6"
   }
 }

package/src/circleate

@@ -43,60 +43,14 @@ create_circle_config(){
 create_server_config(){
   cat<<EOCIRCLE > config.yml
 version: 2.1
-orbs:
-  gcp-gcr: circleci/gcp-gcr@0.6.1
+#orbs:
+#  gcp-gcr: circleci/gcp-gcr@0.6.1
 executors:
   default:
     description: >
       A debian-based machine executor.
     machine: true
 jobs:
-  gcr:
-    # gcr build docker image and pushes to gcr
-    executor: default
-    steps: 
-      - attach_workspace:
-          at: ~/project
-      - run: |
-          echo "export CONTAINER_NAME=\$(cat ~/project/container_name)" >> \$BASH_ENV
-          echo "export PACKAGE_VERSION=\$(cat ~/project/package_version)" >> \$BASH_ENV
-          echo "export NODE_IMAGE=\$(cat ~/project/node_img)" >> \$BASH_ENV
-      - run:
-          name: Check for tag version 
-          command: |
-            if ! [[ \$PACKAGE_VERSION =~ ^v(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)\$ ]]; then
-              echo "Pre-release tags detected - skipping build"
-              circleci-agent step halt
-            fi   
-      - gcp-gcr/gcr-auth
-      - run: 
-          name: Enable Kaniko
-          command: gcloud config set builds/use_kaniko True
-      - gcp-gcr/build-image:
-          image: \$CONTAINER_NAME
-          tag: \$PACKAGE_VERSION
-          path: docker
-          dockerfile: docker/Dockerfile
-      - gcp-gcr/push-image:
-          image: \$CONTAINER_NAME
-          tag: \$PACKAGE_VERSION
-      - run:
-          name: Check if branch is master
-          command: |
-            if [ \$CIRCLE_BRANCH == 'master' ]; then 
-              echo "export GCR_TAG=stable" >> \$BASH_ENV; 
-            else
-              echo "export GCR_TAG=latest" >> \$BASH_ENV;
-            fi
-      - gcp-gcr/tag-image:
-          image: \$CONTAINER_NAME
-          source-tag: \$PACKAGE_VERSION
-          target-tag: \$GCR_TAG
-      - gcp-gcr/tag-image:
-          image: \$CONTAINER_NAME
-          source-tag: \$PACKAGE_VERSION
-          target-tag: circle-\$NODE_IMAGE-\$CIRCLE_USERNAME
-
   install:
     docker:
       - image: circleci/node:fermium
@@ -300,22 +254,6 @@ workflows:
             - lint
             - coverage
             - docs
-      - gcr:
-          context: google
-          filters:
-            branches:
-              only: 
-                - development
-                - /release-.*/
-                - master
-          requires:
-            - install
-            - security-check
-            - license-check
-            - lint
-            - coverage
-            - docs
-            - build
 EOCIRCLE
 }
 

package/src/helmdn

@@ -70,17 +70,17 @@ cd $GITTOP
 npm run ahoy
 [ $? -ne 0 ] && printf "\n\n***Aborting helmup...\n\n" && exit 1
 
-helm repo update # old helm2 => helm search chartmuseum
+# Detect Project ID
+currContext=`kubectl config current-context`
 
-function annihilateMonitoring() {
-  # Detect Project ID
-  currContext=`kubectl config current-context`
+IFS='_'
+read -ra ADDR <<< "$currContext"
 
-  IFS='_'
-  read -ra ADDR <<< "$currContext"
+GCP_PROJECT_ID=${ADDR[1]} # project id is the second string split by _
 
-  GCP_PROJECT_ID=${ADDR[1]} # project id is the second string split by _
+helm repo update # old helm2 => helm search chartmuseum
 
+function annihilateMonitoring() {
   kubectl delete sa -n monitoring stackdriver-exporter
   gcloud iam service-accounts delete stackdriver-exporter@${GCP_PROJECT_ID}.iam.gserviceaccount.com --quiet
 
@@ -89,6 +89,22 @@ function annihilateMonitoring() {
   helm ls -n monitoring
 }
 
+function annihilateVelero() {
+  velero delete backup --all --confirm
+  velero delete schedule --all --confirm
+  velero delete backup-location --all --confirm
+
+  ## Clean up from previous failed install before uninstalling
+  kubectl delete volumesnapshotlocation.velero.io gcp \
+    --namespace velero &>/dev/null
+
+  velero uninstall
+
+  gcloud iam service-accounts delete \
+    --project=${GCP_PROJECT_ID} --quiet \
+    velero@${GCP_PROJECT_ID}.iam.gserviceaccount.com &>/dev/null
+}
+
 function doNuking() {
 
   for PARAM in "$@";
@@ -100,6 +116,11 @@ function doNuking() {
       annihilateMonitoring && continue
     fi
 
+    if [ "$SERVICE" == "velero" ];
+    then
+      annihilateVelero && continue
+    fi
+
     if [ "$SERVICE" == "platform" ];
     then
       doNuking "${PLATFORM[@]}" && exit $?

package/src/helmup

@@ -265,6 +265,9 @@ NEED_TRAEFIK_SECRET
 }
 
 function installVelero() {
+  open https://velero.io/docs
+  yesToContinue "when you are done checking the docs"
+
   ## Set the project id by parsing current context
   currContext=`kubectl config current-context`
    
@@ -277,16 +280,23 @@ function installVelero() {
 
   ## Create a bucket
   BUCKET="$PROJECT_ID-velero"
-
-  gsutil mb gs://$BUCKET/
+  printf "\nCreating storage bucket...\n"
+  gsutil mb gs://$BUCKET/ &> /dev/null
+  warnOnError $? "Bucket failed to create or already exists - go check it\n"
 
   ## Create a service account
+  printf "\nCreating the service account\n"
   gcloud iam service-accounts create velero \
-    --display-name "Velero service account"
+    --display-name "Velero service account" &>/dev/null
+  if [ $? -eq 0 ];
+  then
+    # no error means a new SA was created - slight delay to let it update
+    sleep 2
+  else
+    printf "$YELO_WARN Failed to create the service account - does it already exist?"
+  fi
 
-  SERVICE_ACCOUNT_EMAIL=$(gcloud iam service-accounts list \
-    --filter="displayName:Velero service account" \
-    --format 'value(email)')
+  SERVICE_ACCOUNT_EMAIL="velero@${PROJECT_ID}.iam.gserviceaccount.com"
 
   ## Attach roles
   ROLE_PERMISSIONS=(
@@ -300,52 +310,67 @@ function installVelero() {
     compute.zones.get
   )
 
+  printf "\nAssigning roles to the SA\n"
   gcloud iam roles create velero.server \
     --project $PROJECT_ID \
     --title "Velero Server" \
-    --permissions "$(IFS=","; echo "${ROLE_PERMISSIONS[*]}")"    
+    --permissions "$(IFS=","; echo "${ROLE_PERMISSIONS[*]}")" &>/dev/null
+  warnOnError $? "Failed to add roles to velero.server - perhaps they already exist?"
 
+  printf "\nBinding IAM policy to the SA\n"
   gcloud projects add-iam-policy-binding $PROJECT_ID \
     --member serviceAccount:$SERVICE_ACCOUNT_EMAIL \
-    --role projects/$PROJECT_ID/roles/velero.server
+    --role projects/$PROJECT_ID/roles/velero.server &>/dev/null
+  warnOnError $? "gcloud problem binding IAM policy"
 
-  gsutil iam ch serviceAccount:$SERVICE_ACCOUNT_EMAIL:objectAdmin gs://${BUCKET}
+  gsutil iam ch serviceAccount:$SERVICE_ACCOUNT_EMAIL:objectAdmin gs://$BUCKET
 
   ## Create keys
-  gcloud iam service-accounts keys create credentials-velero \
+  VELERO_CREDS="velero-credentials"
+  gcloud iam service-accounts keys create $VELERO_CREDS \
     --iam-account $SERVICE_ACCOUNT_EMAIL
 
   ## Create velero namespace
-  kubectl create ns velero
+  kubectl get namespaces velero &>/dev/null
+  [ $? -eq 1 ] && kubectl create ns velero
 
   ## Create kubernetes secret
-  kubectl create secret generic velero-credentials --namespace velero --from-file cloud=credentials-velero
+  printf "\nStoring the credentials in $VELERO_CREDS k8s secret\n"
+  kubectl delete secret $VELERO_CREDS --namespace velero &>/dev/null # toss old key if exists
+  kubectl create secret generic $VELERO_CREDS --namespace velero --from-file cloud=${VELERO_CREDS}
+
+  ## Clean up from previous failed install
+  kubectl delete volumesnapshotlocation.velero.io -n velero  gcp &>/dev/null
 
   ## Install velero
   helm repo add vmware-tanzu https://vmware-tanzu.github.io/helm-charts
   helm upgrade --install velero vmware-tanzu/velero \
     --namespace velero \
     --set configuration.provider="gcp" \
-    --set configuration.backupStorageLocation.name="gcp" \
-    --set configuration.volumeSnapshotLocation.name="gcp" \
+    --set configuration.backupStorageLocation.name=default \
     --set configuration.backupStorageLocation.bucket="${BUCKET}" \
-    --set credentials.existingSecret="velero-credentials" \
+    --set snapshotsEnabled="true" \
+    --set configuration.volumeSnapshotLocation.name=default \
+    --set credentials.existingSecret="${VELERO_CREDS}" \
     --set "initContainers[0].name"="velero-plugin-for-gcp" \
     --set "initContainers[0].image"="velero/velero-plugin-for-gcp:v1.0.0" \
     --set "initContainers[0].volumeMounts[0].mountPath"="/target" \
     --set "initContainers[0].volumeMounts[0].name"="plugins" \
+    --set schedules.postgresql.schedule="0 2 * * *" \
+    --set schedules.postgresql.template.ttl="720h" \
+    --set schedules.postgresql.template.labelSelector.matchLabels.release="postgres" \
+    --set schedules.postgresql.template.labelSelector.matchLabels.app="postgresql" \
+    --set schedules.postgresql.template.snapshotVolumes="true" \
     --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" \
-    --set schedules.mysql.schedule="0 2 * * *" \
-    --set schedules.mysql.template.ttl="720h" \
-    --set schedules.mysql.template.labelSelector.matchLabels.app="mysql" \
-    --set schedules.mysql.template.snapshotVolumes="true" 
-
-  ## Instruct users to move velero keys
-  printf "\n$YELO_WARN Use the velero-credentials secret for accessing velero\n"
+    --set schedules.timescale.template.snapshotVolumes="true"
+
+  velero get backups
+  printf "\n\nVelero keys => kubectl get secret $VELERO_CREDS --namespace velero\n\n"
+  /bin/rm -f $VELERO_CREDS
+  echo -n "npm run ahoy && velero get backups" | pbcopy
 }
 
 # ---------- helmup MAIN ----------

package/src/k8x

@@ -4,6 +4,8 @@ cmd=${@:-"bash"}
 
 [ "$cmd" = "redis" ] || [ "$cmd" = "redis-cli" ] && FZFQ="--query=redis" && cmd='redis-cli'
 
+[ "$cmd" = "pgsql" ] && FZFQ="--query=postgresql" && cmd='psql -U postgres'
+
 [ -f overwhelm.yaml ] && [ -f package.json ] && npm run ahoy
 
 [ ! -x "$(command -v fzf)" ] && printf "\n***ERROR: Missing fzf fuzzy matcher => brew install fzf\n\n" && exit 1