Fix remote cluster access ref (#19)

mirzakopic · web-flow · commit 3cc44c348d54 · 2025-05-23T17:24:30.000+02:00
* change interval name and fix examples

* fix remote ca ref, needs to be optional

* fix remote ca ref, needs to be optional nil

* fix remote ca ref, needs to be optional nil
diff --git a/api/v1alpha1/managedmetric_types.go b/api/v1alpha1/managedmetric_types.go
@@ -46,7 +46,8 @@ type ManagedMetricSpec struct {
 	// +kubebuilder:default:="10m"
 	Interval metav1.Duration `json:"interval,omitempty"`
 
-	RemoteClusterAccessRef `json:"remoteClusterAccessRef,omitempty"`
+	// +optional
+	*RemoteClusterAccessRef `json:"remoteClusterAccessRef,omitempty"`
 }
 
 // ManagedObservation represents the latest available observation of an object's state
diff --git a/api/v1alpha1/metric_types.go b/api/v1alpha1/metric_types.go
@@ -55,7 +55,8 @@ type MetricSpec struct {
 	// +kubebuilder:default:="10m"
 	Interval metav1.Duration `json:"interval,omitempty"`
 
-	RemoteClusterAccessRef `json:"remoteClusterAccessRef,omitempty"`
+	// +optional
+	*RemoteClusterAccessRef `json:"remoteClusterAccessRef,omitempty"`
 
 	Projections []Projection `json:"projections,omitempty"`
 }
diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/internal/controller/managedmetric_controller.go b/internal/controller/managedmetric_controller.go
@@ -111,7 +111,7 @@ func (r *ManagedMetricReconciler) Reconcile(ctx context.Context, req ctrl.Reques
 	/*
 		1.2 Create QueryConfig to query the resources in the K8S cluster or external cluster based on the kubeconfig secret reference
 	*/
-	queryConfig, err := createQueryConfig(ctx, &metric.Spec.RemoteClusterAccessRef, r)
+	queryConfig, err := createQueryConfig(ctx, metric.Spec.RemoteClusterAccessRef, r)
 	if err != nil {
 		return ctrl.Result{RequeueAfter: RequeueAfterError}, err
 	}
diff --git a/internal/controller/metric_controller.go b/internal/controller/metric_controller.go
@@ -144,7 +144,7 @@ func (r *MetricReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctr
 	/*
 		1.2 Create QueryConfig to query the resources in the K8S cluster or external cluster based on the kubeconfig secret reference
 	*/
-	queryConfig, err := createQC(ctx, &metric.Spec.RemoteClusterAccessRef, r)
+	queryConfig, err := createQC(ctx, metric.Spec.RemoteClusterAccessRef, r)
 	if err != nil {
 		return ctrl.Result{RequeueAfter: RequeueAfterError}, err
 	}

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,8 @@ type ManagedMetricSpec struct {`
`46`	`46`	`// +kubebuilder:default:="10m"`
`47`	`47`	Interval metav1.Duration `json:"interval,omitempty"`
`48`	`48`
`49`		- RemoteClusterAccessRef `json:"remoteClusterAccessRef,omitempty"`
	`49`	`+ // +optional`
	`50`	+ *RemoteClusterAccessRef `json:"remoteClusterAccessRef,omitempty"`
`50`	`51`	`}`
`51`	`52`
`52`	`53`	`// ManagedObservation represents the latest available observation of an object's state`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,8 @@ type MetricSpec struct {`
`55`	`55`	`// +kubebuilder:default:="10m"`
`56`	`56`	Interval metav1.Duration `json:"interval,omitempty"`
`57`	`57`
`58`		- RemoteClusterAccessRef `json:"remoteClusterAccessRef,omitempty"`
	`58`	`+ // +optional`
	`59`	+ *RemoteClusterAccessRef `json:"remoteClusterAccessRef,omitempty"`
`59`	`60`
`60`	`61`	Projections []Projection `json:"projections,omitempty"`
`61`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -111,7 +111,7 @@ func (r *ManagedMetricReconciler) Reconcile(ctx context.Context, req ctrl.Reques`
`111`	`111`	`/*`
`112`	`112`	`1.2 Create QueryConfig to query the resources in the K8S cluster or external cluster based on the kubeconfig secret reference`
`113`	`113`	`*/`
`114`		`- queryConfig, err := createQueryConfig(ctx, &metric.Spec.RemoteClusterAccessRef, r)`
	`114`	`+ queryConfig, err := createQueryConfig(ctx, metric.Spec.RemoteClusterAccessRef, r)`
`115`	`115`	`if err != nil {`
`116`	`116`	`return ctrl.Result{RequeueAfter: RequeueAfterError}, err`
`117`	`117`	`}`
Original file line number	Diff line number	Diff line change
`@@ -144,7 +144,7 @@ func (r *MetricReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctr`
`144`	`144`	`/*`
`145`	`145`	`1.2 Create QueryConfig to query the resources in the K8S cluster or external cluster based on the kubeconfig secret reference`
`146`	`146`	`*/`
`147`		`- queryConfig, err := createQC(ctx, &metric.Spec.RemoteClusterAccessRef, r)`
	`147`	`+ queryConfig, err := createQC(ctx, metric.Spec.RemoteClusterAccessRef, r)`
`148`	`148`	`if err != nil {`
`149`	`149`	`return ctrl.Result{RequeueAfter: RequeueAfterError}, err`
`150`	`150`	`}`