feat: WIP v3.0.0-rc.1 velero testing, changing templates, schema and …

…templates to include snapshot-controller deployment, and enabling volume snapshotting on OnPremises and KFDDistribution providers. Complete refactor of velero schedules settings, simplifying and improving the definition
sighupio · Nov 16, 2024 · 45a49b3 · 45a49b3
1 parent 0f795ea
commit 45a49b3
Show file tree

Hide file tree

Showing 9 changed files with 74 additions and 21 deletions.
diff --git a/defaults/ekscluster-kfd-v1alpha2.yaml b/defaults/ekscluster-kfd-v1alpha2.yaml
@@ -253,6 +253,16 @@ data:
           bucketName: velerobucket
         schedules:
           install: true
+          definitions:
+            manifests:
+              schedule: "*/15 * * * *"
+              ttl: "720h0m0s"
+            full:
+              schedule: "0 1 * * *"
+              ttl: "720h0m0s"
+              snapshotMoveData: false
+        snapshotController:
+          install: false
     # auth module configuration
     auth:
       overrides:

diff --git a/defaults/kfddistribution-kfd-v1alpha2.yaml b/defaults/kfddistribution-kfd-v1alpha2.yaml
@@ -240,6 +240,16 @@ data:
           bucketName: velerobucket
         schedules:
           install: true
+          definitions:
+            manifests:
+              schedule: "*/15 * * * *"
+              ttl: "720h0m0s"
+            full:
+              schedule: "0 1 * * *"
+              ttl: "720h0m0s"
+              snapshotMoveData: false
+        snapshotController:
+          install: false
     # auth module configuration
     auth:
       overrides:

diff --git a/defaults/onpremises-kfd-v1alpha2.yaml b/defaults/onpremises-kfd-v1alpha2.yaml
@@ -240,6 +240,16 @@ data:
           bucketName: velerobucket
         schedules:
           install: true
+          definitions:
+            manifests:
+              schedule: "*/15 * * * *"
+              ttl: "720h0m0s"
+            full:
+              schedule: "0 1 * * *"
+              ttl: "720h0m0s"
+              snapshotMoveData: false
+        snapshotController:
+          install: false
     # auth module configuration
     auth:
       overrides:

diff --git a/kfd.yaml b/kfd.yaml
@@ -6,7 +6,7 @@ version: v1.30.0
 modules:
   auth: v0.3.0
   aws: v4.2.1
-  dr: v2.3.0
+  dr: v3.0.0-rc.1
   ingress: v2.3.3
   logging: v3.4.1
   monitoring: v3.2.0

diff --git a/templates/distribution/manifests/dr/kustomization.yaml.tpl b/templates/distribution/manifests/dr/kustomization.yaml.tpl
@@ -16,13 +16,17 @@ resources:
 {{- else }}
   - {{ print "../" .spec.distribution.common.relativeVendorPath "/modules/dr/katalog/velero/velero-aws" }}
   - resources/storageLocation.yaml
+  - resources/volumeSnapshotLocation.yaml
 {{- end }}
   - {{ print "../" .spec.distribution.common.relativeVendorPath "/modules/dr/katalog/velero/velero-node-agent" }}
 
 {{- end }}
 {{- if .spec.distribution.modules.dr.velero.schedules.install }}
   - {{ print "../" .spec.distribution.common.relativeVendorPath "/modules/dr/katalog/velero/velero-schedules" }}
 {{- end }}
+{{- if .spec.distribution.modules.dr.velero.snapshotController.install }}
+  - {{ print "../" .spec.distribution.common.relativeVendorPath "/modules/dr/katalog/velero/snapshot-controller" }}
+{{- end }}
 {{- if eq .spec.distribution.common.provider.type "eks" }}
   - resources/eks-velero-backupstoragelocation.yml
   - resources/eks-velero-volumesnapshotlocation.yml
@@ -34,13 +38,9 @@ patchesStrategicMerge:
   - patches/eks-velero.yml
 {{- end }}
 {{- if .spec.distribution.modules.dr.velero.schedules.install }}
-{{- if or (index .spec.distribution.modules.dr.velero.schedules "ttl") (and (index .spec.distribution.modules.dr.velero.schedules "cron") (index .spec.distribution.modules.dr.velero.schedules.cron "manifests")) }}
   - patches/velero-schedule-manifests.yml
-{{- end }}
-{{- if or (index .spec.distribution.modules.dr.velero.schedules "ttl") (and (index .spec.distribution.modules.dr.velero.schedules "cron") (index .spec.distribution.modules.dr.velero.schedules.cron "full")) }}
   - patches/velero-schedule-full.yml
 {{- end }}
-{{- end }}
 
 {{- if eq .spec.distribution.common.provider.type "none" }}
 {{- if eq .spec.distribution.modules.dr.velero.backend "externalEndpoint" }}

diff --git a/templates/distribution/manifests/dr/patches/infra-nodes.yml.tpl b/templates/distribution/manifests/dr/patches/infra-nodes.yml.tpl
@@ -61,4 +61,21 @@ spec:
         {{ template "tolerations" $veleroArgs }}
 
 {{- end }}
+
+{{- if .spec.distribution.modules.dr.velero.snapshotController.install }}
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: snapshot-controller
+  namespace: kube-system
+spec:
+  template:
+    spec:
+      nodeSelector:
+        {{ template "nodeSelector" $veleroArgs }}
+      tolerations:
+        {{ template "tolerations" $veleroArgs }}
+{{- end }}
+
 {{- end }}
diff --git a/templates/distribution/manifests/dr/patches/velero-schedule-full.yml.tpl b/templates/distribution/manifests/dr/patches/velero-schedule-full.yml.tpl
@@ -2,19 +2,15 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-{{- if or (index .spec.distribution.modules.dr.velero.schedules "ttl") (and (index .spec.distribution.modules.dr.velero.schedules "cron") (index .spec.distribution.modules.dr.velero.schedules.cron "full")) }}
 ---
 apiVersion: velero.io/v1
 kind: Schedule
 metadata:
   name: full
   namespace: kube-system
 spec:
-  {{- if and (index .spec.distribution.modules.dr.velero.schedules "cron") (index .spec.distribution.modules.dr.velero.schedules.cron "full") }}
-  schedule: {{ .spec.distribution.modules.dr.velero.schedules.cron.full }}
-  {{- end }}
-  {{- if index .spec.distribution.modules.dr.velero.schedules "ttl" }}
+  schedule: "{{ .spec.distribution.modules.dr.velero.schedules.definitions.full.schedule }}"
   template:
-    ttl: {{ .spec.distribution.modules.dr.velero.schedules.ttl }}
-  {{- end }}
-{{- end }}
+    ttl: "{{ .spec.distribution.modules.dr.velero.schedules.definitions.full.ttl }}"
+    snapshotMoveData: {{ .spec.distribution.modules.dr.velero.schedules.definitions.full.snapshotMoveData }}
+
diff --git a/templates/distribution/manifests/dr/patches/velero-schedule-manifests.yml.tpl b/templates/distribution/manifests/dr/patches/velero-schedule-manifests.yml.tpl
@@ -2,19 +2,13 @@
 # Use of this source code is governed by a BSD-style
 # license that can be found in the LICENSE file.
 
-{{- if or (index .spec.distribution.modules.dr.velero.schedules "ttl") (and (index .spec.distribution.modules.dr.velero.schedules "cron") (index .spec.distribution.modules.dr.velero.schedules.cron "manifests")) }}
 ---
 apiVersion: velero.io/v1
 kind: Schedule
 metadata:
   name: manifests
   namespace: kube-system
 spec:
-  {{- if and (index .spec.distribution.modules.dr.velero.schedules "cron") (index .spec.distribution.modules.dr.velero.schedules.cron "manifests") }}
-  schedule: {{ .spec.distribution.modules.dr.velero.schedules.cron.manifests }}
-  {{- end }}
-  {{- if index .spec.distribution.modules.dr.velero.schedules "ttl" }}
+  schedule: "{{ .spec.distribution.modules.dr.velero.schedules.definitions.manifests.schedule }}"
   template:
-    ttl: {{ .spec.distribution.modules.dr.velero.schedules.ttl }}
-  {{- end }}
-{{- end }}
+    ttl: "{{ .spec.distribution.modules.dr.velero.schedules.definitions.manifests.ttl }}"
diff --git a/templates/distribution/manifests/dr/resources/volumeSnapshotLocation.yaml.tpl b/templates/distribution/manifests/dr/resources/volumeSnapshotLocation.yaml.tpl
@@ -0,0 +1,16 @@
+# Copyright (c) 2017-present SIGHUP s.r.l All rights reserved.
+# Use of this source code is governed by a BSD-style
+# license that can be found in the LICENSE file.
+
+---
+apiVersion: velero.io/v1
+kind: VolumeSnapshotLocation
+metadata:
+  name: default
+  namespace: kube-system
+  labels:
+    k8s-app: velero
+spec:
+  config:
+    region: custom
+  provider: aws