1
0
Fork 0
mirror of https://github.com/prometheus-operator/prometheus-operator.git synced 2025-04-21 03:38:43 +00:00

remove openstacksd role

Signed-off-by: dongjiang <dongjiang1989@126.com>
This commit is contained in:
dongjiang 2025-02-28 10:38:23 +08:00
parent 35f6d05105
commit b939f97e57
No known key found for this signature in database
8 changed files with 46 additions and 54 deletions
bundle.yaml
example
jsonnet/prometheus-operator
pkg
test/e2e

2
bundle.yaml generated
View file

@ -56067,9 +56067,7 @@ spec:
Note: The `LoadBalancer` role requires Prometheus >= v3.2.0.
enum:
- Instance
- instance
- Hypervisor
- hypervisor
- LoadBalancer
type: string
tlsConfig:

View file

@ -10840,9 +10840,7 @@ spec:
Note: The `LoadBalancer` role requires Prometheus >= v3.2.0.
enum:
- Instance
- instance
- Hypervisor
- hypervisor
- LoadBalancer
type: string
tlsConfig:

View file

@ -10841,9 +10841,7 @@ spec:
Note: The `LoadBalancer` role requires Prometheus >= v3.2.0.
enum:
- Instance
- instance
- Hypervisor
- hypervisor
- LoadBalancer
type: string
tlsConfig:

View file

@ -10252,9 +10252,7 @@
"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",
"LoadBalancer"
],
"type": "string"

View file

@ -780,6 +780,7 @@ type GCESDConfig struct {
TagSeparator *string `json:"tagSeparator,omitempty"`
}
// +kubebuilder:validation:Enum=Instance;Hypervisor;LoadBalancer
type OpenStackRole string
const (
@ -796,7 +797,6 @@ type OpenStackSDConfig struct {
//
// Note: The `LoadBalancer` role requires Prometheus >= v3.2.0.
//
// +kubebuilder:validation:Enum=Instance;instance;Hypervisor;hypervisor;LoadBalancer
// +required
Role OpenStackRole `json:"role"`
// The OpenStack Region.

View file

@ -8172,7 +8172,7 @@ func TestScrapeConfigSpecConfigWithOpenStackSD(t *testing.T) {
scSpec: monitoringv1alpha1.ScrapeConfigSpec{
OpenStackSDConfigs: []monitoringv1alpha1.OpenStackSDConfig{
{
Role: monitoringv1alpha1.OpenStackRole("Instance"),
Role: monitoringv1alpha1.OpenStackRoleInstance,
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: monitoringv1alpha1.OpenStackRole("Instance"),
Role: monitoringv1alpha1.OpenStackRoleInstance,
Region: "region-1",
ApplicationCredentialSecret: &v1.SecretKeySelector{
LocalObjectReference: v1.LocalObjectReference{

View file

@ -2747,7 +2747,7 @@ func TestSelectScrapeConfigs(t *testing.T) {
updateSpec: func(sc *monitoringv1alpha1.ScrapeConfigSpec) {
sc.OpenStackSDConfigs = []monitoringv1alpha1.OpenStackSDConfig{
{
Role: monitoringv1alpha1.OpenStackRole("Instance"),
Role: monitoringv1alpha1.OpenStackRoleInstance,
Region: "RegionOne",
Password: &v1.SecretKeySelector{
LocalObjectReference: v1.LocalObjectReference{
@ -2803,7 +2803,7 @@ func TestSelectScrapeConfigs(t *testing.T) {
updateSpec: func(sc *monitoringv1alpha1.ScrapeConfigSpec) {
sc.OpenStackSDConfigs = []monitoringv1alpha1.OpenStackSDConfig{
{
Role: monitoringv1alpha1.OpenStackRole("hypervisor"),
Role: monitoringv1alpha1.OpenStackRoleHypervisor,
Region: "RegionTwo",
},
}
@ -2815,7 +2815,7 @@ func TestSelectScrapeConfigs(t *testing.T) {
updateSpec: func(sc *monitoringv1alpha1.ScrapeConfigSpec) {
sc.OpenStackSDConfigs = []monitoringv1alpha1.OpenStackSDConfig{
{
Role: monitoringv1alpha1.OpenStackRole("LoadBalancer"),
Role: monitoringv1alpha1.OpenStackRoleLoadBalancer,
Region: "RegionTwo",
},
}
@ -2828,7 +2828,7 @@ func TestSelectScrapeConfigs(t *testing.T) {
updateSpec: func(sc *monitoringv1alpha1.ScrapeConfigSpec) {
sc.OpenStackSDConfigs = []monitoringv1alpha1.OpenStackSDConfig{
{
Role: monitoringv1alpha1.OpenStackRole("LoadBalancer"),
Role: monitoringv1alpha1.OpenStackRoleLoadBalancer,
Region: "RegionTwo",
},
}
@ -4197,7 +4197,7 @@ func TestSelectScrapeConfigs(t *testing.T) {
updateSpec: func(sc *monitoringv1alpha1.ScrapeConfigSpec) {
sc.OpenStackSDConfigs = []monitoringv1alpha1.OpenStackSDConfig{
{
Role: monitoringv1alpha1.OpenStackRole("hypervisor"),
Role: monitoringv1alpha1.OpenStackRoleHypervisor,
Region: "RegionTwo",
},
}
@ -4210,7 +4210,7 @@ func TestSelectScrapeConfigs(t *testing.T) {
updateSpec: func(sc *monitoringv1alpha1.ScrapeConfigSpec) {
sc.OpenStackSDConfigs = []monitoringv1alpha1.OpenStackSDConfig{
{
Role: monitoringv1alpha1.OpenStackRole("hypervisor"),
Role: monitoringv1alpha1.OpenStackRoleHypervisor,
Region: "RegionTwo",
},
}

View file

@ -2702,7 +2702,7 @@ var OpenStackSDTestCases = []scrapeCRDTestCase{
scrapeConfigSpec: monitoringv1alpha1.ScrapeConfigSpec{
OpenStackSDConfigs: []monitoringv1alpha1.OpenStackSDConfig{
{
Role: monitoringv1alpha1.OpenStackRole("hypervisor"),
Role: monitoringv1alpha1.OpenStackRoleHypervisor,
},
},
},
@ -2713,7 +2713,7 @@ var OpenStackSDTestCases = []scrapeCRDTestCase{
scrapeConfigSpec: monitoringv1alpha1.ScrapeConfigSpec{
OpenStackSDConfigs: []monitoringv1alpha1.OpenStackSDConfig{
{
Role: monitoringv1alpha1.OpenStackRole("hypervisor"),
Role: monitoringv1alpha1.OpenStackRoleHypervisor,
Region: "default",
},
},
@ -2725,7 +2725,7 @@ var OpenStackSDTestCases = []scrapeCRDTestCase{
scrapeConfigSpec: monitoringv1alpha1.ScrapeConfigSpec{
OpenStackSDConfigs: []monitoringv1alpha1.OpenStackSDConfig{
{
Role: monitoringv1alpha1.OpenStackRole("instance"),
Role: monitoringv1alpha1.OpenStackRoleInstance,
Region: "default",
},
},
@ -2761,7 +2761,7 @@ var OpenStackSDTestCases = []scrapeCRDTestCase{
scrapeConfigSpec: monitoringv1alpha1.ScrapeConfigSpec{
OpenStackSDConfigs: []monitoringv1alpha1.OpenStackSDConfig{
{
Role: monitoringv1alpha1.OpenStackRole("hypervisor"),
Role: monitoringv1alpha1.OpenStackRoleHypervisor,
Region: "",
},
},
@ -2773,7 +2773,7 @@ var OpenStackSDTestCases = []scrapeCRDTestCase{
scrapeConfigSpec: monitoringv1alpha1.ScrapeConfigSpec{
OpenStackSDConfigs: []monitoringv1alpha1.OpenStackSDConfig{
{
Role: monitoringv1alpha1.OpenStackRole("LoadBalancer"),
Role: monitoringv1alpha1.OpenStackRoleLoadBalancer,
Region: "default",
},
},
@ -2785,7 +2785,7 @@ var OpenStackSDTestCases = []scrapeCRDTestCase{
scrapeConfigSpec: monitoringv1alpha1.ScrapeConfigSpec{
OpenStackSDConfigs: []monitoringv1alpha1.OpenStackSDConfig{
{
Role: monitoringv1alpha1.OpenStackRole("hypervisor"),
Role: monitoringv1alpha1.OpenStackRoleHypervisor,
Region: "default",
IdentityEndpoint: ptr.To("http://example.com"),
},
@ -2798,7 +2798,7 @@ var OpenStackSDTestCases = []scrapeCRDTestCase{
scrapeConfigSpec: monitoringv1alpha1.ScrapeConfigSpec{
OpenStackSDConfigs: []monitoringv1alpha1.OpenStackSDConfig{
{
Role: monitoringv1alpha1.OpenStackRole("hypervisor"),
Role: monitoringv1alpha1.OpenStackRoleHypervisor,
Region: "default",
IdentityEndpoint: ptr.To("https://example.com"),
},
@ -2811,7 +2811,7 @@ var OpenStackSDTestCases = []scrapeCRDTestCase{
scrapeConfigSpec: monitoringv1alpha1.ScrapeConfigSpec{
OpenStackSDConfigs: []monitoringv1alpha1.OpenStackSDConfig{
{
Role: monitoringv1alpha1.OpenStackRole("hypervisor"),
Role: monitoringv1alpha1.OpenStackRoleHypervisor,
Region: "default",
IdentityEndpoint: ptr.To("ftp://example.com"),
},
@ -2824,7 +2824,7 @@ var OpenStackSDTestCases = []scrapeCRDTestCase{
scrapeConfigSpec: monitoringv1alpha1.ScrapeConfigSpec{
OpenStackSDConfigs: []monitoringv1alpha1.OpenStackSDConfig{
{
Role: monitoringv1alpha1.OpenStackRole("hypervisor"),
Role: monitoringv1alpha1.OpenStackRoleHypervisor,
Region: "default",
IdentityEndpoint: ptr.To(""),
},
@ -2837,7 +2837,7 @@ var OpenStackSDTestCases = []scrapeCRDTestCase{
scrapeConfigSpec: monitoringv1alpha1.ScrapeConfigSpec{
OpenStackSDConfigs: []monitoringv1alpha1.OpenStackSDConfig{
{
Role: monitoringv1alpha1.OpenStackRole("hypervisor"),
Role: monitoringv1alpha1.OpenStackRoleHypervisor,
Region: "default",
Username: ptr.To("admin"),
},
@ -2850,7 +2850,7 @@ var OpenStackSDTestCases = []scrapeCRDTestCase{
scrapeConfigSpec: monitoringv1alpha1.ScrapeConfigSpec{
OpenStackSDConfigs: []monitoringv1alpha1.OpenStackSDConfig{
{
Role: monitoringv1alpha1.OpenStackRole("hypervisor"),
Role: monitoringv1alpha1.OpenStackRoleHypervisor,
Region: "default",
Username: ptr.To(""),
},
@ -2863,7 +2863,7 @@ var OpenStackSDTestCases = []scrapeCRDTestCase{
scrapeConfigSpec: monitoringv1alpha1.ScrapeConfigSpec{
OpenStackSDConfigs: []monitoringv1alpha1.OpenStackSDConfig{
{
Role: monitoringv1alpha1.OpenStackRole("hypervisor"),
Role: monitoringv1alpha1.OpenStackRoleHypervisor,
Region: "default",
UserID: ptr.To("ac3377633149401296f6c0d92d79dc16"),
},
@ -2876,7 +2876,7 @@ var OpenStackSDTestCases = []scrapeCRDTestCase{
scrapeConfigSpec: monitoringv1alpha1.ScrapeConfigSpec{
OpenStackSDConfigs: []monitoringv1alpha1.OpenStackSDConfig{
{
Role: monitoringv1alpha1.OpenStackRole("hypervisor"),
Role: monitoringv1alpha1.OpenStackRoleHypervisor,
Region: "default",
UserID: ptr.To(""),
},
@ -2889,7 +2889,7 @@ var OpenStackSDTestCases = []scrapeCRDTestCase{
scrapeConfigSpec: monitoringv1alpha1.ScrapeConfigSpec{
OpenStackSDConfigs: []monitoringv1alpha1.OpenStackSDConfig{
{
Role: monitoringv1alpha1.OpenStackRole("hypervisor"),
Role: monitoringv1alpha1.OpenStackRoleHypervisor,
Region: "default",
DomainID: ptr.To("e0353a670a9e496da891347c589539e9"),
},
@ -2902,7 +2902,7 @@ var OpenStackSDTestCases = []scrapeCRDTestCase{
scrapeConfigSpec: monitoringv1alpha1.ScrapeConfigSpec{
OpenStackSDConfigs: []monitoringv1alpha1.OpenStackSDConfig{
{
Role: monitoringv1alpha1.OpenStackRole("hypervisor"),
Role: monitoringv1alpha1.OpenStackRoleHypervisor,
Region: "default",
DomainID: ptr.To(""),
},
@ -2915,7 +2915,7 @@ var OpenStackSDTestCases = []scrapeCRDTestCase{
scrapeConfigSpec: monitoringv1alpha1.ScrapeConfigSpec{
OpenStackSDConfigs: []monitoringv1alpha1.OpenStackSDConfig{
{
Role: monitoringv1alpha1.OpenStackRole("hypervisor"),
Role: monitoringv1alpha1.OpenStackRoleHypervisor,
Region: "default",
DomainName: ptr.To("default"),
},
@ -2928,7 +2928,7 @@ var OpenStackSDTestCases = []scrapeCRDTestCase{
scrapeConfigSpec: monitoringv1alpha1.ScrapeConfigSpec{
OpenStackSDConfigs: []monitoringv1alpha1.OpenStackSDConfig{
{
Role: monitoringv1alpha1.OpenStackRole("hypervisor"),
Role: monitoringv1alpha1.OpenStackRoleHypervisor,
Region: "default",
DomainName: ptr.To(""),
},
@ -2941,7 +2941,7 @@ var OpenStackSDTestCases = []scrapeCRDTestCase{
scrapeConfigSpec: monitoringv1alpha1.ScrapeConfigSpec{
OpenStackSDConfigs: []monitoringv1alpha1.OpenStackSDConfig{
{
Role: monitoringv1alpha1.OpenStackRole("hypervisor"),
Role: monitoringv1alpha1.OpenStackRoleHypervisor,
Region: "default",
ProjectName: ptr.To("default"),
},
@ -2954,7 +2954,7 @@ var OpenStackSDTestCases = []scrapeCRDTestCase{
scrapeConfigSpec: monitoringv1alpha1.ScrapeConfigSpec{
OpenStackSDConfigs: []monitoringv1alpha1.OpenStackSDConfig{
{
Role: monitoringv1alpha1.OpenStackRole("hypervisor"),
Role: monitoringv1alpha1.OpenStackRoleHypervisor,
Region: "default",
ProjectName: ptr.To(""),
},
@ -2967,7 +2967,7 @@ var OpenStackSDTestCases = []scrapeCRDTestCase{
scrapeConfigSpec: monitoringv1alpha1.ScrapeConfigSpec{
OpenStackSDConfigs: []monitoringv1alpha1.OpenStackSDConfig{
{
Role: monitoringv1alpha1.OpenStackRole("hypervisor"),
Role: monitoringv1alpha1.OpenStackRoleHypervisor,
Region: "default",
ProjectID: ptr.To("343d245e850143a096806dfaefa9afdc"),
},
@ -2980,7 +2980,7 @@ var OpenStackSDTestCases = []scrapeCRDTestCase{
scrapeConfigSpec: monitoringv1alpha1.ScrapeConfigSpec{
OpenStackSDConfigs: []monitoringv1alpha1.OpenStackSDConfig{
{
Role: monitoringv1alpha1.OpenStackRole("hypervisor"),
Role: monitoringv1alpha1.OpenStackRoleHypervisor,
Region: "default",
ProjectID: ptr.To(""),
},
@ -2993,7 +2993,7 @@ var OpenStackSDTestCases = []scrapeCRDTestCase{
scrapeConfigSpec: monitoringv1alpha1.ScrapeConfigSpec{
OpenStackSDConfigs: []monitoringv1alpha1.OpenStackSDConfig{
{
Role: monitoringv1alpha1.OpenStackRole("hypervisor"),
Role: monitoringv1alpha1.OpenStackRoleHypervisor,
Region: "default",
ApplicationCredentialName: ptr.To("monitoring"),
},
@ -3006,7 +3006,7 @@ var OpenStackSDTestCases = []scrapeCRDTestCase{
scrapeConfigSpec: monitoringv1alpha1.ScrapeConfigSpec{
OpenStackSDConfigs: []monitoringv1alpha1.OpenStackSDConfig{
{
Role: monitoringv1alpha1.OpenStackRole("hypervisor"),
Role: monitoringv1alpha1.OpenStackRoleHypervisor,
Region: "default",
ApplicationCredentialName: ptr.To(""),
},
@ -3019,7 +3019,7 @@ var OpenStackSDTestCases = []scrapeCRDTestCase{
scrapeConfigSpec: monitoringv1alpha1.ScrapeConfigSpec{
OpenStackSDConfigs: []monitoringv1alpha1.OpenStackSDConfig{
{
Role: monitoringv1alpha1.OpenStackRole("hypervisor"),
Role: monitoringv1alpha1.OpenStackRoleHypervisor,
Region: "default",
ApplicationCredentialID: ptr.To("aa809205ed614a0e854bac92c0768bb9"),
},
@ -3032,7 +3032,7 @@ var OpenStackSDTestCases = []scrapeCRDTestCase{
scrapeConfigSpec: monitoringv1alpha1.ScrapeConfigSpec{
OpenStackSDConfigs: []monitoringv1alpha1.OpenStackSDConfig{
{
Role: monitoringv1alpha1.OpenStackRole("hypervisor"),
Role: monitoringv1alpha1.OpenStackRoleHypervisor,
Region: "default",
ApplicationCredentialID: ptr.To(""),
},
@ -3045,7 +3045,7 @@ var OpenStackSDTestCases = []scrapeCRDTestCase{
scrapeConfigSpec: monitoringv1alpha1.ScrapeConfigSpec{
OpenStackSDConfigs: []monitoringv1alpha1.OpenStackSDConfig{
{
Role: monitoringv1alpha1.OpenStackRole("hypervisor"),
Role: monitoringv1alpha1.OpenStackRoleHypervisor,
Region: "default",
AllTenants: ptr.To(true),
},
@ -3058,7 +3058,7 @@ var OpenStackSDTestCases = []scrapeCRDTestCase{
scrapeConfigSpec: monitoringv1alpha1.ScrapeConfigSpec{
OpenStackSDConfigs: []monitoringv1alpha1.OpenStackSDConfig{
{
Role: monitoringv1alpha1.OpenStackRole("hypervisor"),
Role: monitoringv1alpha1.OpenStackRoleHypervisor,
Region: "default",
AllTenants: ptr.To(false),
},
@ -3071,7 +3071,7 @@ var OpenStackSDTestCases = []scrapeCRDTestCase{
scrapeConfigSpec: monitoringv1alpha1.ScrapeConfigSpec{
OpenStackSDConfigs: []monitoringv1alpha1.OpenStackSDConfig{
{
Role: monitoringv1alpha1.OpenStackRole("hypervisor"),
Role: monitoringv1alpha1.OpenStackRoleHypervisor,
Region: "default",
RefreshInterval: ptr.To(monitoringv1.Duration("30s")),
},
@ -3084,7 +3084,7 @@ var OpenStackSDTestCases = []scrapeCRDTestCase{
scrapeConfigSpec: monitoringv1alpha1.ScrapeConfigSpec{
OpenStackSDConfigs: []monitoringv1alpha1.OpenStackSDConfig{
{
Role: monitoringv1alpha1.OpenStackRole("hypervisor"),
Role: monitoringv1alpha1.OpenStackRoleHypervisor,
Region: "default",
RefreshInterval: ptr.To(monitoringv1.Duration("30g")),
},
@ -3097,7 +3097,7 @@ var OpenStackSDTestCases = []scrapeCRDTestCase{
scrapeConfigSpec: monitoringv1alpha1.ScrapeConfigSpec{
OpenStackSDConfigs: []monitoringv1alpha1.OpenStackSDConfig{
{
Role: monitoringv1alpha1.OpenStackRole("hypervisor"),
Role: monitoringv1alpha1.OpenStackRoleHypervisor,
Region: "default",
Port: ptr.To(int32(8080)),
},
@ -3110,7 +3110,7 @@ var OpenStackSDTestCases = []scrapeCRDTestCase{
scrapeConfigSpec: monitoringv1alpha1.ScrapeConfigSpec{
OpenStackSDConfigs: []monitoringv1alpha1.OpenStackSDConfig{
{
Role: monitoringv1alpha1.OpenStackRole("hypervisor"),
Role: monitoringv1alpha1.OpenStackRoleHypervisor,
Region: "default",
Port: ptr.To(int32(-1)),
},
@ -3123,7 +3123,7 @@ var OpenStackSDTestCases = []scrapeCRDTestCase{
scrapeConfigSpec: monitoringv1alpha1.ScrapeConfigSpec{
OpenStackSDConfigs: []monitoringv1alpha1.OpenStackSDConfig{
{
Role: monitoringv1alpha1.OpenStackRole("hypervisor"),
Role: monitoringv1alpha1.OpenStackRoleHypervisor,
Region: "default",
Port: ptr.To(int32(65537)),
},
@ -3136,7 +3136,7 @@ var OpenStackSDTestCases = []scrapeCRDTestCase{
scrapeConfigSpec: monitoringv1alpha1.ScrapeConfigSpec{
OpenStackSDConfigs: []monitoringv1alpha1.OpenStackSDConfig{
{
Role: monitoringv1alpha1.OpenStackRole("hypervisor"),
Role: monitoringv1alpha1.OpenStackRoleHypervisor,
Region: "default",
Availability: ptr.To("public"),
},
@ -3149,7 +3149,7 @@ var OpenStackSDTestCases = []scrapeCRDTestCase{
scrapeConfigSpec: monitoringv1alpha1.ScrapeConfigSpec{
OpenStackSDConfigs: []monitoringv1alpha1.OpenStackSDConfig{
{
Role: monitoringv1alpha1.OpenStackRole("hypervisor"),
Role: monitoringv1alpha1.OpenStackRoleHypervisor,
Region: "default",
Availability: ptr.To("admin"),
},
@ -3162,7 +3162,7 @@ var OpenStackSDTestCases = []scrapeCRDTestCase{
scrapeConfigSpec: monitoringv1alpha1.ScrapeConfigSpec{
OpenStackSDConfigs: []monitoringv1alpha1.OpenStackSDConfig{
{
Role: monitoringv1alpha1.OpenStackRole("hypervisor"),
Role: monitoringv1alpha1.OpenStackRoleHypervisor,
Region: "default",
Availability: ptr.To("internal"),
},
@ -3175,7 +3175,7 @@ var OpenStackSDTestCases = []scrapeCRDTestCase{
scrapeConfigSpec: monitoringv1alpha1.ScrapeConfigSpec{
OpenStackSDConfigs: []monitoringv1alpha1.OpenStackSDConfig{
{
Role: monitoringv1alpha1.OpenStackRole("hypervisor"),
Role: monitoringv1alpha1.OpenStackRoleHypervisor,
Region: "default",
Availability: ptr.To("private"),
},
@ -3188,7 +3188,7 @@ var OpenStackSDTestCases = []scrapeCRDTestCase{
scrapeConfigSpec: monitoringv1alpha1.ScrapeConfigSpec{
OpenStackSDConfigs: []monitoringv1alpha1.OpenStackSDConfig{
{
Role: monitoringv1alpha1.OpenStackRole("hypervisor"),
Role: monitoringv1alpha1.OpenStackRoleHypervisor,
Region: "default",
Availability: ptr.To(""),
},