Skip to content

Commit 020e67f

Browse files
committed
Remove CPU limits from opentelementry-operator contianers
1 parent b527ef8 commit 020e67f

27 files changed

+90
-88
lines changed

charts/opentelemetry-operator/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
apiVersion: v2
22
name: opentelemetry-operator
3-
version: 0.79.0
3+
version: 0.80.0
44
description: OpenTelemetry Operator Helm chart for Kubernetes
55
type: application
66
home: https://opentelemetry.io/

charts/opentelemetry-operator/UPGRADING.md

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,29 @@
11
# Upgrade guidelines
22

3+
## 0.79.0 to 0.80.0
4+
5+
Prior to 0.80.0, this chart included resource requests and limits for the OpenTelemetry Operator manager pod. These values were set to `100m` and `128Mi` respectively. In 0.78.0, these values have been removed from the chart. If you were relying on these values, you can set them in your `values.yaml` file. For example:
6+
7+
```yaml
8+
manager:
9+
resources:
10+
limits:
11+
cpu: 100m
12+
memory: 128Mi
13+
requests:
14+
cpu: 100m
15+
memory: 64Mi
16+
17+
kubeRBACProxy:
18+
resources:
19+
limits:
20+
cpu: 500m
21+
memory: 128Mi
22+
requests:
23+
cpu: 5m
24+
memory: 64Mi
25+
```
26+
327
## 0.74.0 to 0.74.1
428
529
Prior to 0.72.1, feature gates could be enabled via the `manager.featureGates` property. As feature gates may require extra configuration to work properly, e.g. deploying extra permissions on the ClusterRole, the chart has been updated to make use of the `manager.featureGatesMap` property which allows the chart to smartly configure feature gates. If the `manager.featureGatesMap` property is set, the old `manager.featureGates` property will be ignored.

charts/opentelemetry-operator/conf/crds/crd-opentelemetrycollector.yaml

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,25 @@
1-
{{- if .Values.crds.create }}
21
apiVersion: apiextensions.k8s.io/v1
32
kind: CustomResourceDefinition
43
metadata:
54
annotations:
6-
cert-manager.io/inject-ca-from: {{ include "opentelemetry-operator.webhookCertAnnotation" . }}
5+
cert-manager.io/inject-ca-from: opentelemetry-operator-system/opentelemetry-operator-serving-cert
76
controller-gen.kubebuilder.io/version: v0.17.1
87
creationTimestamp: null
98
labels:
109
app.kubernetes.io/name: opentelemetry-operator
1110
name: opentelemetrycollectors.opentelemetry.io
1211
spec:
13-
{{- if .Values.admissionWebhooks.create }}
1412
conversion:
1513
strategy: Webhook
1614
webhook:
1715
clientConfig:
1816
service:
19-
name: {{ template "opentelemetry-operator.fullname" . }}-webhook
20-
namespace: {{ .Release.Namespace }}
17+
name: opentelemetry-operator-webhook-service
18+
namespace: opentelemetry-operator-system
2119
path: /convert
22-
port: {{ .Values.admissionWebhooks.servicePort }}
23-
{{ if .caBundle }}{{ cat "caBundle:" .caBundle | indent 8 }}{{ end }}
2420
conversionReviewVersions:
2521
- v1alpha1
2622
- v1beta1
27-
{{- end }}
2823
group: opentelemetry.io
2924
names:
3025
kind: OpenTelemetryCollector
@@ -9298,4 +9293,3 @@ status:
92989293
plural: ""
92999294
conditions: null
93009295
storedVersions: null
9301-
{{- end }}

charts/opentelemetry-operator/examples/default/rendered/admission-webhooks/operator-webhook-with-cert-manager.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
annotations:
77
cert-manager.io/inject-ca-from: default/example-opentelemetry-operator-serving-cert
88
labels:
9-
helm.sh/chart: opentelemetry-operator-0.79.0
9+
helm.sh/chart: opentelemetry-operator-0.80.0
1010
app.kubernetes.io/name: opentelemetry-operator
1111
app.kubernetes.io/version: "0.117.0"
1212
app.kubernetes.io/managed-by: Helm
@@ -90,7 +90,7 @@ metadata:
9090
annotations:
9191
cert-manager.io/inject-ca-from: default/example-opentelemetry-operator-serving-cert
9292
labels:
93-
helm.sh/chart: opentelemetry-operator-0.79.0
93+
helm.sh/chart: opentelemetry-operator-0.80.0
9494
app.kubernetes.io/name: opentelemetry-operator
9595
app.kubernetes.io/version: "0.117.0"
9696
app.kubernetes.io/managed-by: Helm

charts/opentelemetry-operator/examples/default/rendered/certmanager.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: cert-manager.io/v1
44
kind: Certificate
55
metadata:
66
labels:
7-
helm.sh/chart: opentelemetry-operator-0.79.0
7+
helm.sh/chart: opentelemetry-operator-0.80.0
88
app.kubernetes.io/name: opentelemetry-operator
99
app.kubernetes.io/version: "0.117.0"
1010
app.kubernetes.io/managed-by: Helm
@@ -29,7 +29,7 @@ apiVersion: cert-manager.io/v1
2929
kind: Issuer
3030
metadata:
3131
labels:
32-
helm.sh/chart: opentelemetry-operator-0.79.0
32+
helm.sh/chart: opentelemetry-operator-0.80.0
3333
app.kubernetes.io/name: opentelemetry-operator
3434
app.kubernetes.io/version: "0.117.0"
3535
app.kubernetes.io/managed-by: Helm

charts/opentelemetry-operator/examples/default/rendered/clusterrole.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1
44
kind: ClusterRole
55
metadata:
66
labels:
7-
helm.sh/chart: opentelemetry-operator-0.79.0
7+
helm.sh/chart: opentelemetry-operator-0.80.0
88
app.kubernetes.io/name: opentelemetry-operator
99
app.kubernetes.io/version: "0.117.0"
1010
app.kubernetes.io/managed-by: Helm
@@ -222,7 +222,7 @@ apiVersion: rbac.authorization.k8s.io/v1
222222
kind: ClusterRole
223223
metadata:
224224
labels:
225-
helm.sh/chart: opentelemetry-operator-0.79.0
225+
helm.sh/chart: opentelemetry-operator-0.80.0
226226
app.kubernetes.io/name: opentelemetry-operator
227227
app.kubernetes.io/version: "0.117.0"
228228
app.kubernetes.io/managed-by: Helm
@@ -240,7 +240,7 @@ apiVersion: rbac.authorization.k8s.io/v1
240240
kind: ClusterRole
241241
metadata:
242242
labels:
243-
helm.sh/chart: opentelemetry-operator-0.79.0
243+
helm.sh/chart: opentelemetry-operator-0.80.0
244244
app.kubernetes.io/name: opentelemetry-operator
245245
app.kubernetes.io/version: "0.117.0"
246246
app.kubernetes.io/managed-by: Helm

charts/opentelemetry-operator/examples/default/rendered/clusterrolebinding.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1
44
kind: ClusterRoleBinding
55
metadata:
66
labels:
7-
helm.sh/chart: opentelemetry-operator-0.79.0
7+
helm.sh/chart: opentelemetry-operator-0.80.0
88
app.kubernetes.io/name: opentelemetry-operator
99
app.kubernetes.io/version: "0.117.0"
1010
app.kubernetes.io/managed-by: Helm
@@ -25,7 +25,7 @@ apiVersion: rbac.authorization.k8s.io/v1
2525
kind: ClusterRoleBinding
2626
metadata:
2727
labels:
28-
helm.sh/chart: opentelemetry-operator-0.79.0
28+
helm.sh/chart: opentelemetry-operator-0.80.0
2929
app.kubernetes.io/name: opentelemetry-operator
3030
app.kubernetes.io/version: "0.117.0"
3131
app.kubernetes.io/managed-by: Helm

charts/opentelemetry-operator/examples/default/rendered/deployment.yaml

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: apps/v1
44
kind: Deployment
55
metadata:
66
labels:
7-
helm.sh/chart: opentelemetry-operator-0.79.0
7+
helm.sh/chart: opentelemetry-operator-0.80.0
88
app.kubernetes.io/name: opentelemetry-operator
99
app.kubernetes.io/version: "0.117.0"
1010
app.kubernetes.io/managed-by: Helm
@@ -61,12 +61,7 @@ spec:
6161
initialDelaySeconds: 5
6262
periodSeconds: 10
6363
resources:
64-
limits:
65-
cpu: 100m
66-
memory: 128Mi
67-
requests:
68-
cpu: 100m
69-
memory: 64Mi
64+
{}
7065
volumeMounts:
7166
- mountPath: /tmp/k8s-webhook-server/serving-certs
7267
name: cert
@@ -82,13 +77,6 @@ spec:
8277
- containerPort: 8443
8378
name: https
8479
protocol: TCP
85-
resources:
86-
limits:
87-
cpu: 500m
88-
memory: 128Mi
89-
requests:
90-
cpu: 5m
91-
memory: 64Mi
9280
serviceAccountName: opentelemetry-operator
9381
terminationGracePeriodSeconds: 10
9482
volumes:

charts/opentelemetry-operator/examples/default/rendered/role.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1
44
kind: Role
55
metadata:
66
labels:
7-
helm.sh/chart: opentelemetry-operator-0.79.0
7+
helm.sh/chart: opentelemetry-operator-0.80.0
88
app.kubernetes.io/name: opentelemetry-operator
99
app.kubernetes.io/version: "0.117.0"
1010
app.kubernetes.io/managed-by: Helm

charts/opentelemetry-operator/examples/default/rendered/rolebinding.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1
44
kind: RoleBinding
55
metadata:
66
labels:
7-
helm.sh/chart: opentelemetry-operator-0.79.0
7+
helm.sh/chart: opentelemetry-operator-0.80.0
88
app.kubernetes.io/name: opentelemetry-operator
99
app.kubernetes.io/version: "0.117.0"
1010
app.kubernetes.io/managed-by: Helm

charts/opentelemetry-operator/examples/default/rendered/service.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: v1
44
kind: Service
55
metadata:
66
labels:
7-
helm.sh/chart: opentelemetry-operator-0.79.0
7+
helm.sh/chart: opentelemetry-operator-0.80.0
88
app.kubernetes.io/name: opentelemetry-operator
99
app.kubernetes.io/version: "0.117.0"
1010
app.kubernetes.io/managed-by: Helm
@@ -31,7 +31,7 @@ apiVersion: v1
3131
kind: Service
3232
metadata:
3333
labels:
34-
helm.sh/chart: opentelemetry-operator-0.79.0
34+
helm.sh/chart: opentelemetry-operator-0.80.0
3535
app.kubernetes.io/name: opentelemetry-operator
3636
app.kubernetes.io/version: "0.117.0"
3737
app.kubernetes.io/managed-by: Helm

charts/opentelemetry-operator/examples/default/rendered/serviceaccount.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: opentelemetry-operator
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-operator-0.79.0
9+
helm.sh/chart: opentelemetry-operator-0.80.0
1010
app.kubernetes.io/name: opentelemetry-operator
1111
app.kubernetes.io/version: "0.117.0"
1212
app.kubernetes.io/managed-by: Helm

charts/opentelemetry-operator/examples/default/rendered/tests/test-certmanager-connection.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: "example-opentelemetry-operator-cert-manager"
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-operator-0.79.0
9+
helm.sh/chart: opentelemetry-operator-0.80.0
1010
app.kubernetes.io/name: opentelemetry-operator
1111
app.kubernetes.io/version: "0.117.0"
1212
app.kubernetes.io/managed-by: Helm

charts/opentelemetry-operator/examples/default/rendered/tests/test-service-connection.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
name: "example-opentelemetry-operator-metrics"
77
namespace: default
88
labels:
9-
helm.sh/chart: opentelemetry-operator-0.79.0
9+
helm.sh/chart: opentelemetry-operator-0.80.0
1010
app.kubernetes.io/name: opentelemetry-operator
1111
app.kubernetes.io/version: "0.117.0"
1212
app.kubernetes.io/managed-by: Helm
@@ -43,7 +43,7 @@ metadata:
4343
name: "example-opentelemetry-operator-webhook"
4444
namespace: default
4545
labels:
46-
helm.sh/chart: opentelemetry-operator-0.79.0
46+
helm.sh/chart: opentelemetry-operator-0.80.0
4747
app.kubernetes.io/name: opentelemetry-operator
4848
app.kubernetes.io/version: "0.117.0"
4949
app.kubernetes.io/managed-by: Helm

charts/opentelemetry-operator/examples/feature-gates/rendered/admission-webhooks/operator-webhook-with-cert-manager.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
annotations:
77
cert-manager.io/inject-ca-from: default/example-opentelemetry-operator-serving-cert
88
labels:
9-
helm.sh/chart: opentelemetry-operator-0.79.0
9+
helm.sh/chart: opentelemetry-operator-0.80.0
1010
app.kubernetes.io/name: opentelemetry-operator
1111
app.kubernetes.io/version: "0.117.0"
1212
app.kubernetes.io/managed-by: Helm
@@ -90,7 +90,7 @@ metadata:
9090
annotations:
9191
cert-manager.io/inject-ca-from: default/example-opentelemetry-operator-serving-cert
9292
labels:
93-
helm.sh/chart: opentelemetry-operator-0.79.0
93+
helm.sh/chart: opentelemetry-operator-0.80.0
9494
app.kubernetes.io/name: opentelemetry-operator
9595
app.kubernetes.io/version: "0.117.0"
9696
app.kubernetes.io/managed-by: Helm

charts/opentelemetry-operator/examples/feature-gates/rendered/certmanager.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: cert-manager.io/v1
44
kind: Certificate
55
metadata:
66
labels:
7-
helm.sh/chart: opentelemetry-operator-0.79.0
7+
helm.sh/chart: opentelemetry-operator-0.80.0
88
app.kubernetes.io/name: opentelemetry-operator
99
app.kubernetes.io/version: "0.117.0"
1010
app.kubernetes.io/managed-by: Helm
@@ -29,7 +29,7 @@ apiVersion: cert-manager.io/v1
2929
kind: Issuer
3030
metadata:
3131
labels:
32-
helm.sh/chart: opentelemetry-operator-0.79.0
32+
helm.sh/chart: opentelemetry-operator-0.80.0
3333
app.kubernetes.io/name: opentelemetry-operator
3434
app.kubernetes.io/version: "0.117.0"
3535
app.kubernetes.io/managed-by: Helm

charts/opentelemetry-operator/examples/feature-gates/rendered/clusterrole.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1
44
kind: ClusterRole
55
metadata:
66
labels:
7-
helm.sh/chart: opentelemetry-operator-0.79.0
7+
helm.sh/chart: opentelemetry-operator-0.80.0
88
app.kubernetes.io/name: opentelemetry-operator
99
app.kubernetes.io/version: "0.117.0"
1010
app.kubernetes.io/managed-by: Helm
@@ -256,7 +256,7 @@ apiVersion: rbac.authorization.k8s.io/v1
256256
kind: ClusterRole
257257
metadata:
258258
labels:
259-
helm.sh/chart: opentelemetry-operator-0.79.0
259+
helm.sh/chart: opentelemetry-operator-0.80.0
260260
app.kubernetes.io/name: opentelemetry-operator
261261
app.kubernetes.io/version: "0.117.0"
262262
app.kubernetes.io/managed-by: Helm
@@ -274,7 +274,7 @@ apiVersion: rbac.authorization.k8s.io/v1
274274
kind: ClusterRole
275275
metadata:
276276
labels:
277-
helm.sh/chart: opentelemetry-operator-0.79.0
277+
helm.sh/chart: opentelemetry-operator-0.80.0
278278
app.kubernetes.io/name: opentelemetry-operator
279279
app.kubernetes.io/version: "0.117.0"
280280
app.kubernetes.io/managed-by: Helm

charts/opentelemetry-operator/examples/feature-gates/rendered/clusterrolebinding.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1
44
kind: ClusterRoleBinding
55
metadata:
66
labels:
7-
helm.sh/chart: opentelemetry-operator-0.79.0
7+
helm.sh/chart: opentelemetry-operator-0.80.0
88
app.kubernetes.io/name: opentelemetry-operator
99
app.kubernetes.io/version: "0.117.0"
1010
app.kubernetes.io/managed-by: Helm
@@ -25,7 +25,7 @@ apiVersion: rbac.authorization.k8s.io/v1
2525
kind: ClusterRoleBinding
2626
metadata:
2727
labels:
28-
helm.sh/chart: opentelemetry-operator-0.79.0
28+
helm.sh/chart: opentelemetry-operator-0.80.0
2929
app.kubernetes.io/name: opentelemetry-operator
3030
app.kubernetes.io/version: "0.117.0"
3131
app.kubernetes.io/managed-by: Helm

charts/opentelemetry-operator/examples/feature-gates/rendered/deployment.yaml

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: apps/v1
44
kind: Deployment
55
metadata:
66
labels:
7-
helm.sh/chart: opentelemetry-operator-0.79.0
7+
helm.sh/chart: opentelemetry-operator-0.80.0
88
app.kubernetes.io/name: opentelemetry-operator
99
app.kubernetes.io/version: "0.117.0"
1010
app.kubernetes.io/managed-by: Helm
@@ -62,12 +62,7 @@ spec:
6262
initialDelaySeconds: 5
6363
periodSeconds: 10
6464
resources:
65-
limits:
66-
cpu: 100m
67-
memory: 128Mi
68-
requests:
69-
cpu: 100m
70-
memory: 64Mi
65+
{}
7166
volumeMounts:
7267
- mountPath: /tmp/k8s-webhook-server/serving-certs
7368
name: cert
@@ -83,13 +78,6 @@ spec:
8378
- containerPort: 8443
8479
name: https
8580
protocol: TCP
86-
resources:
87-
limits:
88-
cpu: 500m
89-
memory: 128Mi
90-
requests:
91-
cpu: 5m
92-
memory: 64Mi
9381
serviceAccountName: opentelemetry-operator
9482
terminationGracePeriodSeconds: 10
9583
volumes:

charts/opentelemetry-operator/examples/feature-gates/rendered/role.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ apiVersion: rbac.authorization.k8s.io/v1
44
kind: Role
55
metadata:
66
labels:
7-
helm.sh/chart: opentelemetry-operator-0.79.0
7+
helm.sh/chart: opentelemetry-operator-0.80.0
88
app.kubernetes.io/name: opentelemetry-operator
99
app.kubernetes.io/version: "0.117.0"
1010
app.kubernetes.io/managed-by: Helm

0 commit comments

Comments
 (0)