OPS-2727: add backup by ns

fix some errors

disable velero backupby default

update README

fix typo

add checks

only backup ns

fix name of schedule

Author: LiseMachetel

charts/linkurious-enterprise/Chart.yaml

@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.2.42
+version: 0.2.43
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

charts/linkurious-enterprise/README.md

@@ -1,6 +1,6 @@
 # linkurious-enterprise
 
-![Version: 0.2.36](https://img.shields.io/badge/Version-0.2.36-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.10.18](https://img.shields.io/badge/AppVersion-2.10.18-informational?style=flat-square)
+![Version: 0.2.43](https://img.shields.io/badge/Version-0.2.43-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.10.18](https://img.shields.io/badge/AppVersion-2.10.18-informational?style=flat-square)
 
 A Helm chart for Linkurious Enterprise
 
@@ -31,7 +31,7 @@ To install a very basic version of Linkurious enterprise, please set your privat
  and then run:
 
 ```console
-helm upgrade --install my-release linkurious-enterprise-0.2.36.tgz -f chart-value-examples/basic/values.yaml
+helm upgrade --install my-release linkurious-enterprise-0.2.43.tgz -f chart-value-examples/basic/values.yaml
 ```
 
 ## Values
@@ -52,17 +52,32 @@ helm upgrade --install my-release linkurious-enterprise-0.2.36.tgz -f chart-valu
 | backup.litestream.livenessProbe.failureThreshold | int | `3` |  |
 | backup.litestream.livenessProbe.initialDelaySeconds | int | `5` |  |
 | backup.litestream.livenessProbe.periodSeconds | int | `15` |  |
-| backup.litestream.livenessProbe.timeoutSeconds | int | `5` |  |
+| backup.litestream.livenessProbe.timeoutSeconds | int | `10` |  |
 | backup.litestream.readinessProbe.exec.command[0] | string | `"litestream"` |  |
 | backup.litestream.readinessProbe.exec.command[1] | string | `"snapshots"` |  |
 | backup.litestream.readinessProbe.exec.command[2] | string | `"/data/server/database.sqlite"` |  |
 | backup.litestream.readinessProbe.failureThreshold | int | `3` |  |
 | backup.litestream.readinessProbe.initialDelaySeconds | int | `5` |  |
 | backup.litestream.readinessProbe.periodSeconds | int | `15` |  |
-| backup.litestream.readinessProbe.timeoutSeconds | int | `5` |  |
-| backup.litestream.resources | object | `{}` |  |
+| backup.litestream.readinessProbe.timeoutSeconds | int | `10` |  |
+| backup.litestream.resources.limits.cpu | string | `"1500m"` |  |
+| backup.litestream.resources.limits.memory | string | `"1000Mi"` |  |
+| backup.litestream.resources.requests.cpu | string | `"100m"` |  |
+| backup.litestream.resources.requests.memory | string | `"100Mi"` |  |
 | backup.litestream.secretRef.name | string | `"litestream-lke-secret"` |  |
+| backup.velero.defaultVolumesToFsBackup | bool | `false` |  |
 | backup.velero.enabled | bool | `false` |  |
+| backup.velero.includedResources[0] | string | `"pvc"` |  |
+| backup.velero.includedResources[1] | string | `"pv"` |  |
+| backup.velero.instance | string | `"velero-preprod"` |  |
+| backup.velero.labels."app.kubernetes.io/name" | string | `"linkurious-enterprise"` |  |
+| backup.velero.labelsSelector."app.kubernetes.io/name" | string | `"linkurious-enterprise"` |  |
+| backup.velero.name | string | `"velero"` |  |
+| backup.velero.schedule | string | `"55 3 */2 * *"` |  |
+| backup.velero.skipImmediately | bool | `false` |  |
+| backup.velero.snapshotVolume | bool | `true` |  |
+| backup.velero.ttl | string | `"168h"` |  |
+| backup.velero.veleroNamespace | string | `"backup"` |  |
 | config.access.authRequired | string | `"$ENV:LKE_AUTH_REQUIRED"` |  |
 | config.access.autoRefreshGroupMapping | string | `"$ENV-JSON:LKE_OAUTH2_AUTO_REFRESH_GROUP_MAPPING"` |  |
 | config.access.oauth2.authorizationURL | string | `"$ENV:LKE_OAUTH2_AUTHORIZATION_URL"` |  |
@@ -101,7 +116,7 @@ helm upgrade --install my-release linkurious-enterprise-0.2.36.tgz -f chart-valu
 | ingress.hosts[0].paths[0].pathType | string | `"ImplementationSpecific"` |  |
 | ingress.labels | object | `{}` | Additional ingress labels |
 | ingress.tls[0].secretName | string | `"wildcard-default-cert"` |  |
-| ipWhiteList | object | `{}` |  |
+| ipAllowList | object | `{}` |  |
 | livenessProbe.enabled | bool | `true` | Enable Kubernetes liveness probe for server |
 | livenessProbe.failureThreshold | int | `3` |  |
 | livenessProbe.initialDelaySeconds | int | `10` |  |
@@ -123,6 +138,7 @@ helm upgrade --install my-release linkurious-enterprise-0.2.36.tgz -f chart-valu
 | persistentVolume.annotations | object | `{}` |  |
 | persistentVolume.enabled | bool | `false` | Enable persistent volume for Linkurious server |
 | persistentVolume.size | string | `"5Gi"` |  |
+| plugins.enabled | bool | `true` |  |
 | podAnnotations | object | `{}` |  |
 | podSecurityContext.fsGroup | int | `2000` |  |
 | podSecurityContext.runAsNonRoot | bool | `true` |  |
@@ -139,7 +155,7 @@ helm upgrade --install my-release linkurious-enterprise-0.2.36.tgz -f chart-valu
 | resources | object | `{}` |  |
 | securityContext.allowPrivilegeEscalation | bool | `false` |  |
 | securityContext.capabilities.drop[0] | string | `"ALL"` |  |
-| service | object | `{"metricsPort":9400,"port":80,"type":"ClusterIP"}` | Existing secret to use for license licenseFromSecret: '{{ printf "%s-lke-license-secret" .Release.Name }}' |
+| service | object | `{"annotations":{},"metricsPort":9400,"port":80,"type":"ClusterIP"}` | Existing secret to use for license licenseFromSecret: '{{ printf "%s-lke-license-secret" .Release.Name }}' |
 | serviceAccount.annotations | object | `{}` | Annotations to add to the service account |
 | serviceAccount.create | bool | `false` | Specifies whether a service account should be created |
 | serviceAccount.name | string | `""` | The name of the service account to use. If not set and create is true, a name is generated using the fullname template |

charts/linkurious-enterprise/templates/velero-schedule.yaml

@@ -0,0 +1,54 @@
+{{- if .Values.backup.velero.enabled }}
+{{- if (not (.Capabilities.APIVersions.Has "velero.io/v1")) }}
+    {{- fail "ERROR: You have to deploy velero.io/v1 first or disable velero backup" }}
+{{- end }}
+apiVersion: velero.io/v1
+kind: Schedule
+metadata:
+  name: {{ printf "velero-schedule-%s" $.Release.Namespace }}
+  namespace: {{ .Values.backup.velero.veleroNamespace }}
+  {{- if .Values.backup.velero.annotations }}
+  annotations:
+    {{- toYaml .Values.backup.velero.annotations | nindent 4 }}
+  {{- end }}
+  labels:
+    app.kubernetes.io/name: {{ .Values.backup.velero.name }}
+    app.kubernetes.io/instance: {{ .Values.backup.velero.instance }}
+    app.kubernetes.io/managed-by: {{ $.Release.Service }}
+   {{- if .Values.backup.velero.labels }}
+      {{- toYaml .Values.backup.velero.labels | nindent 4 }}
+    {{- end }}
+
+spec:
+{{- if .Values.backup.velero.paused }}
+  paused: {{ .Values.backup.velero.paused }}
+{{- end }}
+{{- if .Values.backup.velero.useOwnerReferencesInBackup }}
+  useOwnerReferencesInBackup: {{ .Values.backup.velero.useOwnerReferencesInBackup }}
+{{- end }}
+  schedule: {{ .Values.backup.velero.schedule }}
+  skipImmediately: {{ .Values.backup.velero.skipImmediately }}
+  template:
+    defaultVolumesToFsBackup: {{ .Values.backup.velero.defaultVolumesToFsBackup }}
+    includedNamespaces:
+       - {{ $.Release.Namespace }}
+{{- if .Values.backup.velero.includedResources }}
+    includedResources:
+    {{- range .Values.backup.velero.includedResources }}
+      - {{ . }}
+    {{- end }}
+{{- end }}
+{{- if .Values.backup.velero.excludedResources }}
+    excludedResources:
+    {{- range .Values.backup.velero.excludedResources }}
+      - {{ . }}
+    {{- end }}
+{{- end }}
+{{- if .Values.backup.velero.labelsSelector }}
+    labelSelector:
+      matchLabels:
+        {{- toYaml .Values.backup.velero.labelsSelector | nindent 8 }}
+{{- end }}
+    snapshotVolumes: {{ .Values.backup.velero.snapshotVolume }}
+    ttl: {{ .Values.backup.velero.ttl }}
+{{- end }}

charts/linkurious-enterprise/values.yaml

@@ -285,6 +285,24 @@ backup:
   velero:
     ## -- Enable backup for Linkurious server lke-data volume with velero
     enabled: false
+    name: velero
+    instance: velero-preprod
+    veleroNamespace: backup
+    ttl: "168h"
+    includedResources:
+      - pvc
+      - pv
+    #excludedResources:
+    #  - secrets
+    snapshotVolume: true
+    defaultVolumesToFsBackup: false
+    labels:
+      app.kubernetes.io/name: linkurious-enterprise
+    schedule: "55 3 */2 * *"
+    skipImmediately: false
+    labelsSelector:
+      # backup.velero.io/backup-volumes: lke-data
+      app.kubernetes.io/name: linkurious-enterprise
 
 hostAliases: []