Fix scheduler e2e tests and adjust recommended cortex secrets example structure

Author: PhilippMatthes

cortex.secrets.example.yaml

@@ -20,6 +20,23 @@ sharedSSOCert: &sharedSSOCert
   # If true, the certificate is not verified.
   selfSigned: "false"
 
+# Override the endpoints and credentials to your OpenStack.
+keystone: &keystone
+  url: https://path-to-keystone/v3
+  availability: public
+  username: openstack-user-with-all-project-read-access
+  password: openstack-user-password
+  projectName: openstack-project-of-user
+  userDomainName: openstack-domain-of-user
+  projectDomainName: openstack-domain-of-project-scoped-to
+  sso:
+    enabled: false
+    <<: *sharedSSOCert
+
+global:
+  secrets:
+    keystone: *keystone
+
 # For the cortex knowledge operator.
 datasources:
   prometheus:

scheduler/internal/conf/conf.go

@@ -180,39 +180,6 @@ type SchedulerAPIConfig struct {
 	LogRequestBodies bool `json:"logRequestBodies"`
 }
 
-// Configuration for the nova service.
-type SyncOpenStackNovaConfig struct {
-	// Availability of the service, such as "public", "internal", or "admin".
-	Availability string `json:"availability"`
-}
-
-// Configuration for the identity service.
-type SyncOpenStackIdentityConfig struct {
-	// Availability of the service, such as "public", "internal", or "admin".
-	Availability string `json:"availability"`
-}
-
-// Configuration for the manila service.
-type SyncOpenStackManilaConfig struct {
-	// Availability of the service, such as "public", "internal", or "admin".
-	Availability string `json:"availability"`
-}
-
-// Configuration for the sync/openstack module.
-type SyncOpenStackConfig struct {
-	// Configuration for the nova service.
-	Nova SyncOpenStackNovaConfig `json:"nova"`
-	// Configuration for the identity service.
-	Identity SyncOpenStackIdentityConfig `json:"identity"`
-	// Configuration for the manila service.
-	Manila SyncOpenStackManilaConfig `json:"manila"`
-}
-
-// Configuration for the sync module.
-type SyncConfig struct {
-	OpenStack SyncOpenStackConfig `json:"openstack"`
-}
-
 type Config struct {
 	SchedulerConfig `json:"scheduler"`
 
@@ -225,5 +192,4 @@ type Config struct {
 	// Required for e2e tests.
 	libconf.KeystoneConfig `json:"keystone"`
 	libconf.APIConfig      `json:"api"`
-	SyncConfig             `json:"sync"`
 }

scheduler/internal/e2e/manila/checks.go

@@ -28,7 +28,6 @@ func RunChecks(ctx context.Context, config conf.Config) {
 // Check that the Manila external scheduler returns a valid set of share hosts.
 func checkManilaSchedulerReturnsValidHosts(ctx context.Context, config conf.Config) {
 	keystoneConf := config.KeystoneConfig
-	osConf := config.SyncConfig.OpenStack
 	slog.Info("authenticating against openstack", "url", keystoneConf.URL)
 	authOptions := gophercloud.AuthOptions{
 		IdentityEndpoint: keystoneConf.URL,
@@ -48,7 +47,7 @@ func checkManilaSchedulerReturnsValidHosts(ctx context.Context, config conf.Conf
 	gophercloud.ServiceTypeAliases["shared-file-system"] = []string{"sharev2"}
 	sc := must.Return(openstack.NewSharedFileSystemV2(pc, gophercloud.EndpointOpts{
 		Type:         "sharev2",
-		Availability: gophercloud.Availability(osConf.Manila.Availability),
+		Availability: gophercloud.Availability(keystoneConf.Availability),
 	}))
 	sc.Microversion = "2.65"
 	slog.Info("authenticated against openstack", "url", sc.Endpoint)

scheduler/internal/e2e/nova/checks.go

@@ -92,7 +92,6 @@ func getHypervisors(ctx context.Context, sc *gophercloud.ServiceClient) ([]nova.
 // Prepare the test by fetching the necessary data from OpenStack.
 func prepare(ctx context.Context, config conf.Config) datacenter {
 	keystoneConf := config.KeystoneConfig
-	osConf := config.SyncConfig.OpenStack
 	slog.Info("authenticating against openstack", "url", keystoneConf.URL)
 	authOptions := gophercloud.AuthOptions{
 		IdentityEndpoint: keystoneConf.URL,
@@ -112,7 +111,7 @@ func prepare(ctx context.Context, config conf.Config) datacenter {
 	slog.Info("locating nova endpoint")
 	novaURL := must.Return(pc.EndpointLocator(gophercloud.EndpointOpts{
 		Type:         "compute",
-		Availability: gophercloud.Availability(osConf.Nova.Availability),
+		Availability: gophercloud.Availability(keystoneConf.Availability),
 	}))
 	novaSC := &gophercloud.ServiceClient{
 		ProviderClient: pc,
@@ -169,7 +168,7 @@ func prepare(ctx context.Context, config conf.Config) datacenter {
 	slog.Info("locating keystone endpoint")
 	keystoneURL := must.Return(pc.EndpointLocator(gophercloud.EndpointOpts{
 		Type:         "identity",
-		Availability: gophercloud.Availability(osConf.Identity.Availability),
+		Availability: gophercloud.Availability(keystoneConf.Availability),
 	}))
 	keystoneSC := &gophercloud.ServiceClient{
 		ProviderClient: pc,