Merge pull request #88 from appuio/feat/support-serverside-apply

Use ServerSideApply for ArgoCD

Author: DebakelOrakel

component/app.jsonnet

@@ -3,7 +3,15 @@ local inv = kap.inventory();
 local params = inv.parameters.openshift4_console;
 local argocd = import 'lib/argocd.libjsonnet';
 
-local app = argocd.App('openshift4-console', params.namespace, secrets=false);
+local app = argocd.App('openshift4-console', params.namespace, secrets=false) {
+  spec+: {
+    syncPolicy+: {
+      syncOptions+: [
+        'ServerSideApply=true',
+      ],
+    },
+  },
+};
 
 local appPath =
   local project = std.get(std.get(app, 'spec', {}), 'project', 'syn');

component/kube-ssa-compat.libsonnet

@@ -0,0 +1,16 @@
+// Need to use the full path here as the deprecation warning injection in
+// https://github.com/projectsyn/commodore/blob/master/commodore/lib/kube.libsonnet
+// breaks the topmost reference ($).
+local kube = import 'lib/kube-libsonnet/kube.libsonnet';
+
+kube {
+  _Object(apiVersion, kind, name):: {
+    local this = self,
+    apiVersion: apiVersion,
+    kind: kind,
+    metadata: {
+      name: name,
+      labels: { name: std.join('-', std.split(this.metadata.name, ':')) },
+    },
+  },
+}

component/links.jsonnet

@@ -1,5 +1,5 @@
+local kube = import 'kube-ssa-compat.libsonnet';
 local kap = import 'lib/kapitan.libjsonnet';
-local kube = import 'lib/kube.libjsonnet';
 
 local inv = kap.inventory();
 local params = inv.parameters.openshift4_console;

component/main.jsonnet

@@ -1,6 +1,6 @@
+local kube = import 'kube-ssa-compat.libsonnet';
 local esp = import 'lib/espejote.libsonnet';
 local kap = import 'lib/kapitan.libjsonnet';
-local kube = import 'lib/kube.libjsonnet';
 
 local inv = kap.inventory();
 local params = inv.parameters.openshift4_console;

component/notifications.libsonnet

@@ -1,6 +1,6 @@
+local kube = import 'kube-ssa-compat.libsonnet';
 local com = import 'lib/commodore.libjsonnet';
 local kap = import 'lib/kapitan.libjsonnet';
-local kube = import 'lib/kube.libjsonnet';
 
 local inv = kap.inventory();
 local params = inv.parameters.openshift4_console;

component/tls.libsonnet

@@ -1,7 +1,7 @@
+local kube = import 'kube-ssa-compat.libsonnet';
 local cm = import 'lib/cert-manager.libsonnet';
 local com = import 'lib/commodore.libjsonnet';
 local kap = import 'lib/kapitan.libjsonnet';
-local kube = import 'lib/kube.libjsonnet';
 
 local inv = kap.inventory();
 local params = inv.parameters.openshift4_console;

tests/custom-route-managed-tls.yml

@@ -5,7 +5,7 @@ parameters:
   kapitan:
     dependencies:
       - type: https
-        source: https://raw.githubusercontent.com/projectsyn/component-cert-manager/v2.2.0/lib/cert-manager.libsonnet
+        source: https://raw.githubusercontent.com/projectsyn/component-cert-manager/master/lib/cert-manager.libsonnet
         output_path: vendor/lib/cert-manager.libsonnet
       - type: https
         source: https://raw.githubusercontent.com/projectsyn/component-espejote/master/lib/espejote.libsonnet

tests/golden/custom-links/openshift4-console/apps/openshift4-console.yaml

@@ -0,0 +1,4 @@
+spec:
+  syncPolicy:
+    syncOptions:
+      - ServerSideApply=true

tests/golden/custom-links/openshift4-console/openshift4-console/10_console.yaml

@@ -1,7 +1,6 @@
 apiVersion: operator.openshift.io/v1
 kind: Console
 metadata:
-  annotations: {}
   labels:
     name: cluster
   name: cluster

tests/golden/custom-links/openshift4-console/openshift4-console/links/homepage.yaml

@@ -1,7 +1,6 @@
 apiVersion: console.openshift.io/v1
 kind: ConsoleLink
 metadata:
-  annotations: {}
   labels:
     name: homepage
   name: homepage