Merge branch '999-test-velero-in-ci' into 'main'

Resolve "Test velero in CI"

Closes #999

See merge request stackspin/stackspin!797

.gitlab-ci.yml

@@ -115,6 +115,18 @@ include:
     - if: '$CI_COMMIT_MESSAGE =~ /TRIGGER_JOBS=.*enable-single-sign-on/'
     - if: '$CI_COMMIT_BRANCH == "main"'
 
+.velero_rules:
+  rules:
+    - changes:
+        - flux2/apps/$RESOURCE/*.yaml
+        - flux2/cluster/optional/$RESOURCE/*.yaml
+        - flux2/core/base/sources/vmware-tanzu.yaml
+        - install/install-app.sh
+        - install/flux-version-check.sh
+    - if: '$TRIGGER_JOBS =~ /enable-velero/'
+    - if: '$CI_COMMIT_MESSAGE =~ /TRIGGER_JOBS=.*enable-velero/'
+    - if: '$CI_COMMIT_BRANCH == "main"'
+
 .wekan_rules:
   rules:
     - changes:
@@ -366,7 +378,7 @@ install-stackspin:
     - kubectl apply -k ${CLUSTER_DIR}
     # Add an override so cert-manager uses the SSL.com ClusterIssuer
     - kubectl create namespace cert-manager
-    - kubectl apply -n cert-manager -f ./install/overrides/stackspin-cert-manager-override.yaml
+    - kubectl apply -f ./install/overrides/stackspin-cert-manager-override.yaml
     # Install flux and general, non-app specific secrets
     - bash ./install/install-stackspin.sh
   extends:
@@ -374,6 +386,7 @@ install-stackspin:
     - .general_rules
   interruptible: true
 
+
 .enable_app_template:
   stage: install-stackspin
   needs:
@@ -383,7 +396,7 @@ install-stackspin:
     # Add optional override values we need for the CI pipeline only
     - >
       [ -f ./install/overrides/stackspin-${RESOURCE}-override.yaml ] &&
-        kubectl apply -n stackspin-apps -f ./install/overrides/stackspin-${RESOURCE}-override.yaml
+        kubectl apply -f ./install/overrides/stackspin-${RESOURCE}-override.yaml
     - bash ./install/install-app.sh ${RESOURCE}
   interruptible: true
 
@@ -401,6 +414,13 @@ enable-nextcloud:
     - .enable_app_template
     - .nextcloud_rules
 
+enable-velero:
+  variables:
+    RESOURCE: "velero"
+  extends:
+    - .enable_app_template
+    - .velero_rules
+
 enable-wekan:
   variables:
     RESOURCE: "wekan"
@@ -551,6 +571,16 @@ nextcloud-kustomization-ready:
     - .app-kustomization-ready
     - .nextcloud_rules
 
+velero-kustomization-ready:
+  needs:
+    - job: install-stackspin
+    - job: enable-velero
+  variables:
+    RESOURCE: "velero"
+  extends:
+    - .app-kustomization-ready
+    - .velero_rules
+
 wekan-kustomization-ready:
   needs:
     - job: install-stackspin

.gitlab/commit_template.txt

@@ -9,7 +9,7 @@
 # TRIGGER_JOBS=enable-nextcloud
 #
 # or trigger all jobs:
-# TRIGGER_JOBS=enable-monitoring,enable-nextcloud,enable-wekan,enable-wordpress,enable-zulip
+# TRIGGER_JOBS=enable-monitoring,enable-nextcloud,enable-velero,enable-wekan,enable-wordpress,enable-zulip
 #
 # Reference issue number with one of:
 #

docs/design.md

@@ -115,7 +115,8 @@ that is responsible for these updates.
 
 Flux 2 tracks all the files in the `flux2` directory of the [Stackspin code
 repository](https://open.greenhost.net/stackspin/stackspin). Once changes
-are pushd the branch that Flux tracks, the changes are applied to the cluster.
+are pushed to the branch that Flux tracks, the changes are applied to the
+cluster.
 
 We use Flux 2 in "read only" mode, which means that your Stackspin cluster
 does not push changes to our Git repository. You can read more about Flux 2 and

install/overrides/stackspin-cert-manager-override.yaml

@@ -2,6 +2,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
+  namespace: cert-manager
   name: stackspin-cert-manager-override
 data:
   values.yaml: |

install/overrides/stackspin-nextcloud-override.yaml

@@ -2,6 +2,7 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
+  namespace: stackspin-apps
   name: stackspin-nextcloud-override
 data:
   values.yaml: |

install/overrides/stackspin-velero-override.yaml

+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  namespace: velero
+  name: stackspin-velero-override
+data:
+  values.yaml: |
+    # Do not create backups automatically in CI.
+    # Note: setting this to `{}` doesn't override the stackspin default due to
+    # helm merging the dictionaries, not replacing one by the other.
+    schedules: null