feat: Add support the loadbalancer role in OpenStackSDConfig (#7356)

--------- Signed-off-by: dongjiang <dongjiang1989@126.com> Co-authored-by: M Viswanath Sai <110663831+mviswanathsai@users.noreply.github.com> Co-authored-by: Simon Pasquier <spasquie@redhat.com>
2025-04-21 03:38:43 +00:00 · 2025-02-27 22:59:51 +08:00 · 2025-02-27 22:59:51 +08:00 · 35f6d05105
commit 35f6d05105
parent c6927a2091
13 changed files with 147 additions and 56 deletions
--- a/Documentation/api-reference/api.md
+++ b/Documentation/api-reference/api.md
@ -25864,6 +25864,28 @@ Duration
 <td></td>
 </tr></tbody>
 </table>
+<h3 id="monitoring.coreos.com/v1alpha1.OpenStackRole">OpenStackRole
+(<code>string</code> alias)</h3>
+<p>
+(<em>Appears on:</em><a href="#monitoring.coreos.com/v1alpha1.OpenStackSDConfig">OpenStackSDConfig</a>)
+</p>
+<div>
+</div>
+<table>
+<thead>
+<tr>
+<th>Value</th>
+<th>Description</th>
+</tr>
+</thead>
+<tbody><tr><td><p>&#34;Hypervisor&#34;</p></td>
+<td></td>
+</tr><tr><td><p>&#34;Instance&#34;</p></td>
+<td></td>
+</tr><tr><td><p>&#34;LoadBalancer&#34;</p></td>
+<td></td>
+</tr></tbody>
+</table>
 <h3 id="monitoring.coreos.com/v1alpha1.OpenStackSDConfig">OpenStackSDConfig
 </h3>
 <p>
@ -25885,11 +25907,14 @@ See <a href="https://prometheus.io/docs/prometheus/latest/configuration/configur
 <td>
 <code>role</code><br/>
 <em>
-string
+<a href="#monitoring.coreos.com/v1alpha1.OpenStackRole">
+OpenStackRole
+</a>
 </em>
 </td>
 <td>
 <p>The OpenStack role of entities that should be discovered.</p>
+<p>Note: The <code>LoadBalancer</code> role requires Prometheus &gt;= v3.2.0.</p>
 </td>
 </tr>
 <tr>
--- a/bundle.yaml
+++ b/bundle.yaml
@ -56061,12 +56061,16 @@ spec:
                      minLength: 1
                      type: string
                    role:
-                      description: The OpenStack role of entities that should be discovered.
+                      description: |-
+                        The OpenStack role of entities that should be discovered.
+
+                        Note: The `LoadBalancer` role requires Prometheus >= v3.2.0.
                      enum:
                      - Instance
                      - instance
                      - Hypervisor
                      - hypervisor
+                      - LoadBalancer
                      type: string
                    tlsConfig:
                      description: TLS configuration applying to the target HTTP endpoint.
--- a/example/prometheus-operator-crd-full/monitoring.coreos.com_scrapeconfigs.yaml
+++ b/example/prometheus-operator-crd-full/monitoring.coreos.com_scrapeconfigs.yaml
@ -10834,12 +10834,16 @@ spec:
                      minLength: 1
                      type: string
                    role:
-                      description: The OpenStack role of entities that should be discovered.
+                      description: |-
+                        The OpenStack role of entities that should be discovered.
+
+                        Note: The `LoadBalancer` role requires Prometheus >= v3.2.0.
                      enum:
                      - Instance
                      - instance
                      - Hypervisor
                      - hypervisor
+                      - LoadBalancer
                      type: string
                    tlsConfig:
                      description: TLS configuration applying to the target HTTP endpoint.
--- a/example/prometheus-operator-crd/monitoring.coreos.com_scrapeconfigs.yaml
+++ b/example/prometheus-operator-crd/monitoring.coreos.com_scrapeconfigs.yaml
@ -10835,12 +10835,16 @@ spec:
                      minLength: 1
                      type: string
                    role:
-                      description: The OpenStack role of entities that should be discovered.
+                      description: |-
+                        The OpenStack role of entities that should be discovered.
+
+                        Note: The `LoadBalancer` role requires Prometheus >= v3.2.0.
                      enum:
                      - Instance
                      - instance
                      - Hypervisor
                      - hypervisor
+                      - LoadBalancer
                      type: string
                    tlsConfig:
                      description: TLS configuration applying to the target HTTP endpoint.
--- a/jsonnet/prometheus-operator/scrapeconfigs-crd.json
+++ b/jsonnet/prometheus-operator/scrapeconfigs-crd.json
@ -10249,12 +10249,13 @@
                          "type": "string"
                        },
                        "role": {
-                          "description": "The OpenStack role of entities that should be discovered.",
+                          "description": "The OpenStack role of entities that should be discovered.\n\nNote: The `LoadBalancer` role requires Prometheus >= v3.2.0.",
                          "enum": [
                            "Instance",
                            "instance",
                            "Hypervisor",
-                            "hypervisor"
+                            "hypervisor",
+                            "LoadBalancer"
                          ],
                          "type": "string"
                        },
--- a/pkg/apis/monitoring/v1alpha1/scrapeconfig_types.go
+++ b/pkg/apis/monitoring/v1alpha1/scrapeconfig_types.go
@ -780,14 +780,25 @@ type GCESDConfig struct {
 	TagSeparator *string `json:"tagSeparator,omitempty"`
 }

+type OpenStackRole string
+
+const (
+	OpenStackRoleInstance     OpenStackRole = "Instance"
+	OpenStackRoleHypervisor   OpenStackRole = "Hypervisor"
+	OpenStackRoleLoadBalancer OpenStackRole = "LoadBalancer"
+)
+
 // OpenStackSDConfig allow retrieving scrape targets from OpenStack Nova instances.
 // See https://prometheus.io/docs/prometheus/latest/configuration/configuration/#openstack_sd_config
 // +k8s:openapi-gen=true
 type OpenStackSDConfig struct {
 	// The OpenStack role of entities that should be discovered.
-	// +kubebuilder:validation:Enum=Instance;instance;Hypervisor;hypervisor
+	//
+	// Note: The `LoadBalancer` role requires Prometheus >= v3.2.0.
+	//
+	// +kubebuilder:validation:Enum=Instance;instance;Hypervisor;hypervisor;LoadBalancer
 	// +required
-	Role string `json:"role"`
+	Role OpenStackRole `json:"role"`
 	// The OpenStack Region.
 	// +kubebuilder:validation:MinLength:=1
 	// +required
--- a/pkg/client/applyconfiguration/monitoring/v1alpha1/openstacksdconfig.go
+++ b/pkg/client/applyconfiguration/monitoring/v1alpha1/openstacksdconfig.go
@ -18,6 +18,7 @@ package v1alpha1

 import (
 	monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
+	monitoringv1alpha1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1alpha1"
 	applyconfigurationmonitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/client/applyconfiguration/monitoring/v1"
 	v1 "k8s.io/api/core/v1"
 )
@ -25,7 +26,7 @@ import (
 // OpenStackSDConfigApplyConfiguration represents a declarative configuration of the OpenStackSDConfig type for use
 // with apply.
 type OpenStackSDConfigApplyConfiguration struct {
-	Role                        *string                                                         `json:"role,omitempty"`
+	Role                        *monitoringv1alpha1.OpenStackRole                               `json:"role,omitempty"`
 	Region                      *string                                                         `json:"region,omitempty"`
 	IdentityEndpoint            *string                                                         `json:"identityEndpoint,omitempty"`
 	Username                    *string                                                         `json:"username,omitempty"`
@ -54,7 +55,7 @@ func OpenStackSDConfig() *OpenStackSDConfigApplyConfiguration {
 // WithRole sets the Role field in the declarative configuration to the given value
 // and returns the receiver, so that objects can be built by chaining "With" function invocations.
 // If called multiple times, the Role field is set to the value of the last call.
-func (b *OpenStackSDConfigApplyConfiguration) WithRole(value string) *OpenStackSDConfigApplyConfiguration {
+func (b *OpenStackSDConfigApplyConfiguration) WithRole(value monitoringv1alpha1.OpenStackRole) *OpenStackSDConfigApplyConfiguration {
 	b.Role = &value
 	return b
 }
--- a/pkg/prometheus/promcfg.go
+++ b/pkg/prometheus/promcfg.go
@ -3761,7 +3761,7 @@ func (cg *ConfigGenerator) generateScrapeConfig(
 			configs[i] = []yaml.MapItem{
 				{
 					Key:   "role",
-					Value: strings.ToLower(config.Role),
+					Value: string(config.Role),
 				},
 			}

--- a/pkg/prometheus/promcfg_test.go
+++ b/pkg/prometheus/promcfg_test.go
@ -8172,7 +8172,7 @@ func TestScrapeConfigSpecConfigWithOpenStackSD(t *testing.T) {
 			scSpec: monitoringv1alpha1.ScrapeConfigSpec{
 				OpenStackSDConfigs: []monitoringv1alpha1.OpenStackSDConfig{
 					{
-						Role:             "Instance",
+						Role:             monitoringv1alpha1.OpenStackRole("Instance"),
 						Region:           "region-1",
 						IdentityEndpoint: ptr.To("http://identity.example.com:5000/v2.0"),
 						Username:         ptr.To("nova-user-1"),
@ -8195,7 +8195,7 @@ func TestScrapeConfigSpecConfigWithOpenStackSD(t *testing.T) {
 			scSpec: monitoringv1alpha1.ScrapeConfigSpec{
 				OpenStackSDConfigs: []monitoringv1alpha1.OpenStackSDConfig{
 					{
-						Role:   "Instance",
+						Role:   monitoringv1alpha1.OpenStackRole("Instance"),
 						Region: "region-1",
 						ApplicationCredentialSecret: &v1.SecretKeySelector{
 							LocalObjectReference: v1.LocalObjectReference{
--- a/pkg/prometheus/resource_selector.go
+++ b/pkg/prometheus/resource_selector.go
@ -1227,6 +1227,9 @@ func (rs *ResourceSelector) validateAzureSDConfigs(ctx context.Context, sc *moni

 func (rs *ResourceSelector) validateOpenStackSDConfigs(ctx context.Context, sc *monitoringv1alpha1.ScrapeConfig) error {
 	for i, config := range sc.Spec.OpenStackSDConfigs {
+		if config.Role == monitoringv1alpha1.OpenStackRoleLoadBalancer && rs.version.LT(semver.MustParse("3.2.0")) {
+			return fmt.Errorf("[%d]: The %s role is only supported from Prometheus version 3.2.0", i, string(config.Role))
+		}
 		if config.Password != nil {
 			if _, err := rs.store.GetSecretKey(ctx, sc.GetNamespace(), *config.Password); err != nil {
 				return fmt.Errorf("[%d]: %w", i, err)
--- a/pkg/prometheus/resource_selector_test.go
+++ b/pkg/prometheus/resource_selector_test.go
@ -2747,7 +2747,7 @@ func TestSelectScrapeConfigs(t *testing.T) {
 			updateSpec: func(sc *monitoringv1alpha1.ScrapeConfigSpec) {
 				sc.OpenStackSDConfigs = []monitoringv1alpha1.OpenStackSDConfig{
 					{
-						Role:   "Instance",
+						Role:   monitoringv1alpha1.OpenStackRole("Instance"),
 						Region: "RegionOne",
 						Password: &v1.SecretKeySelector{
 							LocalObjectReference: v1.LocalObjectReference{
@ -2803,13 +2803,39 @@ func TestSelectScrapeConfigs(t *testing.T) {
 			updateSpec: func(sc *monitoringv1alpha1.ScrapeConfigSpec) {
 				sc.OpenStackSDConfigs = []monitoringv1alpha1.OpenStackSDConfig{
 					{
-						Role:   "hypervisor",
+						Role:   monitoringv1alpha1.OpenStackRole("hypervisor"),
 						Region: "RegionTwo",
 					},
 				}
 			},
 			selected: true,
 		},
+		{
+			scenario: "OpenStack SD config loadbalancer role in unsupported Prometheus version",
+			updateSpec: func(sc *monitoringv1alpha1.ScrapeConfigSpec) {
+				sc.OpenStackSDConfigs = []monitoringv1alpha1.OpenStackSDConfig{
+					{
+						Role:   monitoringv1alpha1.OpenStackRole("LoadBalancer"),
+						Region: "RegionTwo",
+					},
+				}
+			},
+			selected:    false,
+			promVersion: "3.1.0",
+		},
+		{
+			scenario: "OpenStack SD config loadbalancer role in supported Prometheus version",
+			updateSpec: func(sc *monitoringv1alpha1.ScrapeConfigSpec) {
+				sc.OpenStackSDConfigs = []monitoringv1alpha1.OpenStackSDConfig{
+					{
+						Role:   monitoringv1alpha1.OpenStackRole("LoadBalancer"),
+						Region: "RegionTwo",
+					},
+				}
+			},
+			selected:    true,
+			promVersion: "3.2.0",
+		},
 		{
 			scenario: "DigitalOcean SD config with valid TLS Config",
 			updateSpec: func(sc *monitoringv1alpha1.ScrapeConfigSpec) {
@ -4171,7 +4197,7 @@ func TestSelectScrapeConfigs(t *testing.T) {
 			updateSpec: func(sc *monitoringv1alpha1.ScrapeConfigSpec) {
 				sc.OpenStackSDConfigs = []monitoringv1alpha1.OpenStackSDConfig{
 					{
-						Role:   "hypervisor",
+						Role:   monitoringv1alpha1.OpenStackRole("hypervisor"),
 						Region: "RegionTwo",
 					},
 				}
@ -4184,7 +4210,7 @@ func TestSelectScrapeConfigs(t *testing.T) {
 			updateSpec: func(sc *monitoringv1alpha1.ScrapeConfigSpec) {
 				sc.OpenStackSDConfigs = []monitoringv1alpha1.OpenStackSDConfig{
 					{
-						Role:   "hypervisor",
+						Role:   monitoringv1alpha1.OpenStackRole("hypervisor"),
 						Region: "RegionTwo",
 					},
 				}
--- a/pkg/prometheus/testdata/ScrapeConfigSpecConfig_OpenStackSDConfigValid.golden
+++ b/pkg/prometheus/testdata/ScrapeConfigSpecConfig_OpenStackSDConfigValid.golden
@ -7,7 +7,7 @@ global:
 scrape_configs:
 - job_name: scrapeConfig/default/testscrapeconfig1
  openstack_sd_configs:
-  - role: instance
+  - role: Instance
    region: region-1
    identity_endpoint: http://identity.example.com:5000/v2.0
    username: nova-user-1
--- a/test/e2e/scrapeconfig_test.go
+++ b/test/e2e/scrapeconfig_test.go
@ -2702,7 +2702,7 @@ var OpenStackSDTestCases = []scrapeCRDTestCase{
 		scrapeConfigSpec: monitoringv1alpha1.ScrapeConfigSpec{
 			OpenStackSDConfigs: []monitoringv1alpha1.OpenStackSDConfig{
 				{
-					Role: "hypervisor",
+					Role: monitoringv1alpha1.OpenStackRole("hypervisor"),
 				},
 			},
 		},
@ -2713,7 +2713,7 @@ var OpenStackSDTestCases = []scrapeCRDTestCase{
 		scrapeConfigSpec: monitoringv1alpha1.ScrapeConfigSpec{
 			OpenStackSDConfigs: []monitoringv1alpha1.OpenStackSDConfig{
 				{
-					Role:   "hypervisor",
+					Role:   monitoringv1alpha1.OpenStackRole("hypervisor"),
 					Region: "default",
 				},
 			},
@ -2725,7 +2725,7 @@ var OpenStackSDTestCases = []scrapeCRDTestCase{
 		scrapeConfigSpec: monitoringv1alpha1.ScrapeConfigSpec{
 			OpenStackSDConfigs: []monitoringv1alpha1.OpenStackSDConfig{
 				{
-					Role:   "instance",
+					Role:   monitoringv1alpha1.OpenStackRole("instance"),
 					Region: "default",
 				},
 			},
@ -2737,7 +2737,7 @@ var OpenStackSDTestCases = []scrapeCRDTestCase{
 		scrapeConfigSpec: monitoringv1alpha1.ScrapeConfigSpec{
 			OpenStackSDConfigs: []monitoringv1alpha1.OpenStackSDConfig{
 				{
-					Role:   "default",
+					Role:   monitoringv1alpha1.OpenStackRole("default"),
 					Region: "default",
 				},
 			},
@ -2749,7 +2749,7 @@ var OpenStackSDTestCases = []scrapeCRDTestCase{
 		scrapeConfigSpec: monitoringv1alpha1.ScrapeConfigSpec{
 			OpenStackSDConfigs: []monitoringv1alpha1.OpenStackSDConfig{
 				{
-					Role:   "",
+					Role:   monitoringv1alpha1.OpenStackRole(""),
 					Region: "default",
 				},
 			},
@ -2761,19 +2761,31 @@ var OpenStackSDTestCases = []scrapeCRDTestCase{
 		scrapeConfigSpec: monitoringv1alpha1.ScrapeConfigSpec{
 			OpenStackSDConfigs: []monitoringv1alpha1.OpenStackSDConfig{
 				{
-					Role:   "hypervisor",
+					Role:   monitoringv1alpha1.OpenStackRole("hypervisor"),
 					Region: "",
 				},
 			},
 		},
 		expectedError: true,
 	},
+	{
+		name: "Role Loadbalancer",
+		scrapeConfigSpec: monitoringv1alpha1.ScrapeConfigSpec{
+			OpenStackSDConfigs: []monitoringv1alpha1.OpenStackSDConfig{
+				{
+					Role:   monitoringv1alpha1.OpenStackRole("LoadBalancer"),
+					Region: "default",
+				},
+			},
+		},
+		expectedError: false,
+	},
 	{
 		name: "Valid Endpoint HTTP",
 		scrapeConfigSpec: monitoringv1alpha1.ScrapeConfigSpec{
 			OpenStackSDConfigs: []monitoringv1alpha1.OpenStackSDConfig{
 				{
-					Role:             "hypervisor",
+					Role:             monitoringv1alpha1.OpenStackRole("hypervisor"),
 					Region:           "default",
 					IdentityEndpoint: ptr.To("http://example.com"),
 				},
@ -2786,7 +2798,7 @@ var OpenStackSDTestCases = []scrapeCRDTestCase{
 		scrapeConfigSpec: monitoringv1alpha1.ScrapeConfigSpec{
 			OpenStackSDConfigs: []monitoringv1alpha1.OpenStackSDConfig{
 				{
-					Role:             "hypervisor",
+					Role:             monitoringv1alpha1.OpenStackRole("hypervisor"),
 					Region:           "default",
 					IdentityEndpoint: ptr.To("https://example.com"),
 				},
@ -2799,7 +2811,7 @@ var OpenStackSDTestCases = []scrapeCRDTestCase{
 		scrapeConfigSpec: monitoringv1alpha1.ScrapeConfigSpec{
 			OpenStackSDConfigs: []monitoringv1alpha1.OpenStackSDConfig{
 				{
-					Role:             "hypervisor",
+					Role:             monitoringv1alpha1.OpenStackRole("hypervisor"),
 					Region:           "default",
 					IdentityEndpoint: ptr.To("ftp://example.com"),
 				},
@ -2812,7 +2824,7 @@ var OpenStackSDTestCases = []scrapeCRDTestCase{
 		scrapeConfigSpec: monitoringv1alpha1.ScrapeConfigSpec{
 			OpenStackSDConfigs: []monitoringv1alpha1.OpenStackSDConfig{
 				{
-					Role:             "hypervisor",
+					Role:             monitoringv1alpha1.OpenStackRole("hypervisor"),
 					Region:           "default",
 					IdentityEndpoint: ptr.To(""),
 				},
@ -2825,7 +2837,7 @@ var OpenStackSDTestCases = []scrapeCRDTestCase{
 		scrapeConfigSpec: monitoringv1alpha1.ScrapeConfigSpec{
 			OpenStackSDConfigs: []monitoringv1alpha1.OpenStackSDConfig{
 				{
-					Role:     "hypervisor",
+					Role:     monitoringv1alpha1.OpenStackRole("hypervisor"),
 					Region:   "default",
 					Username: ptr.To("admin"),
 				},
@ -2838,7 +2850,7 @@ var OpenStackSDTestCases = []scrapeCRDTestCase{
 		scrapeConfigSpec: monitoringv1alpha1.ScrapeConfigSpec{
 			OpenStackSDConfigs: []monitoringv1alpha1.OpenStackSDConfig{
 				{
-					Role:     "hypervisor",
+					Role:     monitoringv1alpha1.OpenStackRole("hypervisor"),
 					Region:   "default",
 					Username: ptr.To(""),
 				},
@ -2851,7 +2863,7 @@ var OpenStackSDTestCases = []scrapeCRDTestCase{
 		scrapeConfigSpec: monitoringv1alpha1.ScrapeConfigSpec{
 			OpenStackSDConfigs: []monitoringv1alpha1.OpenStackSDConfig{
 				{
-					Role:   "hypervisor",
+					Role:   monitoringv1alpha1.OpenStackRole("hypervisor"),
 					Region: "default",
 					UserID: ptr.To("ac3377633149401296f6c0d92d79dc16"),
 				},
@ -2864,7 +2876,7 @@ var OpenStackSDTestCases = []scrapeCRDTestCase{
 		scrapeConfigSpec: monitoringv1alpha1.ScrapeConfigSpec{
 			OpenStackSDConfigs: []monitoringv1alpha1.OpenStackSDConfig{
 				{
-					Role:   "hypervisor",
+					Role:   monitoringv1alpha1.OpenStackRole("hypervisor"),
 					Region: "default",
 					UserID: ptr.To(""),
 				},
@ -2877,7 +2889,7 @@ var OpenStackSDTestCases = []scrapeCRDTestCase{
 		scrapeConfigSpec: monitoringv1alpha1.ScrapeConfigSpec{
 			OpenStackSDConfigs: []monitoringv1alpha1.OpenStackSDConfig{
 				{
-					Role:     "hypervisor",
+					Role:     monitoringv1alpha1.OpenStackRole("hypervisor"),
 					Region:   "default",
 					DomainID: ptr.To("e0353a670a9e496da891347c589539e9"),
 				},
@ -2890,7 +2902,7 @@ var OpenStackSDTestCases = []scrapeCRDTestCase{
 		scrapeConfigSpec: monitoringv1alpha1.ScrapeConfigSpec{
 			OpenStackSDConfigs: []monitoringv1alpha1.OpenStackSDConfig{
 				{
-					Role:     "hypervisor",
+					Role:     monitoringv1alpha1.OpenStackRole("hypervisor"),
 					Region:   "default",
 					DomainID: ptr.To(""),
 				},
@ -2903,7 +2915,7 @@ var OpenStackSDTestCases = []scrapeCRDTestCase{
 		scrapeConfigSpec: monitoringv1alpha1.ScrapeConfigSpec{
 			OpenStackSDConfigs: []monitoringv1alpha1.OpenStackSDConfig{
 				{
-					Role:       "hypervisor",
+					Role:       monitoringv1alpha1.OpenStackRole("hypervisor"),
 					Region:     "default",
 					DomainName: ptr.To("default"),
 				},
@ -2916,7 +2928,7 @@ var OpenStackSDTestCases = []scrapeCRDTestCase{
 		scrapeConfigSpec: monitoringv1alpha1.ScrapeConfigSpec{
 			OpenStackSDConfigs: []monitoringv1alpha1.OpenStackSDConfig{
 				{
-					Role:       "hypervisor",
+					Role:       monitoringv1alpha1.OpenStackRole("hypervisor"),
 					Region:     "default",
 					DomainName: ptr.To(""),
 				},
@ -2929,7 +2941,7 @@ var OpenStackSDTestCases = []scrapeCRDTestCase{
 		scrapeConfigSpec: monitoringv1alpha1.ScrapeConfigSpec{
 			OpenStackSDConfigs: []monitoringv1alpha1.OpenStackSDConfig{
 				{
-					Role:        "hypervisor",
+					Role:        monitoringv1alpha1.OpenStackRole("hypervisor"),
 					Region:      "default",
 					ProjectName: ptr.To("default"),
 				},
@ -2942,7 +2954,7 @@ var OpenStackSDTestCases = []scrapeCRDTestCase{
 		scrapeConfigSpec: monitoringv1alpha1.ScrapeConfigSpec{
 			OpenStackSDConfigs: []monitoringv1alpha1.OpenStackSDConfig{
 				{
-					Role:        "hypervisor",
+					Role:        monitoringv1alpha1.OpenStackRole("hypervisor"),
 					Region:      "default",
 					ProjectName: ptr.To(""),
 				},
@ -2955,7 +2967,7 @@ var OpenStackSDTestCases = []scrapeCRDTestCase{
 		scrapeConfigSpec: monitoringv1alpha1.ScrapeConfigSpec{
 			OpenStackSDConfigs: []monitoringv1alpha1.OpenStackSDConfig{
 				{
-					Role:      "hypervisor",
+					Role:      monitoringv1alpha1.OpenStackRole("hypervisor"),
 					Region:    "default",
 					ProjectID: ptr.To("343d245e850143a096806dfaefa9afdc"),
 				},
@ -2968,7 +2980,7 @@ var OpenStackSDTestCases = []scrapeCRDTestCase{
 		scrapeConfigSpec: monitoringv1alpha1.ScrapeConfigSpec{
 			OpenStackSDConfigs: []monitoringv1alpha1.OpenStackSDConfig{
 				{
-					Role:      "hypervisor",
+					Role:      monitoringv1alpha1.OpenStackRole("hypervisor"),
 					Region:    "default",
 					ProjectID: ptr.To(""),
 				},
@ -2981,7 +2993,7 @@ var OpenStackSDTestCases = []scrapeCRDTestCase{
 		scrapeConfigSpec: monitoringv1alpha1.ScrapeConfigSpec{
 			OpenStackSDConfigs: []monitoringv1alpha1.OpenStackSDConfig{
 				{
-					Role:                      "hypervisor",
+					Role:                      monitoringv1alpha1.OpenStackRole("hypervisor"),
 					Region:                    "default",
 					ApplicationCredentialName: ptr.To("monitoring"),
 				},
@ -2994,7 +3006,7 @@ var OpenStackSDTestCases = []scrapeCRDTestCase{
 		scrapeConfigSpec: monitoringv1alpha1.ScrapeConfigSpec{
 			OpenStackSDConfigs: []monitoringv1alpha1.OpenStackSDConfig{
 				{
-					Role:                      "hypervisor",
+					Role:                      monitoringv1alpha1.OpenStackRole("hypervisor"),
 					Region:                    "default",
 					ApplicationCredentialName: ptr.To(""),
 				},
@ -3007,7 +3019,7 @@ var OpenStackSDTestCases = []scrapeCRDTestCase{
 		scrapeConfigSpec: monitoringv1alpha1.ScrapeConfigSpec{
 			OpenStackSDConfigs: []monitoringv1alpha1.OpenStackSDConfig{
 				{
-					Role:                    "hypervisor",
+					Role:                    monitoringv1alpha1.OpenStackRole("hypervisor"),
 					Region:                  "default",
 					ApplicationCredentialID: ptr.To("aa809205ed614a0e854bac92c0768bb9"),
 				},
@ -3020,7 +3032,7 @@ var OpenStackSDTestCases = []scrapeCRDTestCase{
 		scrapeConfigSpec: monitoringv1alpha1.ScrapeConfigSpec{
 			OpenStackSDConfigs: []monitoringv1alpha1.OpenStackSDConfig{
 				{
-					Role:                    "hypervisor",
+					Role:                    monitoringv1alpha1.OpenStackRole("hypervisor"),
 					Region:                  "default",
 					ApplicationCredentialID: ptr.To(""),
 				},
@ -3033,7 +3045,7 @@ var OpenStackSDTestCases = []scrapeCRDTestCase{
 		scrapeConfigSpec: monitoringv1alpha1.ScrapeConfigSpec{
 			OpenStackSDConfigs: []monitoringv1alpha1.OpenStackSDConfig{
 				{
-					Role:       "hypervisor",
+					Role:       monitoringv1alpha1.OpenStackRole("hypervisor"),
 					Region:     "default",
 					AllTenants: ptr.To(true),
 				},
@ -3046,7 +3058,7 @@ var OpenStackSDTestCases = []scrapeCRDTestCase{
 		scrapeConfigSpec: monitoringv1alpha1.ScrapeConfigSpec{
 			OpenStackSDConfigs: []monitoringv1alpha1.OpenStackSDConfig{
 				{
-					Role:       "hypervisor",
+					Role:       monitoringv1alpha1.OpenStackRole("hypervisor"),
 					Region:     "default",
 					AllTenants: ptr.To(false),
 				},
@ -3059,7 +3071,7 @@ var OpenStackSDTestCases = []scrapeCRDTestCase{
 		scrapeConfigSpec: monitoringv1alpha1.ScrapeConfigSpec{
 			OpenStackSDConfigs: []monitoringv1alpha1.OpenStackSDConfig{
 				{
-					Role:            "hypervisor",
+					Role:            monitoringv1alpha1.OpenStackRole("hypervisor"),
 					Region:          "default",
 					RefreshInterval: ptr.To(monitoringv1.Duration("30s")),
 				},
@ -3072,7 +3084,7 @@ var OpenStackSDTestCases = []scrapeCRDTestCase{
 		scrapeConfigSpec: monitoringv1alpha1.ScrapeConfigSpec{
 			OpenStackSDConfigs: []monitoringv1alpha1.OpenStackSDConfig{
 				{
-					Role:            "hypervisor",
+					Role:            monitoringv1alpha1.OpenStackRole("hypervisor"),
 					Region:          "default",
 					RefreshInterval: ptr.To(monitoringv1.Duration("30g")),
 				},
@ -3085,7 +3097,7 @@ var OpenStackSDTestCases = []scrapeCRDTestCase{
 		scrapeConfigSpec: monitoringv1alpha1.ScrapeConfigSpec{
 			OpenStackSDConfigs: []monitoringv1alpha1.OpenStackSDConfig{
 				{
-					Role:   "hypervisor",
+					Role:   monitoringv1alpha1.OpenStackRole("hypervisor"),
 					Region: "default",
 					Port:   ptr.To(int32(8080)),
 				},
@ -3098,7 +3110,7 @@ var OpenStackSDTestCases = []scrapeCRDTestCase{
 		scrapeConfigSpec: monitoringv1alpha1.ScrapeConfigSpec{
 			OpenStackSDConfigs: []monitoringv1alpha1.OpenStackSDConfig{
 				{
-					Role:   "hypervisor",
+					Role:   monitoringv1alpha1.OpenStackRole("hypervisor"),
 					Region: "default",
 					Port:   ptr.To(int32(-1)),
 				},
@ -3111,7 +3123,7 @@ var OpenStackSDTestCases = []scrapeCRDTestCase{
 		scrapeConfigSpec: monitoringv1alpha1.ScrapeConfigSpec{
 			OpenStackSDConfigs: []monitoringv1alpha1.OpenStackSDConfig{
 				{
-					Role:   "hypervisor",
+					Role:   monitoringv1alpha1.OpenStackRole("hypervisor"),
 					Region: "default",
 					Port:   ptr.To(int32(65537)),
 				},
@ -3124,7 +3136,7 @@ var OpenStackSDTestCases = []scrapeCRDTestCase{
 		scrapeConfigSpec: monitoringv1alpha1.ScrapeConfigSpec{
 			OpenStackSDConfigs: []monitoringv1alpha1.OpenStackSDConfig{
 				{
-					Role:         "hypervisor",
+					Role:         monitoringv1alpha1.OpenStackRole("hypervisor"),
 					Region:       "default",
 					Availability: ptr.To("public"),
 				},
@ -3137,7 +3149,7 @@ var OpenStackSDTestCases = []scrapeCRDTestCase{
 		scrapeConfigSpec: monitoringv1alpha1.ScrapeConfigSpec{
 			OpenStackSDConfigs: []monitoringv1alpha1.OpenStackSDConfig{
 				{
-					Role:         "hypervisor",
+					Role:         monitoringv1alpha1.OpenStackRole("hypervisor"),
 					Region:       "default",
 					Availability: ptr.To("admin"),
 				},
@ -3150,7 +3162,7 @@ var OpenStackSDTestCases = []scrapeCRDTestCase{
 		scrapeConfigSpec: monitoringv1alpha1.ScrapeConfigSpec{
 			OpenStackSDConfigs: []monitoringv1alpha1.OpenStackSDConfig{
 				{
-					Role:         "hypervisor",
+					Role:         monitoringv1alpha1.OpenStackRole("hypervisor"),
 					Region:       "default",
 					Availability: ptr.To("internal"),
 				},
@ -3163,7 +3175,7 @@ var OpenStackSDTestCases = []scrapeCRDTestCase{
 		scrapeConfigSpec: monitoringv1alpha1.ScrapeConfigSpec{
 			OpenStackSDConfigs: []monitoringv1alpha1.OpenStackSDConfig{
 				{
-					Role:         "hypervisor",
+					Role:         monitoringv1alpha1.OpenStackRole("hypervisor"),
 					Region:       "default",
 					Availability: ptr.To("private"),
 				},
@ -3176,7 +3188,7 @@ var OpenStackSDTestCases = []scrapeCRDTestCase{
 		scrapeConfigSpec: monitoringv1alpha1.ScrapeConfigSpec{
 			OpenStackSDConfigs: []monitoringv1alpha1.OpenStackSDConfig{
 				{
-					Role:         "hypervisor",
+					Role:         monitoringv1alpha1.OpenStackRole("hypervisor"),
 					Region:       "default",
 					Availability: ptr.To(""),
 				},