refactor: use config version to track resource updates

api/config/crd/bases/odigos.io_odigosconfigurations.yaml

@@ -37,6 +37,8 @@ spec:
             properties:
               autoscalerImage:
                 type: string
+              configVersion:
+                type: integer
               ignoredNamespaces:
                 items:
                   type: string
@@ -56,6 +58,7 @@ spec:
               telemetryEnabled:
                 type: boolean
             required:
+            - configVersion
             - odigosVersion
             type: object
         type: object

api/odigos/v1alpha1/odigosconfig_types.go

@@ -7,6 +7,7 @@ import metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 // OdigosConfigurationSpec defines the desired state of OdigosConfiguration
 type OdigosConfigurationSpec struct {
 	OdigosVersion          string   `json:"odigosVersion"`
+	ConfigVersion          int      `json:"configVersion"`
 	TelemetryEnabled       bool     `json:"telemetryEnabled,omitempty"`
 	SidecarInstrumentation bool     `json:"sidecarInstrumentation,omitempty"`
 	IgnoredNamespaces      []string `json:"ignoredNamespaces,omitempty"`

cli/cmd/install.go

@@ -139,6 +139,7 @@ func createCRDs(ctx context.Context, cmd *cobra.Command, client *kube.Client, ns
 func createOdigosConfigSpec() odigosv1.OdigosConfigurationSpec {
 	return odigosv1.OdigosConfigurationSpec{
 		OdigosVersion:          versionFlag,
+		ConfigVersion:          1, // config version starts at 1 and incremented on every config change
 		TelemetryEnabled:       telemetryEnabled,
 		SidecarInstrumentation: sidecarInstrumentation,
 		IgnoredNamespaces:      ignoredNamespaces,

cli/cmd/resources/applyresources.go

@@ -28,7 +28,7 @@ func DeleteOldOdigosSystemObjects(ctx context.Context, client *kube.Client, ns s
 	resources := kube.GetManagedResources(ns)
 	for _, resource := range resources {
 		l := log.Print(fmt.Sprintf("Syncing %s", resource.Resource.Resource))
-		err := client.DeleteOldOdigosSystemObjects(ctx, resource, config.Spec.OdigosVersion)
+		err := client.DeleteOldOdigosSystemObjects(ctx, resource, config.Spec.ConfigVersion)
 		if err != nil {
 			l.Error(err)
 			os.Exit(1)

cli/cmd/resources/autoscaler.go

@@ -487,5 +487,5 @@ func (a *autoScalerResourceManager) InstallFromScratch(ctx context.Context) erro
 		NewAutoscalerLeaderElectionRoleBinding(a.ns),
 		NewAutoscalerDeployment(a.ns, a.config.OdigosVersion, a.config.ImagePrefix, a.config.AutoscalerImage),
 	}
-	return a.client.ApplyResources(ctx, a.config.OdigosVersion, resources)
+	return a.client.ApplyResources(ctx, a.config.ConfigVersion, resources)
 }

cli/cmd/resources/crds/configuration.go

@@ -47,11 +47,14 @@ func NewConfiguration() apiextensionsv1.CustomResourceDefinition {
 								"spec": {
 									Description: "OdigosConfigurationSpec defines the desired state of OdigosConfiguration",
 									Type:        "object",
-									Required:    []string{"odigosVersion"},
+									Required:    []string{"odigosVersion", "configVersion"},
 									Properties: map[string]apiextensionsv1.JSONSchemaProps{
 										"autoscalerImage": {
 											Type: "string",
 										},
+										"configVersion": {
+											Type: "integer",
+										},
 										"ignoredNamespaces": {
 											Type: "array",
 											Items: &apiextensionsv1.JSONSchemaPropsOrArray{

cli/cmd/resources/datacollection.go

@@ -126,5 +126,5 @@ func (a *dataCollectionResourceManager) InstallFromScratch(ctx context.Context)
 		NewDataCollectionClusterRole(a.config.Psp),
 		NewDataCollectionClusterRoleBinding(a.ns),
 	}
-	return a.client.ApplyResources(ctx, a.config.OdigosVersion, resources)
+	return a.client.ApplyResources(ctx, a.config.ConfigVersion, resources)
 }

cli/cmd/resources/instrumentor.go

@@ -531,5 +531,5 @@ func (a *instrumentorResourceManager) InstallFromScratch(ctx context.Context) er
 		NewInstrumentorClusterRoleBinding(a.ns),
 		NewInstrumentorDeployment(a.ns, a.config.OdigosVersion, a.config.TelemetryEnabled, a.config.SidecarInstrumentation, a.config.IgnoredNamespaces, a.config.ImagePrefix, a.config.InstrumentorImage),
 	}
-	return a.client.ApplyResources(ctx, a.config.OdigosVersion, resources)
+	return a.client.ApplyResources(ctx, a.config.ConfigVersion, resources)
 }

cli/cmd/resources/keyvalproxy.go

@@ -372,5 +372,5 @@ func (a *keyvalProxyResourceManager) InstallFromScratch(ctx context.Context) err
 		NewKeyvalProxyClusterRoleBinding(a.ns),
 		NewKeyvalProxyDeployment(odigosCloudProxyVersion, a.ns, a.config.ImagePrefix),
 	}
-	return a.client.ApplyResources(ctx, a.config.OdigosVersion, resources)
+	return a.client.ApplyResources(ctx, a.config.ConfigVersion, resources)
 }

cli/cmd/resources/managers.go

@@ -12,15 +12,16 @@ func CreateResourceManagers(client *kube.Client, odigosNs string, isOdigosCloud
 
 	// Note - the order of resource managers is important.
 	// If resource A depends on resource B, then A must be installed after B.
-	resourceManagers := []ResourceManager{}
+	resourceManagers := []ResourceManager{
+		NewOdigosDeploymentResourceManager(client, odigosNs, config),
+		NewOdigosConfigResourceManager(client, odigosNs, config),
+	}
 
 	if isOdigosCloud {
 		resourceManagers = append(resourceManagers, NewOdigosCloudResourceManager(client, odigosNs, config, apiKey))
 	}
 
 	resourceManagers = append(resourceManagers, []ResourceManager{
-		NewOdigosDeploymentResourceManager(client, odigosNs, config),
-		NewOdigosConfigResourceManager(client, odigosNs, config),
 		NewOwnTelemetryResourceManager(client, odigosNs, config, isOdigosCloud),
 		NewDataCollectionResourceManager(client, odigosNs, config),
 		NewInstrumentorResourceManager(client, odigosNs, config),

cli/cmd/resources/odiglet.go

@@ -380,5 +380,5 @@ func (a *odigletResourceManager) InstallFromScratch(ctx context.Context) error {
 		NewOdigletClusterRoleBinding(a.ns),
 		NewOdigletDaemonSet(a.ns, a.config.OdigosVersion, a.config.ImagePrefix, a.config.OdigletImage),
 	}
-	return a.client.ApplyResources(ctx, a.config.OdigosVersion, resources)
+	return a.client.ApplyResources(ctx, a.config.ConfigVersion, resources)
 }

cli/cmd/resources/odigoscloud.go

@@ -89,11 +89,11 @@ func (a *odigosCloudResourceManager) InstallFromScratch(ctx context.Context) err
 		// ERROR metadata.managedFields must be nil
 		// But not sure if this is the right way to fix it.
 		sec.ManagedFields = nil
-		return a.client.ApplyResources(ctx, a.config.OdigosVersion, []client.Object{sec})
+		return a.client.ApplyResources(ctx, a.config.ConfigVersion, []client.Object{sec})
 	}
 
 	resources := []client.Object{
 		NewKeyvalSecret(a.ns, *a.apiKey),
 	}
-	return a.client.ApplyResources(ctx, a.config.OdigosVersion, resources)
+	return a.client.ApplyResources(ctx, a.config.ConfigVersion, resources)
 }

cli/cmd/resources/odigosconfig.go

@@ -43,5 +43,5 @@ func (a *odigosConfigResourceManager) InstallFromScratch(ctx context.Context) er
 	resources := []client.Object{
 		NewOdigosConfiguration(a.ns, a.config),
 	}
-	return a.client.ApplyResources(ctx, a.config.OdigosVersion, resources)
+	return a.client.ApplyResources(ctx, a.config.ConfigVersion, resources)
 }

cli/cmd/resources/odigosdeployment.go

@@ -106,5 +106,5 @@ func (a *odigosDeploymentResourceManager) InstallFromScratch(ctx context.Context
 		NewOdigosDeploymentConfigMap(a.ns, a.config.OdigosVersion),
 		NewLeaderElectionRole(a.ns),
 	}
-	return a.client.ApplyResources(ctx, a.config.OdigosVersion, resources)
+	return a.client.ApplyResources(ctx, a.config.ConfigVersion, resources)
 }

cli/cmd/resources/owntelemetry.go

@@ -285,5 +285,5 @@ func (a *ownTelemetryResourceManager) InstallFromScratch(ctx context.Context) er
 			NewOwnTelemetryConfigMapDisabled(a.ns),
 		}
 	}
-	return a.client.ApplyResources(ctx, a.config.OdigosVersion, resources)
+	return a.client.ApplyResources(ctx, a.config.ConfigVersion, resources)
 }

cli/cmd/resources/scheduler.go

@@ -308,5 +308,5 @@ func (a *schedulerResourceManager) InstallFromScratch(ctx context.Context) error
 		NewSchedulerClusterRoleBinding(a.ns),
 		NewSchedulerDeployment(a.ns, a.config.OdigosVersion, a.config.ImagePrefix),
 	}
-	return a.client.ApplyResources(ctx, a.config.OdigosVersion, resources)
+	return a.client.ApplyResources(ctx, a.config.ConfigVersion, resources)
 }

cli/cmd/upgrade.go

@@ -87,7 +87,10 @@ and apply any required migrations and adaptations.`,
 			fmt.Println("Odigos upgrade failed - unable to read the current Odigos configuration.")
 			os.Exit(1)
 		}
+
+		// update the config on upgrade
 		config.Spec.OdigosVersion = versionFlag
+		config.Spec.ConfigVersion += 1
 
 		isOdigosCloud, err := resources.IsOdigosCloud(ctx, client, ns)
 		if err != nil {

cli/pkg/kube/client.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"fmt"
 	"os"
+	"strconv"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/selection"
@@ -69,24 +70,24 @@ func PrintClientErrorAndExit(err error) {
 	os.Exit(-1)
 }
 
-func (c *Client) ApplyResources(ctx context.Context, odigosVersion string, objs []client.Object) error {
+func (c *Client) ApplyResources(ctx context.Context, configVersion int, objs []client.Object) error {
 	for _, obj := range objs {
-		err := c.ApplyResource(ctx, odigosVersion, obj)
+		err := c.ApplyResource(ctx, configVersion, obj)
 		if err != nil {
 			return err
 		}
 	}
 	return nil
 }
 
-func (c *Client) ApplyResource(ctx context.Context, odigosVersion string, obj client.Object) error {
+func (c *Client) ApplyResource(ctx context.Context, configVersion int, obj client.Object) error {
 
 	labels := obj.GetLabels()
 	if labels == nil {
 		labels = make(map[string]string)
 	}
-	labels[odigoslabels.OdigosSystemVersionLabelKey] = odigosVersion
 	labels[odigoslabels.OdigosSystemLabelKey] = odigoslabels.OdigosSystemLabelValue
+	labels[odigoslabels.OdigosSystemConfigLabelKey] = strconv.Itoa(configVersion)
 	obj.SetLabels(labels)
 
 	depBytes, _ := yaml.Marshal(obj)
@@ -105,9 +106,9 @@ func (c *Client) ApplyResource(ctx context.Context, odigosVersion string, obj cl
 	return err
 }
 
-func (c *Client) DeleteOldOdigosSystemObjects(ctx context.Context, resourceAndNamespace ResourceAndNs, odigosVersion string) error {
+func (c *Client) DeleteOldOdigosSystemObjects(ctx context.Context, resourceAndNamespace ResourceAndNs, configVersion int) error {
 	systemObject, _ := k8slabels.NewRequirement(odigoslabels.OdigosSystemLabelKey, selection.Equals, []string{odigoslabels.OdigosSystemLabelValue})
-	notLatestVersion, _ := k8slabels.NewRequirement(odigoslabels.OdigosSystemVersionLabelKey, selection.NotEquals, []string{odigosVersion})
+	notLatestVersion, _ := k8slabels.NewRequirement(odigoslabels.OdigosSystemConfigLabelKey, selection.NotEquals, []string{strconv.Itoa(configVersion)})
 	labelSelector := k8slabels.NewSelector().Add(*systemObject).Add(*notLatestVersion).String()
 	resource := resourceAndNamespace.Resource
 	ns := resourceAndNamespace.Namespace

cli/pkg/labels/labels.go

@@ -1,9 +1,9 @@
 package labels
 
 const (
-	OdigosSystemLabelKey        = "odigos.io/system-object"
-	OdigosSystemVersionLabelKey = "odigos.io/version"
-	OdigosSystemLabelValue      = "true"
+	OdigosSystemLabelKey       = "odigos.io/system-object"
+	OdigosSystemConfigLabelKey = "odigos.io/config"
+	OdigosSystemLabelValue     = "true"
 )
 
 var OdigosSystem = map[string]string{