Merge pull request #162 from projectsyn/fix/crd-null-values

Fix CRDs containing null documents

Author: DebakelOrakel

class/backup-k8up.yml

@@ -6,19 +6,11 @@ parameters:
         chart_name: k8up
         version: ${backup_k8up:charts:k8up:version}
         output_path: dependencies/backup-k8up/helmcharts/v${backup_k8up:charts:k8up:version}
-      - type: https
-        source: https://github.com/vshn/k8up/releases/download/${backup_k8up:images:k8up:tag}/k8up-crd.yaml
-        output_path: dependencies/backup-k8up/crds/${backup_k8up:images:k8up:tag}/02_k8up_crds.yaml
     compile:
       - input_paths:
           - backup-k8up/component/app.jsonnet
         input_type: jsonnet
         output_path: .
-      - input_paths:
-          - backup-k8up/component/crds.jsonnet
-        output_path: ${_instance}
-        input_type: jsonnet
-        output_type: yaml
       - output_path: ${_instance}/01_k8up_helmchart
         input_type: helm
         output_type: yaml
@@ -39,3 +31,6 @@ parameters:
         - type: jsonnet
           filter: postprocess/optional_global_config.jsonnet
           path: ${_instance}/01_k8up_helmchart/k8up/templates
+        - type: jsonnet
+          path: ${_instance}/01_k8up_helmchart/k8up/crds
+          filter: postprocess/patch_crd.jsonnet

component/crds.jsonnet

@@ -0,0 +1,32 @@
+local com = import 'lib/commodore.libjsonnet';
+
+local crd_files = [
+  'k8up.io_archives',
+  'k8up.io_backups',
+  'k8up.io_checks',
+  'k8up.io_podconfigs',
+  'k8up.io_prebackuppods',
+  'k8up.io_prunes',
+  'k8up.io_restores',
+  'k8up.io_schedules',
+  'k8up.io_snapshots',
+];
+
+local crds = [
+  {
+    name: crd_file,
+    content: com.yaml_load_all(std.extVar('output_path') + '/' + crd_file + '.yaml'),
+  }
+  for crd_file in crd_files
+];
+
+{
+  [crd.name]: std.filter(function(it) it != null, crd.content)[0] {
+    metadata+: {
+      annotations+: {
+        'argocd.argoproj.io/sync-options': 'ServerSideApply=true',
+      },
+    },
+  }
+  for crd in crds
+}

postprocess/patch_crd.jsonnet

@@ -1,9 +1,8 @@
-null
----
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
+    argocd.argoproj.io/sync-options: ServerSideApply=true
     controller-gen.kubebuilder.io/version: v0.14.0
   name: archives.k8up.io
 spec:

tests/golden/defaults/backup-k8up/backup-k8up/01_k8up_helmchart/k8up/crds/k8up.io_archives.yaml

@@ -1,9 +1,8 @@
-null
----
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
+    argocd.argoproj.io/sync-options: ServerSideApply=true
     controller-gen.kubebuilder.io/version: v0.14.0
   name: backups.k8up.io
 spec:

tests/golden/defaults/backup-k8up/backup-k8up/01_k8up_helmchart/k8up/crds/k8up.io_backups.yaml

@@ -1,9 +1,8 @@
-null
----
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
+    argocd.argoproj.io/sync-options: ServerSideApply=true
     controller-gen.kubebuilder.io/version: v0.14.0
   name: checks.k8up.io
 spec:

tests/golden/defaults/backup-k8up/backup-k8up/01_k8up_helmchart/k8up/crds/k8up.io_checks.yaml

@@ -1,9 +1,8 @@
-null
----
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
+    argocd.argoproj.io/sync-options: ServerSideApply=true
     controller-gen.kubebuilder.io/version: v0.14.0
   name: podconfigs.k8up.io
 spec:

tests/golden/defaults/backup-k8up/backup-k8up/01_k8up_helmchart/k8up/crds/k8up.io_podconfigs.yaml

@@ -1,9 +1,8 @@
-null
----
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
+    argocd.argoproj.io/sync-options: ServerSideApply=true
     controller-gen.kubebuilder.io/version: v0.14.0
   name: prebackuppods.k8up.io
 spec:

tests/golden/defaults/backup-k8up/backup-k8up/01_k8up_helmchart/k8up/crds/k8up.io_prebackuppods.yaml

@@ -1,9 +1,8 @@
-null
----
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
+    argocd.argoproj.io/sync-options: ServerSideApply=true
     controller-gen.kubebuilder.io/version: v0.14.0
   name: prunes.k8up.io
 spec:

tests/golden/defaults/backup-k8up/backup-k8up/01_k8up_helmchart/k8up/crds/k8up.io_prunes.yaml

@@ -1,9 +1,8 @@
-null
----
 apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
+    argocd.argoproj.io/sync-options: ServerSideApply=true
     controller-gen.kubebuilder.io/version: v0.14.0
   name: restores.k8up.io
 spec: