@leverege/build-tools 2.59.0-beta.4 → 2.59.1

package/src/helmup.sh

@@ -578,8 +578,35 @@ function installCnpgOperatorEnvironment() {
   CNPG_SVC_ACCT="$CNPG_NAMESPACE-sa"
   CNPG_SVC_EMAIL="$CNPG_SVC_ACCT@$GCP_PROJECT_ID.iam.gserviceaccount.com"
 
-  kubectl delete serviceaccounts -n $CNPG_NAMESPACE $CNPG_SVC_ACCT &> $DEVNULL
-  gcloud --quiet iam service-accounts delete $CNPG_SVC_EMAIL  --project $GCP_PROJECT_ID&> $DEVNULL
+  # We used to delete the SA when we were doing clean installs but that bit
+  # me in the ass the time I moved the operator dir out of the way to run
+  # helmwhat to populate with latest operator version. The result? The SA
+  # was deleted and recreated and the existing system lost the ability to
+  # write to GCS which resulted in WAL failures. The deletion / recreation
+  # logic was only useful in the early days of creating / deleting for
+  # initial development.
+  #
+  # Synopsis: deleting an SA from an actual non-test system is BAD NEWS
+  #           and if it happens then you will need to rebind the SA to
+  #           workload identity by hand.
+  #
+  # kubectl delete serviceaccounts -n $CNPG_NAMESPACE $CNPG_SVC_ACCT &> $DEVNULL
+  # gcloud --quiet iam service-accounts delete $CNPG_SVC_EMAIL  --project $GCP_PROJECT_ID&> $DEVNULL
+  kubectl describe serviceaccounts -n $CNPG_NAMESPACE $CNPG_SVC_ACCT &> $DEVNULL
+  if [ $? -eq 0 ];
+  then
+    cat<<SKIP_CNPG_SA_CREATION
+
+  $YELO_WARN The CNPG SA $CNPG_SVC_ACCT already exists
+
+  Deleting the SA for the purposes of upgrading the operator is going to
+  wreck someone's day (probably yours) if the desire is to simply upgrade
+  in place. To force a clean reinstall, delete both the k8s and gcp SA for
+  CNPG and try again. (see comments in helmup for more info)
+
+SKIP_CNPG_SA_CREATION
+    return
+  fi
 
   # Create the operands namespace and annotate to allow redis access
   createNamespaceIfNeeded $CNPG_NAMESPACE
@@ -699,10 +726,10 @@ function installVeleroEnvironment() {
   gcloud config set project $GCP_PROJECT_ID
 
   ## The major chart version will determine the bucket suffix
-  [ -z "$VELERO_HELM_CHART" ] && VELERO_HELM_CHART="7"
+  [ -z "$VELERO_CHART_VERSION" ] && VELERO_CHART_VERSION="8"
 
   ## Create a bucket
-  BUCKET="$GCP_PROJECT_ID-velero-$VELERO_HELM_CHART"
+  BUCKET="$GCP_PROJECT_ID-velero-$VELERO_CHART_VERSION"
   printf "\nCreating storage bucket `color g $BUCKET` in `color g $GCE_REGION`\n"
   gsutil mb -l $GCE_REGION gs://$BUCKET/ &> $DEVNULL
   warnOnError $? "Bucket failed to create or already exists - go check it\n"

package/src/k8cryo.sh

@@ -1,20 +0,0 @@
-#!/bin/bash
-#
-. `build-tools --bashfun`
-
-daysToKeep=${1:-60}
-let hoursToKeep="$daysToKeep*24"
-printf "\ncryo backup set to keep for $daysToKeep days / $hoursToKeep hours\n"
-
-if [ "`basename $0`" == "k8thaw" ];
-then
-  errorExit "k8thaw - UNDER CONSTRUCTION"
-fi
-
-# Gets the UTC time in the same format that velero schedules use for
-# generating the Date Time Stamp for scheduled backups.
-DTS="`date -u +\"%Y%m%d%H%M%S\"`"
-
-printf "\nExecuting = > velero backup create velero-cryo-$DTS --ttl ${hoursToKeep}h\n"
-
-velero backup create velero-cryo-$DTS --ttl ${hoursToKeep}h