Reorganize ConfigMap data gatherer in disco-agent and update machinehub example

Author: Atanas Chuchev

deploy/charts/disco-agent/templates/configmap.yaml

@@ -40,14 +40,6 @@ data:
         resource-type:
           resource: serviceaccounts
           version: v1
-    - kind: k8s-dynamic
-      name: ark/configmaps
-      config:
-        resource-type:
-          resource: configmaps
-          version: v1
-        label-selectors:
-        - conjur.org/name=conjur-connect-configmap
     - kind: k8s-dynamic
       name: ark/roles
       config:
@@ -117,3 +109,11 @@ data:
         resource-type:
           version: v1
           resource: pods
+    - kind: k8s-dynamic
+      name: ark/configmaps
+      config:
+        resource-type:
+          resource: configmaps
+          version: v1
+        label-selectors:
+        - conjur.org/name=conjur-connect-configmap

deploy/charts/disco-agent/tests/__snapshot__/configmap_test.yaml.snap

@@ -28,14 +28,6 @@ custom-cluster-description:
             resource-type:
               resource: serviceaccounts
               version: v1
-        - kind: k8s-dynamic
-          name: ark/configmaps
-          config:
-            resource-type:
-              resource: configmaps
-              version: v1
-            label-selectors:
-            - conjur.org/name=conjur-connect-configmap
         - kind: k8s-dynamic
           name: ark/roles
           config:
@@ -105,6 +97,14 @@ custom-cluster-description:
             resource-type:
               version: v1
               resource: pods
+        - kind: k8s-dynamic
+          name: ark/configmaps
+          config:
+            resource-type:
+              resource: configmaps
+              version: v1
+            label-selectors:
+            - conjur.org/name=conjur-connect-configmap
     kind: ConfigMap
     metadata:
       labels:
@@ -145,14 +145,6 @@ custom-cluster-name:
             resource-type:
               resource: serviceaccounts
               version: v1
-        - kind: k8s-dynamic
-          name: ark/configmaps
-          config:
-            resource-type:
-              resource: configmaps
-              version: v1
-            label-selectors:
-            - conjur.org/name=conjur-connect-configmap
         - kind: k8s-dynamic
           name: ark/roles
           config:
@@ -222,6 +214,14 @@ custom-cluster-name:
             resource-type:
               version: v1
               resource: pods
+        - kind: k8s-dynamic
+          name: ark/configmaps
+          config:
+            resource-type:
+              resource: configmaps
+              version: v1
+            label-selectors:
+            - conjur.org/name=conjur-connect-configmap
     kind: ConfigMap
     metadata:
       labels:
@@ -262,14 +262,6 @@ custom-period:
             resource-type:
               resource: serviceaccounts
               version: v1
-        - kind: k8s-dynamic
-          name: ark/configmaps
-          config:
-            resource-type:
-              resource: configmaps
-              version: v1
-            label-selectors:
-            - conjur.org/name=conjur-connect-configmap
         - kind: k8s-dynamic
           name: ark/roles
           config:
@@ -339,6 +331,14 @@ custom-period:
             resource-type:
               version: v1
               resource: pods
+        - kind: k8s-dynamic
+          name: ark/configmaps
+          config:
+            resource-type:
+              resource: configmaps
+              version: v1
+            label-selectors:
+            - conjur.org/name=conjur-connect-configmap
     kind: ConfigMap
     metadata:
       labels:
@@ -379,14 +379,6 @@ defaults:
             resource-type:
               resource: serviceaccounts
               version: v1
-        - kind: k8s-dynamic
-          name: ark/configmaps
-          config:
-            resource-type:
-              resource: configmaps
-              version: v1
-            label-selectors:
-            - conjur.org/name=conjur-connect-configmap
         - kind: k8s-dynamic
           name: ark/roles
           config:
@@ -456,6 +448,14 @@ defaults:
             resource-type:
               version: v1
               resource: pods
+        - kind: k8s-dynamic
+          name: ark/configmaps
+          config:
+            resource-type:
+              resource: configmaps
+              version: v1
+            label-selectors:
+            - conjur.org/name=conjur-connect-configmap
     kind: ConfigMap
     metadata:
       labels:

examples/machinehub.yaml

@@ -41,16 +41,6 @@ data-gatherers:
       resource: serviceaccounts
       version: v1
 
-# Gather Kubernetes config maps with specific conjur.org label
-- name: ark/configmaps
-  kind: k8s-dynamic
-  config:
-    resource-type:
-      resource: configmaps
-      version: v1
-    label-selectors:
-    - conjur.org/name=conjur-connect-configmap
-
 # Gather Kubernetes roles
 - name: ark/roles
   kind: k8s-dynamic
@@ -139,3 +129,13 @@ data-gatherers:
     resource-type:
       version: v1
       resource: pods
+
+# Gather Kubernetes config maps with specific conjur.org label
+- name: ark/configmaps
+  kind: k8s-dynamic
+  config:
+    resource-type:
+      resource: configmaps
+      version: v1
+    label-selectors:
+    - conjur.org/name=conjur-connect-configmap