Merge pull request #155 from projectsyn/fix/restart-holder-suppress-e…

…rror

Ignore `kubectl` error output when extracting current holder pod generation

component/restart-holder-ds.libsonnet

@@ -39,8 +39,11 @@ local script = |||
   while true; do
     # assumption: holder plugin daemonset is called
     # `csi-cephfsplugin-holder-${cephcluster:name}`
-    cephfs_holder_wanted_gen=$(kubectl get ds csi-cephfsplugin-holder-%(cephcluster_name)s -ojsonpath='{.metadata.generation}')
-    rbd_holder_wanted_gen=$(kubectl get ds csi-rbdplugin-holder-%(cephcluster_name)s -ojsonpath='{.metadata.generation}')
+    # note: we don't care about the value of the variable if the daemonset
+    # isn't there, since we'll check for pods in a K8s `List` which will
+    # simply be empty if the plugin isn't enabled.
+    cephfs_holder_wanted_gen=$(kubectl get ds csi-cephfsplugin-holder-%(cephcluster_name)s -ojsonpath='{.metadata.generation}' 2>/dev/null)
+    rbd_holder_wanted_gen=$(kubectl get ds csi-rbdplugin-holder-%(cephcluster_name)s -ojsonpath='{.metadata.generation}' 2>/dev/null)
     needs_update=$( (\
       kubectl get pods -l app=csi-cephfsplugin-holder --field-selector spec.nodeName=${NODE_NAME} -ojson |\
         jq --arg wanted_gen ${cephfs_holder_wanted_gen} \
@@ -86,11 +89,19 @@ local daemonset = kube.DaemonSet('syn-holder-updater') {
         'non-daemonset pods are running on the node) and then deletes any ' +
         'outdated csi holder pods. Outdated holder pods are identified by ' +
         'comparing the DaemonSet generation with the pod generation.',
+      // set sync wave 10 for the daemonset to ensure that the ConfigMap is
+      // updated first.
+      'argocd.argoproj.io/sync-wave': '10',
     },
     namespace: params.namespace,
   },
   spec+: {
     template+: {
+      metadata+: {
+        annotations+: {
+          'script-checksum': std.md5(script),
+        },
+      },
       spec+: {
         serviceAccountName: serviceaccount.metadata.name,
         containers_: {

tests/golden/cephfs/rook-ceph/rook-ceph/50_restart_holder_ds.yaml

@@ -57,8 +57,11 @@ data:
     while true; do
       # assumption: holder plugin daemonset is called
       # `csi-cephfsplugin-holder-${cephcluster:name}`
-      cephfs_holder_wanted_gen=$(kubectl get ds csi-cephfsplugin-holder-cluster -ojsonpath='{.metadata.generation}')
-      rbd_holder_wanted_gen=$(kubectl get ds csi-rbdplugin-holder-cluster -ojsonpath='{.metadata.generation}')
+      # note: we don't care about the value of the variable if the daemonset
+      # isn't there, since we'll check for pods in a K8s `List` which will
+      # simply be empty if the plugin isn't enabled.
+      cephfs_holder_wanted_gen=$(kubectl get ds csi-cephfsplugin-holder-cluster -ojsonpath='{.metadata.generation}' 2>/dev/null)
+      rbd_holder_wanted_gen=$(kubectl get ds csi-rbdplugin-holder-cluster -ojsonpath='{.metadata.generation}' 2>/dev/null)
       needs_update=$( (\
         kubectl get pods -l app=csi-cephfsplugin-holder --field-selector spec.nodeName=${NODE_NAME} -ojson |\
           jq --arg wanted_gen ${cephfs_holder_wanted_gen} \
@@ -100,6 +103,7 @@ apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   annotations:
+    argocd.argoproj.io/sync-wave: '10'
     syn.tools/description: DaemonSet which waits for node to be drained (by waiting
       until no non-daemonset pods are running on the node) and then deletes any outdated
       csi holder pods. Outdated holder pods are identified by comparing the DaemonSet
@@ -120,7 +124,8 @@ spec:
       name: syn-holder-updater
   template:
     metadata:
-      annotations: {}
+      annotations:
+        script-checksum: 488da91788ef6e501cece9d3d67ff8b0
       labels:
         app.kubernetes.io/component: rook-ceph
         app.kubernetes.io/managed-by: commodore

tests/golden/defaults/rook-ceph/rook-ceph/50_restart_holder_ds.yaml

@@ -57,8 +57,11 @@ data:
     while true; do
       # assumption: holder plugin daemonset is called
       # `csi-cephfsplugin-holder-${cephcluster:name}`
-      cephfs_holder_wanted_gen=$(kubectl get ds csi-cephfsplugin-holder-cluster -ojsonpath='{.metadata.generation}')
-      rbd_holder_wanted_gen=$(kubectl get ds csi-rbdplugin-holder-cluster -ojsonpath='{.metadata.generation}')
+      # note: we don't care about the value of the variable if the daemonset
+      # isn't there, since we'll check for pods in a K8s `List` which will
+      # simply be empty if the plugin isn't enabled.
+      cephfs_holder_wanted_gen=$(kubectl get ds csi-cephfsplugin-holder-cluster -ojsonpath='{.metadata.generation}' 2>/dev/null)
+      rbd_holder_wanted_gen=$(kubectl get ds csi-rbdplugin-holder-cluster -ojsonpath='{.metadata.generation}' 2>/dev/null)
       needs_update=$( (\
         kubectl get pods -l app=csi-cephfsplugin-holder --field-selector spec.nodeName=${NODE_NAME} -ojson |\
           jq --arg wanted_gen ${cephfs_holder_wanted_gen} \
@@ -100,6 +103,7 @@ apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   annotations:
+    argocd.argoproj.io/sync-wave: '10'
     syn.tools/description: DaemonSet which waits for node to be drained (by waiting
       until no non-daemonset pods are running on the node) and then deletes any outdated
       csi holder pods. Outdated holder pods are identified by comparing the DaemonSet
@@ -120,7 +124,8 @@ spec:
       name: syn-holder-updater
   template:
     metadata:
-      annotations: {}
+      annotations:
+        script-checksum: 488da91788ef6e501cece9d3d67ff8b0
       labels:
         app.kubernetes.io/component: rook-ceph
         app.kubernetes.io/managed-by: commodore

tests/golden/openshift4/rook-ceph/rook-ceph/50_restart_holder_ds.yaml

@@ -57,8 +57,11 @@ data:
     while true; do
       # assumption: holder plugin daemonset is called
       # `csi-cephfsplugin-holder-${cephcluster:name}`
-      cephfs_holder_wanted_gen=$(kubectl get ds csi-cephfsplugin-holder-cluster -ojsonpath='{.metadata.generation}')
-      rbd_holder_wanted_gen=$(kubectl get ds csi-rbdplugin-holder-cluster -ojsonpath='{.metadata.generation}')
+      # note: we don't care about the value of the variable if the daemonset
+      # isn't there, since we'll check for pods in a K8s `List` which will
+      # simply be empty if the plugin isn't enabled.
+      cephfs_holder_wanted_gen=$(kubectl get ds csi-cephfsplugin-holder-cluster -ojsonpath='{.metadata.generation}' 2>/dev/null)
+      rbd_holder_wanted_gen=$(kubectl get ds csi-rbdplugin-holder-cluster -ojsonpath='{.metadata.generation}' 2>/dev/null)
       needs_update=$( (\
         kubectl get pods -l app=csi-cephfsplugin-holder --field-selector spec.nodeName=${NODE_NAME} -ojson |\
           jq --arg wanted_gen ${cephfs_holder_wanted_gen} \
@@ -100,6 +103,7 @@ apiVersion: apps/v1
 kind: DaemonSet
 metadata:
   annotations:
+    argocd.argoproj.io/sync-wave: '10'
     syn.tools/description: DaemonSet which waits for node to be drained (by waiting
       until no non-daemonset pods are running on the node) and then deletes any outdated
       csi holder pods. Outdated holder pods are identified by comparing the DaemonSet
@@ -120,7 +124,8 @@ spec:
       name: syn-holder-updater
   template:
     metadata:
-      annotations: {}
+      annotations:
+        script-checksum: 488da91788ef6e501cece9d3d67ff8b0
       labels:
         app.kubernetes.io/component: rook-ceph
         app.kubernetes.io/managed-by: commodore