Merge pull request #12 from benjamin-maynard/versionbump

Version Bumps and v2.3.0 release

Author: benjamin-maynard

CHANGELOG.md

@@ -4,6 +4,15 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [v2.3.0] - 21-03-2020
+### Implement GCS Backend, and rename to kubernetes-cloud-mysql-backup
+- Added the ability to GZIP compress backup files. Thanks & credit: @LucasBG0
+- Added the ability to use custom S3 compatible storage endpoints. Thanks & credit: @mwienk
+- Bumped Google Cloud SDK version to 285.0.1
+- Bumped Alpine Linux version to 3.11
+- Corrected log filenames that were not correctly updated as part of the v2.2.0 rename
+
+
 ## [v2.2.0] - 28-11-2019
 ### Implement GCS Backend, and rename to kubernetes-cloud-mysql-backup
 - Added the ability to use Google Cloud Storage (GCS) as a backend storage provider (backwards compatible)

Dockerfile

@@ -1,5 +1,5 @@
 # Set the base image
-FROM alpine:3.10
+FROM alpine:3.11
 
 RUN apk -v --update add \
         python3 \
@@ -24,7 +24,7 @@ RUN apk -v --update add \
 ENV TARGET_DATABASE_PORT=3306
 ENV SLACK_ENABLED=false
 ENV SLACK_USERNAME=kubernetes-s3-mysql-backup
-ENV CLOUD_SDK_VERSION=272.0.0
+ENV CLOUD_SDK_VERSION=285.0.1
 ENV BACKUP_PROVIDER=aws
 
 # Set Google Cloud SDK Path

resources/perform-backup.sh

@@ -38,6 +38,7 @@ do
         if [ "$BACKUP_PROVIDER" = "aws" ]
         then
 
+            # If the AWS_S3_ENDPOINT variable isn't empty, then populate the --endpoint-url parameter to use a custom S3 compatable endpoint
             if [ ! -z "$AWS_S3_ENDPOINT" ]
             then
                 ENDPOINT="--endpoint-url=$AWS_S3_ENDPOINT"
@@ -49,7 +50,7 @@ do
             then
                 echo -e "Database backup successfully uploaded for $CURRENT_DATABASE at $(date +'%d-%m-%Y %H:%M:%S')."
             else
-                echo -e "Database backup failed to upload for $CURRENT_DATABASE at $(date +'%d-%m-%Y %H:%M:%S'). Error: $awsoutput" | tee -a /tmp/kubernetes-s3-mysql-backup.log
+                echo -e "Database backup failed to upload for $CURRENT_DATABASE at $(date +'%d-%m-%Y %H:%M:%S'). Error: $awsoutput" | tee -a /tmp/kubernetes-cloud-mysql-backup.log
                 has_failed=true
             fi
 
@@ -64,14 +65,14 @@ do
             then
                 echo -e "Database backup successfully uploaded for $CURRENT_DATABASE at $(date +'%d-%m-%Y %H:%M:%S')."
             else
-                echo -e "Database backup failed to upload for $CURRENT_DATABASE at $(date +'%d-%m-%Y %H:%M:%S'). Error: $gcpoutput" | tee -a /tmp/kubernetes-s3-mysql-backup.log
+                echo -e "Database backup failed to upload for $CURRENT_DATABASE at $(date +'%d-%m-%Y %H:%M:%S'). Error: $gcpoutput" | tee -a /tmp/kubernetes-cloud-mysql-backup.log
                 has_failed=true
             fi
 
         fi        
 
     else
-        echo -e "Database backup FAILED for $CURRENT_DATABASE at $(date +'%d-%m-%Y %H:%M:%S'). Error: $sqloutput" | tee -a /tmp/kubernetes-s3-mysql-backup.log
+        echo -e "Database backup FAILED for $CURRENT_DATABASE at $(date +'%d-%m-%Y %H:%M:%S'). Error: $sqloutput" | tee -a /tmp/kubernetes-cloud-mysql-backup.log
         has_failed=true
     fi
 
@@ -90,13 +91,13 @@ then
     if [ "$SLACK_ENABLED" = "true" ]
     then
         # Put the contents of the database backup logs into a variable
-        logcontents=`cat /tmp/kubernetes-s3-mysql-backup.log`
+        logcontents=`cat /tmp/kubernetes-cloud-mysql-backup.log`
 
         # Send Slack alert
         /slack-alert.sh "One or more backups on database host $TARGET_DATABASE_HOST failed. The error details are included below:" "$logcontents"
     fi
 
-    echo -e "kubernetes-s3-mysql-backup encountered 1 or more errors. Exiting with status code 1."
+    echo -e "kubernetes-cloud-mysql-backup encountered 1 or more errors. Exiting with status code 1."
     exit 1
 
 else