feat: support Selectors field in kubernetes SD

Related-to #5711 Signed-off-by: Jayapriya Pai <slashpai9@gmail.com>
prometheus-operator · Oct 31, 2023 · b82ed76 · b82ed76
1 parent 18a2bad
commit b82ed76
Show file tree

Hide file tree

Showing 16 changed files with 428 additions and 17 deletions.
diff --git a/Documentation/api.md b/Documentation/api.md
diff --git a/bundle.yaml b/bundle.yaml
diff --git a/example/prometheus-operator-crd-full/monitoring.coreos.com_scrapeconfigs.yaml b/example/prometheus-operator-crd-full/monitoring.coreos.com_scrapeconfigs.yaml
diff --git a/example/prometheus-operator-crd/monitoring.coreos.com_scrapeconfigs.yaml b/example/prometheus-operator-crd/monitoring.coreos.com_scrapeconfigs.yaml
diff --git a/jsonnet/prometheus-operator/scrapeconfigs-crd.json b/jsonnet/prometheus-operator/scrapeconfigs-crd.json
@@ -1009,11 +1009,40 @@
                       "description": "KubernetesSDConfig allows retrieving scrape targets from Kubernetes' REST API. See https://prometheus.io/docs/prometheus/latest/configuration/configuration/#kubernetes_sd_config",
                       "properties": {
                         "role": {
-                          "description": "Role of the Kubernetes entities that should be discovered. Currently the only supported role is \"Node\".",
+                          "description": "Role of the Kubernetes entities that should be discovered.",
                           "enum": [
-                            "Node"
+                            "Node",
+                            "node"
                           ],
                           "type": "string"
+                        },
+                        "selectors": {
+                          "description": "Selector to select objects.",
+                          "items": {
+                            "description": "K8SSelectorConfig is Kubernetes Selector Config",
+                            "properties": {
+                              "field": {
+                                "type": "string"
+                              },
+                              "label": {
+                                "type": "string"
+                              },
+                              "role": {
+                                "description": "K8SRole is role of the service in Kubernetes. Currently the only supported role is \"Node\".",
+                                "enum": [
+                                  "Node",
+                                  "node"
+                                ],
+                                "type": "string"
+                              }
+                            },
+                            "type": "object"
+                          },
+                          "type": "array",
+                          "x-kubernetes-list-map-keys": [
+                            "role"
+                          ],
+                          "x-kubernetes-list-type": "map"
                         }
                       },
                       "required": [

diff --git a/pkg/apis/monitoring/v1alpha1/scrapeconfig_types.go b/pkg/apis/monitoring/v1alpha1/scrapeconfig_types.go
@@ -40,6 +40,19 @@ type EC2Filter struct {
 	Values []string `json:"values"`
 }
 
+// K8SRole is role of the service in Kubernetes.
+// Currently the only supported role is "Node".
+// +kubebuilder:validation:Enum=Node;node
+type K8SRole string
+
+// K8SSelectorConfig is Kubernetes Selector Config
+type K8SSelectorConfig struct {
+	// +kubebuilder:validation:Required
+	Role  K8SRole `json:"role,omitempty"`
+	Label string  `json:"label,omitempty"`
+	Field string  `json:"field,omitempty"`
+}
+
 // +genclient
 // +k8s:openapi-gen=true
 // +kubebuilder:resource:categories="prometheus-operator",shortName="scfg"
@@ -225,10 +238,13 @@ type HTTPSDConfig struct {
 // +k8s:openapi-gen=true
 type KubernetesSDConfig struct {
 	// Role of the Kubernetes entities that should be discovered.
-	// Currently the only supported role is "Node".
-	// +kubebuilder:validation:Enum=Node
 	// +required
-	Role string `json:"role"`
+	Role K8SRole `json:"role"`
+	// Selector to select objects.
+	// +optional
+	// +listType=map
+	// +listMapKey=role
+	Selectors []K8SSelectorConfig `json:"selectors,omitempty"`
 }
 
 // ConsulSDConfig defines a Consul service discovery configuration

diff --git a/pkg/apis/monitoring/v1alpha1/zz_generated.deepcopy.go b/pkg/apis/monitoring/v1alpha1/zz_generated.deepcopy.go
diff --git a/pkg/client/applyconfiguration/monitoring/v1alpha1/k8sselectorconfig.go b/pkg/client/applyconfiguration/monitoring/v1alpha1/k8sselectorconfig.go