Merge branch 'main' into nodejs-ibm

Author: Israel Blancas

.github/workflows/reusable-operator-hub-release.yaml

@@ -56,7 +56,7 @@ jobs:
         env:
           VERSION: ${{ env.version }}
         run: |
-          mkdir operators/opentelemetry-operator/${VERSION} 
+          mkdir operators/opentelemetry-operator/${VERSION}
           cp -R ./tmp/bundle/${{ inputs.folder }}/* operators/opentelemetry-operator/${VERSION}
           rm -rf ./tmp
 
@@ -73,7 +73,7 @@ jobs:
           message="Update the opentelemetry to $VERSION"
           body="Release opentelemetry-operator \`$VERSION\`.
 
-          cc @pavolloffay @frzifus @yuriolisa @jaronoff97 @TylerHelmuth @swiatekm
+          cc @pavolloffay @frzifus @yuriolisa @jaronoff97 @TylerHelmuth @swiatekm @iblancasa
           "
           branch="update-opentelemetry-operator-to-${VERSION}"
 

README.md

@@ -608,7 +608,7 @@ spec:
   mode: statefulset
   targetAllocator:
     enabled: true
-  config: 
+  config:
     receivers:
       prometheus:
         config:
@@ -740,7 +740,7 @@ spec:
 
 ### Configure resource attributes with labels
 
-You can also use common labels to set resource attributes. 
+You can also use common labels to set resource attributes.
 
 The following labels are supported:
 - `app.kubernetes.io/name` becomes `service.name`
@@ -782,12 +782,12 @@ The priority for setting resource attributes is as follows (first found wins):
 
 1. Resource attributes set via `OTEL_RESOURCE_ATTRIBUTES` and `OTEL_SERVICE_NAME` environment variables
 2. Resource attributes set via annotations (with the `resource.opentelemetry.io/` prefix)
-3. Resource attributes set via labels (e.g. `app.kubernetes.io/name`) 
+3. Resource attributes set via labels (e.g. `app.kubernetes.io/name`)
    if the `Instrumentation` CR has defaults.useLabelsForResourceAttributes=true (see above)
 4. Resource attributes calculated from the pod's metadata (e.g. `k8s.pod.name`)
 5. Resource attributes set via the `Instrumentation` CR (in the `spec.resource.resourceAttributes` section)
 
-This priority is applied for each resource attribute separately, so it is possible to set some attributes via 
+This priority is applied for each resource attribute separately, so it is possible to set some attributes via
 annotations and others via labels.
 
 ## Compatibility matrix
@@ -807,7 +807,7 @@ We strive to be compatible with the widest range of Kubernetes versions as possi
 We use `cert-manager` for some features of this operator and the third column shows the versions of the `cert-manager` that are known to work with this operator's versions.
 
 The Target Allocator supports prometheus-operator CRDs like ServiceMonitor, and it does so by using packages imported from prometheus-operator itself. The table shows which version is shipped with a given operator version.
-Generally speaking, these are backwards compatible, but specific features require the appropriate package versions. 
+Generally speaking, these are backwards compatible, but specific features require the appropriate package versions.
 
 The OpenTelemetry Operator _might_ work on versions outside of the given range, but when opening new issues, please make sure to test your scenario on a supported version.
 
@@ -849,6 +849,7 @@ Approvers ([@open-telemetry/operator-approvers](https://github.com/orgs/open-tel
 - [Benedikt Bongartz](https://github.com/frzifus), Red Hat
 - [Tyler Helmuth](https://github.com/TylerHelmuth), Honeycomb
 - [Yuri Oliveira Sa](https://github.com/yuriolisa), Red Hat
+- [Israel Blancas](https://github.com/iblancasa), Red Hat
 
 Emeritus Approvers:
 

RELEASE.md

@@ -49,4 +49,5 @@ The operator should be released within a week after the [OpenTelemetry collector
 | v0.113.0 | @pavolloffay    |
 | v0.114.0 | @TylerHelmuth   |
 | v0.115.0 | @jaronoff97     |
-| v0.116.0 | @swiatekm       |
+| v0.116.0 | @swiatekm       |
+| v0.117.0 | @iblancasa      |

pkg/collector/upgrade/suite_test.go

@@ -42,6 +42,7 @@ import (
 	"github.com/open-telemetry/opentelemetry-operator/apis/v1beta1"
 	"github.com/open-telemetry/opentelemetry-operator/internal/config"
 	"github.com/open-telemetry/opentelemetry-operator/internal/rbac"
+	"github.com/open-telemetry/opentelemetry-operator/internal/version"
 )
 
 var (
@@ -160,3 +161,9 @@ func TestMain(m *testing.M) {
 
 	os.Exit(code)
 }
+
+func makeVersion(v string) version.Version {
+	return version.Version{
+		OpenTelemetryCollector: v,
+	}
+}

pkg/collector/upgrade/upgrade.go

@@ -39,6 +39,17 @@ type VersionUpgrade struct {
 
 const RecordBufferSize int = 100
 
+func (u VersionUpgrade) semVer() *semver.Version {
+	if len(u.Version.OpenTelemetryCollector) == 0 {
+		return &Latest.Version
+	}
+	if v, err := semver.NewVersion(u.Version.OpenTelemetryCollector); err != nil {
+		return &Latest.Version
+	} else {
+		return v
+	}
+}
+
 // ManagedInstances finds all the otelcol instances for the current operator and upgrades them, if necessary.
 func (u VersionUpgrade) ManagedInstances(ctx context.Context) error {
 	u.Log.Info("looking for managed instances to upgrade")
@@ -107,9 +118,9 @@ func (u VersionUpgrade) ManagedInstance(_ context.Context, otelcol v1beta1.OpenT
 	}
 
 	updated := *(otelcol.DeepCopy())
-	if instanceV.GreaterThan(&Latest.Version) {
+	if instanceV.GreaterThan(u.semVer()) {
 		// Update with the latest known version, which is what we have from versions.txt
-		u.Log.V(4).Info("no upgrade routines are needed for the OpenTelemetry instance", "name", updated.Name, "namespace", updated.Namespace, "version", updated.Status.Version, "latest", Latest.Version.String())
+		u.Log.V(4).Info("no upgrade routines are needed for the OpenTelemetry instance", "name", updated.Name, "namespace", updated.Namespace, "version", updated.Status.Version, "latest", u.semVer().String())
 
 		otelColV, err := semver.NewVersion(u.Version.OpenTelemetryCollector)
 		if err != nil {
@@ -126,6 +137,11 @@ func (u VersionUpgrade) ManagedInstance(_ context.Context, otelcol v1beta1.OpenT
 	}
 
 	for _, available := range versions {
+		// Don't run upgrades for versions after the webhook's set version.
+		// This is important only for testing.
+		if available.GreaterThan(u.semVer()) {
+			continue
+		}
 		if available.GreaterThan(instanceV) {
 			if available.upgrade != nil {
 				otelcolV1alpha1 := &v1alpha1.OpenTelemetryCollector{}

pkg/collector/upgrade/v0_104_0_test.go

@@ -24,7 +24,6 @@ import (
 	"k8s.io/client-go/tools/record"
 
 	"github.com/open-telemetry/opentelemetry-operator/apis/v1beta1"
-	"github.com/open-telemetry/opentelemetry-operator/internal/version"
 	"github.com/open-telemetry/opentelemetry-operator/pkg/collector/upgrade"
 )
 
@@ -46,7 +45,7 @@ func Test0_104_0Upgrade(t *testing.T) {
 
 	versionUpgrade := &upgrade.VersionUpgrade{
 		Log:      logger,
-		Version:  version.Get(),
+		Version:  makeVersion("0.104.0"),
 		Client:   k8sClient,
 		Recorder: record.NewFakeRecorder(upgrade.RecordBufferSize),
 	}
@@ -56,7 +55,9 @@ func Test0_104_0Upgrade(t *testing.T) {
 		t.Errorf("expect err: nil but got: %v", err)
 	}
 	assert.EqualValues(t,
-		map[string]string{},
+		map[string]string{
+			"feature-gates": "-component.UseLocalHostAsDefaultHost",
+		},
 		col.Spec.Args, "missing featuregate")
 }
 

pkg/collector/upgrade/v0_105_0_test.go

@@ -23,7 +23,6 @@ import (
 	"k8s.io/client-go/tools/record"
 
 	"github.com/open-telemetry/opentelemetry-operator/apis/v1beta1"
-	"github.com/open-telemetry/opentelemetry-operator/internal/version"
 	"github.com/open-telemetry/opentelemetry-operator/pkg/collector/upgrade"
 )
 
@@ -59,7 +58,7 @@ func Test0_105_0Upgrade(t *testing.T) {
 
 	versionUpgrade := &upgrade.VersionUpgrade{
 		Log:      logger,
-		Version:  version.Get(),
+		Version:  makeVersion("0.105.0"),
 		Client:   k8sClient,
 		Recorder: record.NewFakeRecorder(upgrade.RecordBufferSize),
 	}

pkg/collector/upgrade/v0_110_0_test.go

@@ -0,0 +1,66 @@
+// Copyright The OpenTelemetry 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 upgrade_test
+
+import (
+	"context"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/client-go/tools/record"
+
+	"github.com/open-telemetry/opentelemetry-operator/apis/v1beta1"
+	"github.com/open-telemetry/opentelemetry-operator/pkg/collector/upgrade"
+)
+
+func Test0_110_0Upgrade(t *testing.T) {
+	collectorInstance := v1beta1.OpenTelemetryCollector{
+		TypeMeta: metav1.TypeMeta{
+			Kind:       "OpenTelemetryCollector",
+			APIVersion: "v1beta1",
+		},
+		ObjectMeta: metav1.ObjectMeta{
+			Name:      "otel-my-instance",
+			Namespace: "somewhere",
+		},
+		Status: v1beta1.OpenTelemetryCollectorStatus{
+			Version: "0.104.0",
+		},
+		Spec: v1beta1.OpenTelemetryCollectorSpec{
+			OpenTelemetryCommonFields: v1beta1.OpenTelemetryCommonFields{
+				Args: map[string]string{
+					"foo":           "bar",
+					"feature-gates": "+baz,-component.UseLocalHostAsDefaultHost",
+				},
+			},
+			Config: v1beta1.Config{},
+		},
+	}
+
+	versionUpgrade := &upgrade.VersionUpgrade{
+		Log:      logger,
+		Version:  makeVersion("0.110.0"),
+		Client:   k8sClient,
+		Recorder: record.NewFakeRecorder(upgrade.RecordBufferSize),
+	}
+
+	col, err := versionUpgrade.ManagedInstance(context.Background(), collectorInstance)
+	if err != nil {
+		t.Errorf("expect err: nil but got: %v", err)
+	}
+	assert.EqualValues(t,
+		map[string]string{"foo": "bar", "feature-gates": "+baz"}, col.Spec.Args)
+}

pkg/collector/upgrade/v0_15_0_test.go

@@ -25,7 +25,6 @@ import (
 	"k8s.io/client-go/tools/record"
 
 	"github.com/open-telemetry/opentelemetry-operator/apis/v1alpha1"
-	"github.com/open-telemetry/opentelemetry-operator/internal/version"
 	"github.com/open-telemetry/opentelemetry-operator/pkg/collector/upgrade"
 )
 
@@ -57,7 +56,7 @@ func TestRemoveMetricsTypeFlags(t *testing.T) {
 	// test
 	up := &upgrade.VersionUpgrade{
 		Log:      logger,
-		Version:  version.Get(),
+		Version:  makeVersion("0.15.0"),
 		Client:   nil,
 		Recorder: record.NewFakeRecorder(upgrade.RecordBufferSize),
 	}

pkg/collector/upgrade/v0_19_0_test.go

@@ -26,7 +26,6 @@ import (
 
 	"github.com/open-telemetry/opentelemetry-operator/apis/v1alpha1"
 	"github.com/open-telemetry/opentelemetry-operator/internal/manifests/collector/adapters"
-	"github.com/open-telemetry/opentelemetry-operator/internal/version"
 	"github.com/open-telemetry/opentelemetry-operator/pkg/collector/upgrade"
 )
 
@@ -74,7 +73,7 @@ service:
 	// test
 	up := &upgrade.VersionUpgrade{
 		Log:      logger,
-		Version:  version.Get(),
+		Version:  makeVersion("0.19.0"),
 		Client:   nil,
 		Recorder: record.NewFakeRecorder(upgrade.RecordBufferSize),
 	}
@@ -124,7 +123,7 @@ service:
 	// test
 	up := &upgrade.VersionUpgrade{
 		Log:      logger,
-		Version:  version.Get(),
+		Version:  makeVersion("0.19.0"),
 		Client:   nil,
 		Recorder: record.NewFakeRecorder(upgrade.RecordBufferSize),
 	}
@@ -191,7 +190,7 @@ service:
 	// test
 	up := &upgrade.VersionUpgrade{
 		Log:      logger,
-		Version:  version.Get(),
+		Version:  makeVersion("0.19.0"),
 		Client:   nil,
 		Recorder: record.NewFakeRecorder(upgrade.RecordBufferSize),
 	}

pkg/collector/upgrade/v0_24_0_test.go

@@ -24,7 +24,6 @@ import (
 	"k8s.io/client-go/tools/record"
 
 	"github.com/open-telemetry/opentelemetry-operator/apis/v1alpha1"
-	"github.com/open-telemetry/opentelemetry-operator/internal/version"
 	"github.com/open-telemetry/opentelemetry-operator/pkg/collector/upgrade"
 )
 
@@ -64,7 +63,7 @@ service:
 	// test
 	up := &upgrade.VersionUpgrade{
 		Log:      logger,
-		Version:  version.Get(),
+		Version:  makeVersion("0.24.0"),
 		Client:   nil,
 		Recorder: record.NewFakeRecorder(upgrade.RecordBufferSize),
 	}

pkg/collector/upgrade/v0_31_0_test.go

@@ -24,7 +24,6 @@ import (
 	"k8s.io/client-go/tools/record"
 
 	"github.com/open-telemetry/opentelemetry-operator/apis/v1alpha1"
-	"github.com/open-telemetry/opentelemetry-operator/internal/version"
 	"github.com/open-telemetry/opentelemetry-operator/pkg/collector/upgrade"
 )
 
@@ -63,7 +62,7 @@ service:
 	// test
 	up := &upgrade.VersionUpgrade{
 		Log:      logger,
-		Version:  version.Get(),
+		Version:  makeVersion("0.31.0"),
 		Client:   nil,
 		Recorder: record.NewFakeRecorder(upgrade.RecordBufferSize),
 	}

pkg/collector/upgrade/v0_36_0_test.go

@@ -24,7 +24,6 @@ import (
 	"k8s.io/client-go/tools/record"
 
 	"github.com/open-telemetry/opentelemetry-operator/apis/v1alpha1"
-	"github.com/open-telemetry/opentelemetry-operator/internal/version"
 	"github.com/open-telemetry/opentelemetry-operator/pkg/collector/upgrade"
 )
 
@@ -79,7 +78,7 @@ service:
 
 	up := &upgrade.VersionUpgrade{
 		Log:      logger,
-		Version:  version.Get(),
+		Version:  makeVersion("0.36.0"),
 		Client:   nil,
 		Recorder: record.NewFakeRecorder(upgrade.RecordBufferSize),
 	}

pkg/collector/upgrade/v0_38_0_test.go

@@ -24,7 +24,6 @@ import (
 	"k8s.io/client-go/tools/record"
 
 	"github.com/open-telemetry/opentelemetry-operator/apis/v1alpha1"
-	"github.com/open-telemetry/opentelemetry-operator/internal/version"
 	"github.com/open-telemetry/opentelemetry-operator/pkg/collector/upgrade"
 )
 
@@ -72,7 +71,7 @@ service:
 	// EXPECTED: drop logging args and configure logging parameters into config from args
 	up := &upgrade.VersionUpgrade{
 		Log:      logger,
-		Version:  version.Get(),
+		Version:  makeVersion("0.38.0"),
 		Client:   nil,
 		Recorder: record.NewFakeRecorder(upgrade.RecordBufferSize),
 	}

pkg/collector/upgrade/v0_39_0_test.go

@@ -24,7 +24,6 @@ import (
 	"k8s.io/client-go/tools/record"
 
 	"github.com/open-telemetry/opentelemetry-operator/apis/v1alpha1"
-	"github.com/open-telemetry/opentelemetry-operator/internal/version"
 	"github.com/open-telemetry/opentelemetry-operator/pkg/collector/upgrade"
 )
 
@@ -74,7 +73,7 @@ service:
 	// drop processors.memory_limiter field 'ballast_size_mib'
 	up := &upgrade.VersionUpgrade{
 		Log:      logger,
-		Version:  version.Get(),
+		Version:  makeVersion("0.39.0"),
 		Client:   nil,
 		Recorder: record.NewFakeRecorder(upgrade.RecordBufferSize),
 	}