populate region from region service using annotation - I don't love it

Author: stevencrake-nscale

pkg/provisioners/helmapplications/observabilityagent/constants.go

@@ -0,0 +1,23 @@
+/*
+Copyright 2025 the Unikorn Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package observabilityagent
+
+const (
+	// RegionNameAnnotation is set on clusters to pass the friendly region name to the
+	// observability agent values generator.
+	RegionNameAnnotation = "observability-agent.unikorn-cloud.org/region-name"
+)

pkg/provisioners/helmapplications/observabilityagent/provisioner.go

@@ -47,9 +47,13 @@ func (p *Provisioner) Values(ctx context.Context, version unikornv1core.Semantic
 
 	values := map[string]any{
 		"clusterName": cluster.Name,
-		"region":      "glo1",
+		"region":      cluster.Annotations[RegionNameAnnotation],
 		"environment": "dev",
 	}
 
+	if values["region"] == "" {
+		values["region"] = cluster.Spec.RegionID
+	}
+
 	return values, nil
 }

pkg/provisioners/managers/cluster/provisioner.go

@@ -57,6 +57,7 @@ import (
 	"github.com/unikorn-cloud/kubernetes/pkg/provisioners/helmapplications/openstackcloudprovider"
 	"github.com/unikorn-cloud/kubernetes/pkg/provisioners/helmapplications/openstackplugincindercsi"
 	"github.com/unikorn-cloud/kubernetes/pkg/provisioners/helmapplications/vcluster"
+	regionutil "github.com/unikorn-cloud/kubernetes/pkg/util/region"
 	regionclient "github.com/unikorn-cloud/region/pkg/client"
 	regionapi "github.com/unikorn-cloud/region/pkg/openapi"
 
@@ -644,6 +645,31 @@ func (p *Provisioner) identityOptions(ctx context.Context, client regionapi.Clie
 	return options, nil
 }
 
+func (p *Provisioner) annotateRegion(ctx context.Context, client regionapi.ClientWithResponsesInterface) error {
+	organizationID, ok := p.cluster.Labels[coreconstants.OrganizationLabel]
+	if !ok {
+		return fmt.Errorf("%w: %s", ErrAnnotation, coreconstants.OrganizationLabel)
+	}
+
+	region, err := regionutil.Region(ctx, client, organizationID, p.cluster.Spec.RegionID)
+	if err != nil {
+		return err
+	}
+
+	if p.cluster.Annotations == nil {
+		p.cluster.Annotations = map[string]string{}
+	}
+
+	name := region.Metadata.Name
+	if name == "" {
+		name = p.cluster.Spec.RegionID
+	}
+
+	p.cluster.Annotations[observabilityagent.RegionNameAnnotation] = name
+
+	return nil
+}
+
 // Provision implements the Provision interface.
 func (p *Provisioner) Provision(ctx context.Context) error {
 	// The cluster manager is provisioned asynchronously as it takes a good minute
@@ -665,6 +691,10 @@ func (p *Provisioner) Provision(ctx context.Context) error {
 		return err
 	}
 
+	if err := p.annotateRegion(clientContext, client); err != nil {
+		return err
+	}
+
 	provisioner, err := p.getProvisioner(ctx, options, true)
 	if err != nil {
 		return err