Skip to content

Commit 2723852

Browse files
author
Israel Blancas
authored
Merge branch 'main' into feature/3149
2 parents 8fa48a7 + 8883006 commit 2723852

25 files changed

+630
-98
lines changed

.chloggen/3218-align-label-filter-flag.yaml

-16
This file was deleted.

.chloggen/bug-fix-hpa.yaml

-16
This file was deleted.

.chloggen/enhanced-webhook.yaml

-16
This file was deleted.

.github/workflows/e2e.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
path: bin
5858
key: ${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('Makefile') }}-${{ steps.setup-go.outputs.go-version }}
5959
- name: Install chainsaw
60-
uses: kyverno/[email protected].9
60+
uses: kyverno/[email protected].10
6161
- name: Install tools
6262
run: make install-tools
6363
- name: Prepare e2e tests

CHANGELOG.md

+23
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,29 @@
22

33
<!-- next version -->
44

5+
## 0.109.0
6+
7+
### 🚩 Deprecations 🚩
8+
9+
- `operator`: Deprecated `label` flag and introduced `labels-filter` flag to align the label filtering with the attribute filtering flag name. The `label` flag will be removed when #3236 issue is resolved. (#3218)
10+
11+
### 💡 Enhancements 💡
12+
13+
- `collector`: adds test for memory utilization (#3283)
14+
- `operator`: Added reconciliation errors for webhook events. The webhooks run the manifest generators to check for any errors. (#2399)
15+
16+
### Components
17+
18+
* [OpenTelemetry Collector - v0.109.0](https://github.com/open-telemetry/opentelemetry-collector/releases/tag/v0.109.0)
19+
* [OpenTelemetry Contrib - v0.109.0](https://github.com/open-telemetry/opentelemetry-collector-contrib/releases/tag/v0.109.0)
20+
* [Java auto-instrumentation - v1.33.5](https://github.com/open-telemetry/opentelemetry-java-instrumentation/releases/tag/v1.33.5)
21+
* [.NET auto-instrumentation - v1.2.0](https://github.com/open-telemetry/opentelemetry-dotnet-instrumentation/releases/tag/v1.2.0)
22+
* [Node.JS - v0.52.1](https://github.com/open-telemetry/opentelemetry-js/releases/tag/experimental%2Fv0.52.1)
23+
* [Python - v0.48b0](https://github.com/open-telemetry/opentelemetry-python-contrib/releases/tag/v0.48b0)
24+
* [Go - v0.14.0-alpha](https://github.com/open-telemetry/opentelemetry-go-instrumentation/releases/tag/v0.14.0-alpha)
25+
* [ApacheHTTPD - 1.0.4](https://github.com/open-telemetry/opentelemetry-cpp-contrib/releases/tag/webserver%2Fv1.0.4)
26+
* [Nginx - 1.0.4](https://github.com/open-telemetry/opentelemetry-cpp-contrib/releases/tag/webserver%2Fv1.0.4)
27+
528
## 0.108.0
629

730
### 💡 Enhancements 💡

README.md

+1
Original file line numberDiff line numberDiff line change
@@ -759,6 +759,7 @@ The OpenTelemetry Operator _might_ work on versions outside of the given range,
759759

760760
| OpenTelemetry Operator | Kubernetes | Cert-Manager | Prometheus-Operator |
761761
|------------------------|----------------| ------------ |---------------------|
762+
| v0.109.0 | v1.23 to v1.31 | v1 | v0.76.0 |
762763
| v0.108.0 | v1.23 to v1.31 | v1 | v0.76.0 |
763764
| v0.107.0 | v1.23 to v1.30 | v1 | v0.75.0 |
764765
| v0.106.0 | v1.23 to v1.30 | v1 | v0.75.0 |

RELEASE.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ The operator should be released within a week after the [OpenTelemetry collector
4444

4545
| Version | Release manager |
4646
|----------|-----------------|
47-
| v0.109.0 | @jaronoff97 |
4847
| v0.110.0 | @swiatekm |
4948
| v0.111.0 | @frzifus |
5049
| v0.112.0 | @yuriolisa |
5150
| v0.113.0 | @pavolloffay |
5251
| v0.114.0 | @TylerHelmuth |
52+
| v0.115.0 | @jaronoff97 |

apis/v1alpha1/targetallocator_types.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,11 @@ import (
2121
)
2222

2323
func init() {
24-
v1beta1.SchemeBuilder.Register(&TargetAllocator{}, &TargetAllocatorList{})
24+
SchemeBuilder.Register(&TargetAllocator{}, &TargetAllocatorList{})
2525
}
2626

2727
//+kubebuilder:object:root=true
28+
//+kubebuilder:storageversion
2829
//+kubebuilder:subresource:status
2930

3031
// TargetAllocator is the Schema for the targetallocators API.

bundle/community/manifests/opentelemetry-operator.clusterserviceversion.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -99,13 +99,13 @@ metadata:
9999
categories: Logging & Tracing,Monitoring
100100
certified: "false"
101101
containerImage: ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator
102-
createdAt: "2024-09-05T15:16:50Z"
102+
createdAt: "2024-09-19T17:15:52Z"
103103
description: Provides the OpenTelemetry components, including the Collector
104104
operators.operatorframework.io/builder: operator-sdk-v1.29.0
105105
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
106106
repository: github.com/open-telemetry/opentelemetry-operator
107107
support: OpenTelemetry Community
108-
name: opentelemetry-operator.v0.108.0
108+
name: opentelemetry-operator.v0.109.0
109109
namespace: placeholder
110110
spec:
111111
apiservicedefinitions: {}
@@ -479,7 +479,7 @@ spec:
479479
valueFrom:
480480
fieldRef:
481481
fieldPath: spec.serviceAccountName
482-
image: ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator:0.108.0
482+
image: ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator:0.109.0
483483
livenessProbe:
484484
httpGet:
485485
path: /healthz
@@ -587,7 +587,7 @@ spec:
587587
minKubeVersion: 1.23.0
588588
provider:
589589
name: OpenTelemetry Community
590-
version: 0.108.0
590+
version: 0.109.0
591591
webhookdefinitions:
592592
- admissionReviewVersions:
593593
- v1alpha1

bundle/openshift/manifests/opentelemetry-operator.clusterserviceversion.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -99,13 +99,13 @@ metadata:
9999
categories: Logging & Tracing,Monitoring
100100
certified: "false"
101101
containerImage: ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator
102-
createdAt: "2024-09-05T15:16:58Z"
102+
createdAt: "2024-09-19T17:16:12Z"
103103
description: Provides the OpenTelemetry components, including the Collector
104104
operators.operatorframework.io/builder: operator-sdk-v1.29.0
105105
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
106106
repository: github.com/open-telemetry/opentelemetry-operator
107107
support: OpenTelemetry Community
108-
name: opentelemetry-operator.v0.108.0
108+
name: opentelemetry-operator.v0.109.0
109109
namespace: placeholder
110110
spec:
111111
apiservicedefinitions: {}
@@ -483,7 +483,7 @@ spec:
483483
valueFrom:
484484
fieldRef:
485485
fieldPath: spec.serviceAccountName
486-
image: ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator:0.108.0
486+
image: ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator:0.109.0
487487
livenessProbe:
488488
httpGet:
489489
path: /healthz
@@ -591,7 +591,7 @@ spec:
591591
minKubeVersion: 1.23.0
592592
provider:
593593
name: OpenTelemetry Community
594-
version: 0.108.0
594+
version: 0.109.0
595595
webhookdefinitions:
596596
- admissionReviewVersions:
597597
- v1alpha1

controllers/common.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ func BuildCollector(params manifests.Params) ([]client.Object, error) {
6767
Recorder: params.Recorder,
6868
Log: params.Log,
6969
Config: params.Config,
70-
Collector: params.OtelCol,
70+
Collector: &params.OtelCol,
7171
TargetAllocator: *params.TargetAllocator,
7272
}
7373
taResources, err := BuildTargetAllocator(taParams)

controllers/suite_test.go

+4
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,10 @@ func TestMain(m *testing.M) {
182182
fmt.Printf("failed to SetupWebhookWithManager: %v", err)
183183
os.Exit(1)
184184
}
185+
if err = v1alpha1.SetupTargetAllocatorWebhook(mgr, config.New(), reviewer); err != nil {
186+
fmt.Printf("failed to SetupWebhookWithManager: %v", err)
187+
os.Exit(1)
188+
}
185189

186190
if err = v1alpha1.SetupOpAMPBridgeWebhook(mgr, config.New()); err != nil {
187191
fmt.Printf("failed to SetupWebhookWithManager: %v", err)
+152
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,152 @@
1+
// Copyright The OpenTelemetry Authors
2+
//
3+
// Licensed under the Apache License, Version 2.0 (the "License");
4+
// you may not use this file except in compliance with the License.
5+
// You may obtain a copy of the License at
6+
//
7+
// http://www.apache.org/licenses/LICENSE-2.0
8+
//
9+
// Unless required by applicable law or agreed to in writing, software
10+
// distributed under the License is distributed on an "AS IS" BASIS,
11+
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
// See the License for the specific language governing permissions and
13+
// limitations under the License.
14+
15+
// Package controllers contains the main controller, where the reconciliation starts.
16+
package controllers
17+
18+
import (
19+
"context"
20+
21+
"github.com/go-logr/logr"
22+
monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
23+
appsv1 "k8s.io/api/apps/v1"
24+
corev1 "k8s.io/api/core/v1"
25+
policyV1 "k8s.io/api/policy/v1"
26+
apierrors "k8s.io/apimachinery/pkg/api/errors"
27+
"k8s.io/apimachinery/pkg/runtime"
28+
"k8s.io/client-go/tools/record"
29+
ctrl "sigs.k8s.io/controller-runtime"
30+
"sigs.k8s.io/controller-runtime/pkg/client"
31+
32+
"github.com/open-telemetry/opentelemetry-operator/apis/v1alpha1"
33+
"github.com/open-telemetry/opentelemetry-operator/apis/v1beta1"
34+
"github.com/open-telemetry/opentelemetry-operator/internal/config"
35+
"github.com/open-telemetry/opentelemetry-operator/internal/manifests/targetallocator"
36+
taStatus "github.com/open-telemetry/opentelemetry-operator/internal/status/targetallocator"
37+
"github.com/open-telemetry/opentelemetry-operator/pkg/featuregate"
38+
)
39+
40+
// TargetAllocatorReconciler reconciles a TargetAllocator object.
41+
type TargetAllocatorReconciler struct {
42+
client.Client
43+
recorder record.EventRecorder
44+
scheme *runtime.Scheme
45+
log logr.Logger
46+
config config.Config
47+
}
48+
49+
// TargetAllocatorReconcilerParams is the set of options to build a new TargetAllocatorReconciler.
50+
type TargetAllocatorReconcilerParams struct {
51+
client.Client
52+
Recorder record.EventRecorder
53+
Scheme *runtime.Scheme
54+
Log logr.Logger
55+
Config config.Config
56+
}
57+
58+
func (r *TargetAllocatorReconciler) getParams(instance v1alpha1.TargetAllocator) targetallocator.Params {
59+
p := targetallocator.Params{
60+
Config: r.config,
61+
Client: r.Client,
62+
Log: r.log,
63+
Scheme: r.scheme,
64+
Recorder: r.recorder,
65+
TargetAllocator: instance,
66+
}
67+
68+
return p
69+
}
70+
71+
// NewTargetAllocatorReconciler creates a new reconciler for TargetAllocator objects.
72+
func NewTargetAllocatorReconciler(
73+
client client.Client,
74+
scheme *runtime.Scheme,
75+
recorder record.EventRecorder,
76+
config config.Config,
77+
logger logr.Logger,
78+
) *TargetAllocatorReconciler {
79+
return &TargetAllocatorReconciler{
80+
Client: client,
81+
log: logger,
82+
scheme: scheme,
83+
config: config,
84+
recorder: recorder,
85+
}
86+
}
87+
88+
// TODO: Uncomment the lines below after enabling the TA controller in main.go
89+
// // +kubebuilder:rbac:groups="",resources=pods;configmaps;services;serviceaccounts;persistentvolumeclaims;persistentvolumes,verbs=get;list;watch;create;update;patch;delete
90+
// // +kubebuilder:rbac:groups="",resources=events,verbs=create;patch
91+
// // +kubebuilder:rbac:groups=apps,resources=deployments,verbs=get;list;watch;create;update;patch;delete
92+
// // +kubebuilder:rbac:groups=policy,resources=poddisruptionbudgets,verbs=get;list;watch;create;update;patch;delete
93+
// // +kubebuilder:rbac:groups=monitoring.coreos.com,resources=servicemonitors;podmonitors,verbs=get;list;watch;create;update;patch;delete
94+
// // +kubebuilder:rbac:groups=opentelemetry.io,resources=opentelemetrycollectors,verbs=get;list;watch;update;patch
95+
// // +kubebuilder:rbac:groups=opentelemetry.io,resources=targetallocators,verbs=get;list;watch;update;patch
96+
// // +kubebuilder:rbac:groups=opentelemetry.io,resources=targetallocators/status,verbs=get;update;patch
97+
98+
// Reconcile the current state of a TargetAllocator resource with the desired state.
99+
func (r *TargetAllocatorReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
100+
log := r.log.WithValues("targetallocator", req.NamespacedName)
101+
102+
var instance v1alpha1.TargetAllocator
103+
if err := r.Client.Get(ctx, req.NamespacedName, &instance); err != nil {
104+
if !apierrors.IsNotFound(err) {
105+
log.Error(err, "unable to fetch TargetAllocator")
106+
}
107+
108+
// we'll ignore not-found errors, since they can't be fixed by an immediate
109+
// requeue (we'll need to wait for a new notification), and we can get them
110+
// on deleted requests.
111+
return ctrl.Result{}, client.IgnoreNotFound(err)
112+
}
113+
// We have a deletion, short circuit and let the deletion happen
114+
if deletionTimestamp := instance.GetDeletionTimestamp(); deletionTimestamp != nil {
115+
return ctrl.Result{}, nil
116+
}
117+
118+
if instance.Spec.ManagementState == v1beta1.ManagementStateUnmanaged {
119+
log.Info("Skipping reconciliation for unmanaged TargetAllocator resource", "name", req.String())
120+
// Stop requeueing for unmanaged TargetAllocator custom resources
121+
return ctrl.Result{}, nil
122+
}
123+
124+
params := r.getParams(instance)
125+
desiredObjects, buildErr := BuildTargetAllocator(params)
126+
if buildErr != nil {
127+
return ctrl.Result{}, buildErr
128+
}
129+
130+
err := reconcileDesiredObjects(ctx, r.Client, log, &params.TargetAllocator, params.Scheme, desiredObjects, nil)
131+
return taStatus.HandleReconcileStatus(ctx, log, params, err)
132+
}
133+
134+
// SetupWithManager tells the manager what our controller is interested in.
135+
func (r *TargetAllocatorReconciler) SetupWithManager(mgr ctrl.Manager) error {
136+
builder := ctrl.NewControllerManagedBy(mgr).
137+
For(&v1alpha1.TargetAllocator{}).
138+
Owns(&corev1.ConfigMap{}).
139+
Owns(&corev1.ServiceAccount{}).
140+
Owns(&corev1.Service{}).
141+
Owns(&appsv1.Deployment{}).
142+
Owns(&corev1.PersistentVolume{}).
143+
Owns(&corev1.PersistentVolumeClaim{}).
144+
Owns(&policyV1.PodDisruptionBudget{})
145+
146+
if featuregate.PrometheusOperatorIsAvailable.IsEnabled() {
147+
builder.Owns(&monitoringv1.ServiceMonitor{})
148+
builder.Owns(&monitoringv1.PodMonitor{})
149+
}
150+
151+
return builder.Complete(r)
152+
}

0 commit comments

Comments
 (0)