Merge branch 'main' of https://github.com/odigos-io/odigos

.dockerignore

@@ -4,4 +4,6 @@ Dockerfile
 odiglet/Dockerfile
 odiglet/base.Dockerfile
 odiglet/debug.Dockerfile
-tests # not needed in context for odigos components builds
+tests # not needed in context for odigos components builds
+go.work
+go.work.sum

.github/workflows/e2e.yaml

@@ -33,7 +33,7 @@ jobs:
           go build -tags=embed_manifests -o odigos
 
       - name: Upload CLI
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: odigos-cli
           path: cli/odigos
@@ -50,7 +50,7 @@ jobs:
           docker save -o odigos-images.tar $(docker images --format "{{.Repository}}:{{.Tag}}" | grep "odigos")
 
       - name: Upload Odigos Images
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: odigos-images
           path: odigos-images.tar
@@ -115,15 +115,15 @@ jobs:
           yarn install
 
       - name: Download and Load Docker Images to Kind
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: odigos-images
       - run: |
           docker load -i odigos-images.tar
           TAG=e2e-test make load-to-kind
 
       - name: Download CLI binary
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: odigos-cli
       - run: |

autoscaler/controllers/collectorsgroup_controller.go

@@ -47,7 +47,7 @@ func (r *CollectorsGroupReconciler) Reconcile(ctx context.Context, req ctrl.Requ
 	logger := log.FromContext(ctx)
 	logger.V(0).Info("Reconciling CollectorsGroup")
 
-	err := gateway.Sync(ctx, r.Client, r.Scheme, r.ImagePullSecrets, r.OdigosVersion, r.Config.MetricsServerEnabled)
+	err := gateway.Sync(ctx, r.Client, r.Scheme, r.ImagePullSecrets, r.OdigosVersion, r.Config)
 	if err != nil {
 		return ctrl.Result{}, err
 	}

autoscaler/controllers/controller_config/controller_config.go

@@ -1,5 +1,7 @@
 package controllerconfig
 
+import "k8s.io/apimachinery/pkg/util/version"
+
 type ControllerConfig struct {
-	MetricsServerEnabled bool
+	K8sVersion *version.Version
 }

autoscaler/controllers/destination_controller.go

@@ -41,7 +41,7 @@ type DestinationReconciler struct {
 func (r *DestinationReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
 	logger := log.FromContext(ctx)
 	logger.V(0).Info("Reconciling Destination")
-	err := gateway.Sync(ctx, r.Client, r.Scheme, r.ImagePullSecrets, r.OdigosVersion, r.Config.MetricsServerEnabled)
+	err := gateway.Sync(ctx, r.Client, r.Scheme, r.ImagePullSecrets, r.OdigosVersion, r.Config)
 	if err != nil {
 		return ctrl.Result{}, err
 	}

autoscaler/controllers/gateway/hpa.go

@@ -4,19 +4,20 @@ import (
 	"context"
 	"fmt"
 
-	"k8s.io/apimachinery/pkg/types"
-	"sigs.k8s.io/yaml"
-
-	"sigs.k8s.io/controller-runtime/pkg/log"
-
+	"github.com/odigos-io/odigos/k8sutils/pkg/consts"
 	"k8s.io/apimachinery/pkg/api/resource"
+	"k8s.io/apimachinery/pkg/util/version"
+	"k8s.io/utils/pointer"
+	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
+	"sigs.k8s.io/controller-runtime/pkg/log"
 
 	odigosv1 "github.com/odigos-io/odigos/api/odigos/v1alpha1"
-	autoscaling "k8s.io/api/autoscaling/v2"
+	autoscalingv2 "k8s.io/api/autoscaling/v2"
+	autoscalingv2beta1 "k8s.io/api/autoscaling/v2beta1"
+	autoscalingv2beta2 "k8s.io/api/autoscaling/v2beta2"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
-	"sigs.k8s.io/controller-runtime/pkg/client"
-	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 )
 
 const (
@@ -29,59 +30,134 @@ var (
 	stabilizationWindowSeconds = intPtr(300) // cooldown period for scaling down
 )
 
-func syncHPA(gateway *odigosv1.CollectorsGroup, ctx context.Context, c client.Client, scheme *runtime.Scheme, memConfig *memoryConfigurations) error {
+func syncHPA(gateway *odigosv1.CollectorsGroup, ctx context.Context, c client.Client, scheme *runtime.Scheme, memConfig *memoryConfigurations, kubeVersion *version.Version) error {
 	logger := log.FromContext(ctx)
+
+	var hpa client.Object
+
 	memLimit := memConfig.gomemlimitMiB * memoryLimitPercentageForHPA / 100.0
 	metricQuantity := resource.MustParse(fmt.Sprintf("%dMi", memLimit))
-	hpa := &autoscaling.HorizontalPodAutoscaler{
-		TypeMeta: metav1.TypeMeta{
-			APIVersion: "autoscaling/v2",
-			Kind:       "HorizontalPodAutoscaler",
-		},
-		ObjectMeta: metav1.ObjectMeta{
-			Name:      gateway.Name,
-			Namespace: gateway.Namespace,
-		},
-		Spec: autoscaling.HorizontalPodAutoscalerSpec{
-			ScaleTargetRef: autoscaling.CrossVersionObjectReference{
-				APIVersion: "apps/v1",
-				Kind:       "Deployment",
-				Name:       gateway.Name,
+
+	switch {
+	case kubeVersion.LessThan(version.MustParse("1.23.0")):
+		hpa = &autoscalingv2beta1.HorizontalPodAutoscaler{
+			TypeMeta: metav1.TypeMeta{
+				APIVersion: "autoscaling/v2beta1",
+				Kind:       "HorizontalPodAutoscaler",
 			},
-			MinReplicas: minReplicas,
-			MaxReplicas: maxReplicas,
-			Metrics: []autoscaling.MetricSpec{
-				{
-					Type: autoscaling.ResourceMetricSourceType,
-					Resource: &autoscaling.ResourceMetricSource{
-						Name: "memory",
-						Target: autoscaling.MetricTarget{
-							Type:         autoscaling.AverageValueMetricType,
-							AverageValue: &metricQuantity,
+			ObjectMeta: buildHPACommonFields(gateway),
+			Spec: autoscalingv2beta1.HorizontalPodAutoscalerSpec{
+				ScaleTargetRef: autoscalingv2beta1.CrossVersionObjectReference{
+					APIVersion: "apps/v1",
+					Kind:       "Deployment",
+					Name:       consts.OdigosClusterCollectorDeploymentName,
+				},
+				MinReplicas: minReplicas,
+				MaxReplicas: maxReplicas,
+				Metrics: []autoscalingv2beta1.MetricSpec{
+					{
+						Type: autoscalingv2beta1.ResourceMetricSourceType,
+						Resource: &autoscalingv2beta1.ResourceMetricSource{
+							Name:               "memory",
+							TargetAverageValue: &metricQuantity,
 						},
 					},
 				},
 			},
-			Behavior: &autoscaling.HorizontalPodAutoscalerBehavior{
-				ScaleDown: &autoscaling.HPAScalingRules{
-					StabilizationWindowSeconds: stabilizationWindowSeconds,
+		}
+	case kubeVersion.LessThan(version.MustParse("1.25.0")):
+		hpa = &autoscalingv2beta2.HorizontalPodAutoscaler{
+			TypeMeta: metav1.TypeMeta{
+				APIVersion: "autoscaling/v2beta2",
+				Kind:       "HorizontalPodAutoscaler",
+			},
+			ObjectMeta: buildHPACommonFields(gateway),
+			Spec: autoscalingv2beta2.HorizontalPodAutoscalerSpec{
+				ScaleTargetRef: autoscalingv2beta2.CrossVersionObjectReference{
+					APIVersion: "apps/v1",
+					Kind:       "Deployment",
+					Name:       consts.OdigosClusterCollectorDeploymentName,
+				},
+				MinReplicas: minReplicas,
+				MaxReplicas: maxReplicas,
+				Metrics: []autoscalingv2beta2.MetricSpec{
+					{
+						Type: autoscalingv2beta2.ResourceMetricSourceType,
+						Resource: &autoscalingv2beta2.ResourceMetricSource{
+							Name: "memory",
+							Target: autoscalingv2beta2.MetricTarget{
+								Type:         autoscalingv2beta2.AverageValueMetricType,
+								AverageValue: &metricQuantity,
+							},
+						},
+					},
+				},
+				Behavior: &autoscalingv2beta2.HorizontalPodAutoscalerBehavior{
+					ScaleDown: &autoscalingv2beta2.HPAScalingRules{
+						StabilizationWindowSeconds: stabilizationWindowSeconds,
+					},
+				},
+			},
+		}
+	default:
+		hpa = &autoscalingv2.HorizontalPodAutoscaler{
+			TypeMeta: metav1.TypeMeta{
+				APIVersion: "autoscaling/v2",
+				Kind:       "HorizontalPodAutoscaler",
+			},
+			ObjectMeta: buildHPACommonFields(gateway),
+			Spec: autoscalingv2.HorizontalPodAutoscalerSpec{
+				ScaleTargetRef: autoscalingv2.CrossVersionObjectReference{
+					APIVersion: "apps/v1",
+					Kind:       "Deployment",
+					Name:       consts.OdigosClusterCollectorDeploymentName,
+				},
+				MinReplicas: minReplicas,
+				MaxReplicas: maxReplicas,
+				Metrics: []autoscalingv2.MetricSpec{
+					{
+						Type: autoscalingv2.ResourceMetricSourceType,
+						Resource: &autoscalingv2.ResourceMetricSource{
+							Name: "memory",
+							Target: autoscalingv2.MetricTarget{
+								Type:         autoscalingv2.AverageValueMetricType,
+								AverageValue: &metricQuantity,
+							},
+						},
+					},
+				},
+				Behavior: &autoscalingv2.HorizontalPodAutoscalerBehavior{
+					ScaleDown: &autoscalingv2.HPAScalingRules{
+						StabilizationWindowSeconds: stabilizationWindowSeconds,
+					},
 				},
 			},
-		},
+		}
 	}
 
 	if err := controllerutil.SetControllerReference(gateway, hpa, scheme); err != nil {
 		logger.Error(err, "Failed to set controller reference")
 		return err
 	}
 
-	hpaBytes, _ := yaml.Marshal(hpa)
-
-	force := true
-	patchOptions := client.PatchOptions{
+	// Use the Apply patch strategy
+	applyOpts := &client.PatchOptions{
 		FieldManager: "odigos",
-		Force:        &force,
+		Force:        pointer.Bool(true),
+	}
+
+	if err := c.Patch(ctx, hpa, client.Apply, applyOpts); err != nil {
+		logger.Error(err, "Failed to apply patch to HPA")
+		return err
 	}
 
-	return c.Patch(ctx, hpa, client.RawPatch(types.ApplyPatchType, hpaBytes), &patchOptions)
+	logger.Info("Successfully applied HPA", "name", consts.OdigosClusterCollectorDeploymentName, "namespace", gateway.Namespace)
+	return nil
+}
+
+func buildHPACommonFields(gateway *odigosv1.CollectorsGroup) metav1.ObjectMeta {
+	return metav1.ObjectMeta{
+		Name:      consts.OdigosClusterCollectorDeploymentName,
+		Namespace: gateway.Namespace,
+	}
 }

autoscaler/controllers/gateway/root.go

@@ -5,6 +5,7 @@ import (
 
 	odigosv1 "github.com/odigos-io/odigos/api/odigos/v1alpha1"
 	commonconf "github.com/odigos-io/odigos/autoscaler/controllers/common"
+	controllerconfig "github.com/odigos-io/odigos/autoscaler/controllers/controller_config"
 	odigoscommon "github.com/odigos-io/odigos/common"
 	k8sconsts "github.com/odigos-io/odigos/k8sutils/pkg/consts"
 	"github.com/odigos-io/odigos/k8sutils/pkg/env"
@@ -22,7 +23,7 @@ var (
 )
 
 func Sync(ctx context.Context, k8sClient client.Client, scheme *runtime.Scheme, imagePullSecrets []string, odigosVersion string,
-	metricsServerExists bool) error {
+	config *controllerconfig.ControllerConfig) error {
 	logger := log.FromContext(ctx)
 
 	odigosNs := env.GetCurrentNamespace()
@@ -55,7 +56,7 @@ func Sync(ctx context.Context, k8sClient client.Client, scheme *runtime.Scheme,
 	}
 
 	err = syncGateway(&dests, &processors, &gatewayCollectorGroup, ctx, k8sClient, scheme, imagePullSecrets, odigosVersion, &odigosConfig,
-		metricsServerExists)
+		config)
 	statusPatchString := commonconf.GetCollectorsGroupDeployedConditionsPatch(err)
 	statusErr := k8sClient.Status().Patch(ctx, &gatewayCollectorGroup, client.RawPatch(types.MergePatchType, []byte(statusPatchString)))
 	if statusErr != nil {
@@ -68,7 +69,7 @@ func Sync(ctx context.Context, k8sClient client.Client, scheme *runtime.Scheme,
 func syncGateway(dests *odigosv1.DestinationList, processors *odigosv1.ProcessorList,
 	gateway *odigosv1.CollectorsGroup, ctx context.Context,
 	c client.Client, scheme *runtime.Scheme, imagePullSecrets []string, odigosVersion string, odigosConfig *odigoscommon.OdigosConfiguration,
-	metricsServerExists bool) error {
+	config *controllerconfig.ControllerConfig) error {
 	logger := log.FromContext(ctx)
 	logger.V(0).Info("Syncing gateway")
 
@@ -104,11 +105,9 @@ func syncGateway(dests *odigosv1.DestinationList, processors *odigosv1.Processor
 		return err
 	}
 
-	if metricsServerExists {
-		err = syncHPA(gateway, ctx, c, scheme, memConfig)
-		if err != nil {
-			logger.Error(err, "Failed to sync HPA")
-		}
+	err = syncHPA(gateway, ctx, c, scheme, memConfig, config.K8sVersion)
+	if err != nil {
+		logger.Error(err, "Failed to sync HPA")
 	}
 
 	return nil

autoscaler/controllers/odigosconfig_controller.go

@@ -27,7 +27,7 @@ func (r *OdigosConfigReconciler) Reconcile(ctx context.Context, req ctrl.Request
 	logger := log.FromContext(ctx)
 	logger.V(0).Info("Reconciling Odigos Configuration")
 
-	err := gateway.Sync(ctx, r.Client, r.Scheme, r.ImagePullSecrets, r.OdigosVersion, r.Config.MetricsServerEnabled)
+	err := gateway.Sync(ctx, r.Client, r.Scheme, r.ImagePullSecrets, r.OdigosVersion, r.Config)
 	if err != nil {
 		return ctrl.Result{}, err
 	}

autoscaler/controllers/processor_controller.go

@@ -30,7 +30,7 @@ func (r *ProcessorReconciler) Reconcile(ctx context.Context, req ctrl.Request) (
 	logger := log.FromContext(ctx)
 	logger.V(0).Info("Reconciling Processor")
 
-	err := gateway.Sync(ctx, r.Client, r.Scheme, r.ImagePullSecrets, r.OdigosVersion, r.Config.MetricsServerEnabled)
+	err := gateway.Sync(ctx, r.Client, r.Scheme, r.ImagePullSecrets, r.OdigosVersion, r.Config)
 	if err != nil {
 		return ctrl.Result{}, err
 	}

autoscaler/controllers/secret_controller.go

@@ -27,7 +27,7 @@ func (r *SecretReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctr
 	logger := log.FromContext(ctx)
 	logger.V(0).Info("Reconciling Secret")
 
-	err := gateway.Sync(ctx, r.Client, r.Scheme, r.ImagePullSecrets, r.OdigosVersion, r.Config.MetricsServerEnabled)
+	err := gateway.Sync(ctx, r.Client, r.Scheme, r.ImagePullSecrets, r.OdigosVersion, r.Config)
 	if err != nil {
 		return ctrl.Result{}, err
 	}

autoscaler/go.mod

@@ -15,8 +15,8 @@ require (
 	k8s.io/api v0.31.0
 	k8s.io/apimachinery v0.31.0
 	k8s.io/client-go v0.31.0
+	k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
 	sigs.k8s.io/controller-runtime v0.19.0
-	sigs.k8s.io/yaml v1.4.0
 )
 
 require (
@@ -86,9 +86,9 @@ require (
 	k8s.io/apiextensions-apiserver v0.31.0 // indirect
 	k8s.io/klog/v2 v2.130.1 // indirect
 	k8s.io/kube-openapi v0.0.0-20240430033511-f0e62f92d13f // indirect
-	k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
+	sigs.k8s.io/yaml v1.4.0 // indirect
 )
 
 replace (