Merge pull request #259 from kakkoyun/fix_label_selectors

jsonnet: Fix pod label selector config

deploy/dev.jsonnet

@@ -1,41 +1,41 @@
 function(serverVersion='v0.4.2')
-    local ns = {
-      apiVersion: 'v1',
-      kind: 'Namespace',
-      metadata: {
-        name: 'parca',
-      },
-    };
+  local ns = {
+    apiVersion: 'v1',
+    kind: 'Namespace',
+    metadata: {
+      name: 'parca',
+    },
+  };
 
-    local server = (import 'parca/parca.libsonnet')({
-        name: 'parca',
-        namespace: ns.metadata.name,
-        image: 'ghcr.io/parca-dev/parca:' + serverVersion,
-        version: serverVersion,
-        replicas: 1,
-        corsAllowedOrigins: '*',
-    });
+  local server = (import 'parca/parca.libsonnet')({
+    name: 'parca',
+    namespace: ns.metadata.name,
+    image: 'ghcr.io/parca-dev/parca:' + serverVersion,
+    version: serverVersion,
+    replicas: 1,
+    corsAllowedOrigins: '*',
+  });
 
-    local agent = (import 'parca-agent/parca-agent.libsonnet')({
-      name: 'parca-agent',
-      namespace: ns.metadata.name,
-      version: 'dev',
-      image: 'parca.io/parca/parca-agent:dev',
-      stores: ['%s.%s.svc.cluster.local:%d' % [server.service.metadata.name, server.service.metadata.namespace, server.config.port]],
-      logLevel: 'debug',
-      insecure: true,
-      insecureSkipVerify: true,
-      tempDir: '/tmp',
-    });
+  local agent = (import 'parca-agent/parca-agent.libsonnet')({
+    name: 'parca-agent',
+    namespace: ns.metadata.name,
+    version: 'dev',
+    image: 'parca.io/parca/parca-agent:dev',
+    stores: ['%s.%s.svc.cluster.local:%d' % [server.service.metadata.name, server.service.metadata.namespace, server.config.port]],
+    logLevel: 'debug',
+    insecure: true,
+    insecureSkipVerify: true,
+    tempDir: '/tmp'
+  });
 
-    {
-      '0namespace': ns,
-    } + {
-      ['parca-server-' + name]: server[name]
-      for name in std.objectFields(server)
-      if server[name] != null
-    } + {
-      ['parca-agent-' + name]: agent[name]
-      for name in std.objectFields(agent)
-      if agent[name] != null
-    }
+  {
+    '0namespace': ns,
+  } + {
+    ['parca-server-' + name]: server[name]
+    for name in std.objectFields(server)
+    if server[name] != null
+  } + {
+    ['parca-agent-' + name]: agent[name]
+    for name in std.objectFields(agent)
+    if agent[name] != null
+  }

deploy/lib/parca-agent/parca-agent.libsonnet

@@ -28,7 +28,7 @@ local defaults = {
     'app.kubernetes.io/component': 'observability',
   },
 
-  podLabelSelector:: {},
+  podLabelSelector:: '',
   externalLabels:: {},
 
   securityContext:: {
@@ -205,8 +205,7 @@ function(params) {
         ] else []
       ) + (
         if std.length(pa.config.podLabelSelector) > 0 then [
-          '--pod-label-selector=%s=%s' % [labelName, pa.config.podLabelSelector[labelName]]
-          for labelName in std.objectFields(pa.config.podLabelSelector)
+          '--pod-label-selector=%s' % pa.config.podLabelSelector,
         ] else []
       ) + (
         if pa.config.insecure then [

deploy/main.jsonnet

@@ -28,9 +28,9 @@ function(version='v0.0.1-alpha.3')
     tempDir: '/tmp',
     // Available Options:
     //   samplingRatio: 0.5,
-    //   podLabelSelector: {
-    //       app: 'my-web-app'
-    //   },
+    //   Docs for usage of Label Selector
+    //   https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/#label-selectors
+    //   podLabelSelector: 'app=my-web-app,version=v1',
   });
 
   {