Merge pull request #28 from coroot/remote_coroot

support `remoteCoroot` in project definition

Author: def

api/v1/config.go

@@ -72,14 +72,16 @@ type OpenAICompatibleSpec struct {
 	Model string `json:"model"`
 }
 
-// +kubebuilder:validation:XValidation:rule="has(self.memberProjects) && size(self.memberProjects) > 0 ? !has(self.apiKeys) || size(self.apiKeys) == 0 : has(self.apiKeys) && size(self.apiKeys) > 0",message="Exactly one of memberProjects or apiKeys must be non-empty."
+// +kubebuilder:validation:XValidation:rule="(has(self.memberProjects) && size(self.memberProjects) > 0 ? 1 : 0) + (has(self.remoteCoroot) ? 1 : 0) + (has(self.apiKeys) && size(self.apiKeys) > 0 ? 1 : 0) == 1",message="Exactly one of memberProjects, remoteCoroot, or apiKeys must be set."
 type ProjectSpec struct {
 	// Project name (e.g., production, staging; required).
 	// +kubebuilder:validation:Required
 	Name string `json:"name,omitempty"`
 	// Names of existing projects to aggregate (multi-cluster mode).
 	MemberProjects []string `json:"memberProjects,omitempty"`
-	// Project API keys, used by agents to send telemetry data (required unless memberProjects is set).
+	// Use another Coroot instance as the data source for this project.
+	RemoteCoroot *RemoteCorootSpec `json:"remoteCoroot,omitempty"`
+	// Project API keys, used by agents to send telemetry data (required unless memberProjects or remoteCoroot is set).
 	ApiKeys []ApiKeySpec `json:"apiKeys,omitempty"`
 	// Notification integrations.
 	NotificationIntegrations *NotificationIntegrationsSpec `json:"notificationIntegrations,omitempty"`
@@ -100,6 +102,21 @@ type ApiKeySpec struct {
 	Description string `json:"description,omitempty"`
 }
 
+type RemoteCorootSpec struct {
+	// Base URL of the remote Coroot instance.
+	// +kubebuilder:validation:Pattern="^https?://.+$"
+	Url string `json:"url,omitempty"`
+	// Whether to skip verification of the Coroot server's TLS certificate.
+	TlsSkipVerify bool `json:"tlsSkipVerify,omitempty"`
+	// API key of the remote project.
+	ApiKey string `json:"apiKey,omitempty"`
+	// Secret containing the API key.
+	ApiKeySecret *corev1.SecretKeySelector `json:"apiKeySecret,omitempty"`
+	// Prometheus query resolution/refresh interval (e.g. 15s).
+	// +kubebuilder:validation:Pattern="^[0-9]+[smhdwy]$"
+	MetricResolution string `json:"metricResolution,omitempty"`
+}
+
 type NotificationIntegrationsSpec struct {
 	// The URL of Coroot instance (required). Used for generating links in notifications.
 	// +kubebuilder:validation:Pattern="^https?://.+$"

api/v1/zz_generated.deepcopy.go

@@ -6418,7 +6418,7 @@ spec:
                   properties:
                     apiKeys:
                       description: Project API keys, used by agents to send telemetry
-                        data (required unless memberProjects is set).
+                        data (required unless memberProjects or remoteCoroot is set).
                       items:
                         properties:
                           description:
@@ -6854,14 +6854,60 @@ spec:
                       required:
                       - baseURL
                       type: object
+                    remoteCoroot:
+                      description: Use another Coroot instance as the data source
+                        for this project.
+                      properties:
+                        apiKey:
+                          description: API key of the remote project.
+                          type: string
+                        apiKeySecret:
+                          description: Secret containing the API key.
+                          properties:
+                            key:
+                              description: The key of the secret to select from.  Must
+                                be a valid secret key.
+                              type: string
+                            name:
+                              default: ""
+                              description: |-
+                                Name of the referent.
+                                This field is effectively required, but due to backwards compatibility is
+                                allowed to be empty. Instances of this type with an empty value here are
+                                almost certainly wrong.
+                                More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#names
+                              type: string
+                            optional:
+                              description: Specify whether the Secret or its key must
+                                be defined
+                              type: boolean
+                          required:
+                          - key
+                          type: object
+                          x-kubernetes-map-type: atomic
+                        metricResolution:
+                          description: Prometheus query resolution/refresh interval
+                            (e.g. 15s).
+                          pattern: ^[0-9]+[smhdwy]$
+                          type: string
+                        tlsSkipVerify:
+                          description: Whether to skip verification of the Coroot
+                            server's TLS certificate.
+                          type: boolean
+                        url:
+                          description: Base URL of the remote Coroot instance.
+                          pattern: ^https?://.+$
+                          type: string
+                      type: object
                   required:
                   - name
                   type: object
                   x-kubernetes-validations:
-                  - message: Exactly one of memberProjects or apiKeys must be non-empty.
-                    rule: 'has(self.memberProjects) && size(self.memberProjects) >
-                      0 ? !has(self.apiKeys) || size(self.apiKeys) == 0 : has(self.apiKeys)
-                      && size(self.apiKeys) > 0'
+                  - message: Exactly one of memberProjects, remoteCoroot, or apiKeys
+                      must be set.
+                    rule: '(has(self.memberProjects) && size(self.memberProjects)
+                      > 0 ? 1 : 0) + (has(self.remoteCoroot) ? 1 : 0) + (has(self.apiKeys)
+                      && size(self.apiKeys) > 0 ? 1 : 0) == 1'
                 type: array
               prometheus:
                 description: Prometheus configuration.

config/crd/coroot.com_coroots.yaml

@@ -82,7 +82,22 @@ func (r *CorootReconciler) validateCoroot(ctx context.Context, cr *corootv1.Coro
 	}
 
 	apiKeySecrets := map[string][]string{}
-	for _, p := range cr.Spec.Projects {
+	for i := range cr.Spec.Projects {
+		p := &cr.Spec.Projects[i]
+		if rc := p.RemoteCoroot; rc != nil {
+			if rc.ApiKeySecret != nil {
+				if _, err = r.GetSecret(ctx, cr, rc.ApiKeySecret); err != nil {
+					logErr("Failed to get Remote Coroot API Key: %s", err.Error())
+				} else {
+					rc.ApiKey = configEnvs.Add(rc.ApiKeySecret)
+				}
+				rc.ApiKeySecret = nil
+			}
+			if rc.Url == "" || rc.ApiKey == "" || rc.MetricResolution == "" {
+				logErr("Remote Coroot requires url, apiKey, and metricResolution.")
+				p.RemoteCoroot = nil
+			}
+		}
 		for i, k := range p.ApiKeys {
 			if k.KeySecret != nil {
 				apiKeySecrets[k.KeySecret.Name] = append(apiKeySecrets[k.KeySecret.Name], k.KeySecret.Key)