Allow cluster exceptions

create-cr.sh

@@ -3,12 +3,13 @@
 name="etcd-backup-$(date "+%Y%m%d%H%M%S")"
 guest_backup="${1}"
 clusters_regex="${2:-.*}"
+clusters_to_exclude_regex="${3:-.*}"
 
 # Check guest backup.
 if [ "${guest_backup}" != "true" ] && [ "${guest_backup}" != "false" ]
 then
   # Print usage.
-  echo "Usage: ${0} <true|false>"
+  echo "Usage: ${0} <true|false> [clusters_regex] [clusters_to_exclude_regex]"
   # Exit erroneously.
   exit 1
 fi
@@ -22,4 +23,5 @@ metadata:
 spec:
   guestBackup: ${guest_backup}
   clustersRegex: "${clusters_regex}"
+  clustersToExcludeRegex: "${clusters_to_exclude_regex}"
 END

helm/etcd-backup-operator/templates/crds/etcd-backup.yaml

@@ -59,6 +59,11 @@ spec:
                     clusters have to be backed up
                   nullable: true
                   type: string
+                clustersToExcludeRegex:
+                  description: clustersToExcludeRegex is a regexp string indicating which workload
+                    clusters will not to be backed up
+                  nullable: true
+                  type: string
                 guestBackup:
                   description: GuestBackup is a boolean indicating if the workload clusters
                     have to be backed up

helm/etcd-backup-operator/templates/cronjob.yaml

@@ -25,5 +25,8 @@ spec:
             args:
             - {{ not $.Values.testingEnvironment | quote }}
             - {{ $schedule.clusters | quote }}
+            {{- if $schedule.clusters_to_exclude }}
+            - {{ $schedule.clusters_to_exclude | quote }}
+            {{- end }}
           restartPolicy: Never
 {{- end }}

helm/etcd-backup-operator/values.yaml

@@ -31,9 +31,11 @@ schedules:
   - cronjob: "0 */6 * * *"
     clusters: ".*"
   # - cronjob: 0 */6 * * *
-  #   clusters: '^(?!<cluster-id>)' #all clusters but the id defined
+  #   clusters: '^(<cluster-id>)' #cluster ids to backup
+  #   clusters_to_exclude: '^(<cluster-id2>)' #cluster ids to skip backup
   # - cronjob: 0 3 * * * *
-  #   clusters: '<cluster-id>' # only one cluster
+  #   clusters: '<cluster-id>' # multiple clusters
+  #   clusters_to_exclude: '^(<cluster-id2>|<cluster-id3>)' #multiple clusters to skip backup
 
 etcdDataDir: ""
 clientCertsDir: "/etc/kubernetes/ssl/etcd/"

service/controller/resource/etcdbackup/instances.go

@@ -89,11 +89,18 @@ func (r *Resource) runBackupOnAllInstances(ctx context.Context, obj interface{},
 			if err != nil {
 				return false, microerror.Mask(err)
 			}
+
 			re := regexp2.MustCompile(customObject.Spec.ClustersRegex, 0)
+			re2 := regexp2.MustCompile(customObject.Spec.clustersToExcludeRegex, 0)
 			for _, guestInstance := range guestInstances {
-				if isMatch, _ := re.MatchString(guestInstance.Name); isMatch {
-					instances = append(instances, guestInstance)
+				if isMatch, _ := clustersToIncludeRegex.MatchString(guestInstance.Name); !isMatch {
+					continue
+				}
+				if isMatch, _ := clustersToExcludeRegex.MatchString(guestInstance.Name); isMatch {
+					continue
 				}
+
+				instances = append(instances, guestInstance)
 			}
 		}
 	}