Skip to content

Commit

Permalink
[operator] Bump operator to 0.93.0 (open-telemetry#1027)
Browse files Browse the repository at this point in the history
* bump operator to 0.93.0

* Update collector version
  • Loading branch information
TylerHelmuth authored and 12ushan committed Jul 22, 2024
1 parent f6b1aa6 commit 23f3bb3
Show file tree
Hide file tree
Showing 15 changed files with 64 additions and 49 deletions.
4 changes: 2 additions & 2 deletions charts/opentelemetry-operator/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
apiVersion: v2
name: opentelemetry-operator
version: 0.46.0
version: 0.47.0
description: OpenTelemetry Operator Helm chart for Kubernetes
type: application
home: https://opentelemetry.io/
Expand All @@ -11,4 +11,4 @@ maintainers:
- name: dmitryax
- name: TylerHelmuth
icon: https://raw.githubusercontent.com/cncf/artwork/a718fa97fffec1b9fd14147682e9e3ac0c8817cb/projects/opentelemetry/icon/color/opentelemetry-icon-color.png
appVersion: 0.92.1
appVersion: 0.93.0
15 changes: 15 additions & 0 deletions charts/opentelemetry-operator/crds/crd-opentelemetrycollector.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3864,6 +3864,11 @@ spec:
metrics:
description: Metrics defines the metrics configuration for operands.
properties:
DisablePrometheusAnnotations:
description: DisablePrometheusAnnotations controls the automatic
addition of default Prometheus annotations ('prometheus.io/scrape',
'prometheus.io/port', and 'prometheus.io/path')
type: boolean
enableMetrics:
description: EnableMetrics specifies if ServiceMonitor or
PodMonitor(for sidecar mode) should be created for the service
Expand Down Expand Up @@ -4254,6 +4259,10 @@ spec:
account to use with this instance. When set, the operator will not
automatically create a ServiceAccount for the collector.
type: string
shareProcessNamespace:
description: ShareProcessNamespace indicates if the pod's containers
should share process namespace.
type: boolean
targetAllocator:
description: TargetAllocator indicates a value which determines whether
to spawn a target allocation resource or not.
Expand Down Expand Up @@ -5175,6 +5184,7 @@ spec:
type: object
type: array
filterStrategy:
default: relabel-config
description: FilterStrategy determines how to filter targets before
allocating them among the collectors. The only current option
is relabel-config (drops targets based on prom relabel_config).
Expand All @@ -5197,6 +5207,11 @@ spec:
description: Metrics defines the metrics configuration for
operands.
properties:
DisablePrometheusAnnotations:
description: DisablePrometheusAnnotations controls the
automatic addition of default Prometheus annotations
('prometheus.io/scrape', 'prometheus.io/port', and 'prometheus.io/path')
type: boolean
enableMetrics:
description: EnableMetrics specifies if ServiceMonitor
or PodMonitor(for sidecar mode) should be created for
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ metadata:
annotations:
cert-manager.io/inject-ca-from: default/example-opentelemetry-operator-serving-cert
labels:
helm.sh/chart: opentelemetry-operator-0.46.0
helm.sh/chart: opentelemetry-operator-0.47.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.92.1"
app.kubernetes.io/version: "0.93.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example
app.kubernetes.io/component: webhook
Expand Down Expand Up @@ -91,9 +91,9 @@ metadata:
annotations:
cert-manager.io/inject-ca-from: default/example-opentelemetry-operator-serving-cert
labels:
helm.sh/chart: opentelemetry-operator-0.46.0
helm.sh/chart: opentelemetry-operator-0.47.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.92.1"
app.kubernetes.io/version: "0.93.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example
app.kubernetes.io/component: webhook
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ apiVersion: cert-manager.io/v1
kind: Certificate
metadata:
labels:
helm.sh/chart: opentelemetry-operator-0.46.0
helm.sh/chart: opentelemetry-operator-0.47.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.92.1"
app.kubernetes.io/version: "0.93.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example
app.kubernetes.io/component: webhook
Expand All @@ -29,9 +29,9 @@ apiVersion: cert-manager.io/v1
kind: Issuer
metadata:
labels:
helm.sh/chart: opentelemetry-operator-0.46.0
helm.sh/chart: opentelemetry-operator-0.47.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.92.1"
app.kubernetes.io/version: "0.93.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example
app.kubernetes.io/component: webhook
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
labels:
helm.sh/chart: opentelemetry-operator-0.46.0
helm.sh/chart: opentelemetry-operator-0.47.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.92.1"
app.kubernetes.io/version: "0.93.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example
app.kubernetes.io/component: controller-manager
Expand Down Expand Up @@ -253,9 +253,9 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
labels:
helm.sh/chart: opentelemetry-operator-0.46.0
helm.sh/chart: opentelemetry-operator-0.47.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.92.1"
app.kubernetes.io/version: "0.93.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example
app.kubernetes.io/component: controller-manager
Expand All @@ -271,9 +271,9 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRole
metadata:
labels:
helm.sh/chart: opentelemetry-operator-0.46.0
helm.sh/chart: opentelemetry-operator-0.47.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.92.1"
app.kubernetes.io/version: "0.93.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example
app.kubernetes.io/component: controller-manager
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
labels:
helm.sh/chart: opentelemetry-operator-0.46.0
helm.sh/chart: opentelemetry-operator-0.47.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.92.1"
app.kubernetes.io/version: "0.93.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example
app.kubernetes.io/component: controller-manager
Expand All @@ -25,9 +25,9 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: ClusterRoleBinding
metadata:
labels:
helm.sh/chart: opentelemetry-operator-0.46.0
helm.sh/chart: opentelemetry-operator-0.47.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.92.1"
app.kubernetes.io/version: "0.93.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example
app.kubernetes.io/component: controller-manager
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ apiVersion: apps/v1
kind: Deployment
metadata:
labels:
helm.sh/chart: opentelemetry-operator-0.46.0
helm.sh/chart: opentelemetry-operator-0.47.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.92.1"
app.kubernetes.io/version: "0.93.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example
app.kubernetes.io/component: controller-manager
Expand All @@ -33,13 +33,13 @@ spec:
- --enable-leader-election
- --health-probe-addr=:8081
- --webhook-port=9443
- --collector-image=otel/opentelemetry-collector-contrib:0.92.0
- --collector-image=otel/opentelemetry-collector-contrib:0.93.0
command:
- /manager
env:
- name: ENABLE_WEBHOOKS
value: "true"
image: "ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator:0.92.1"
image: "ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator:0.93.0"
name: manager
ports:
- containerPort: 8080
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: Role
metadata:
labels:
helm.sh/chart: opentelemetry-operator-0.46.0
helm.sh/chart: opentelemetry-operator-0.47.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.92.1"
app.kubernetes.io/version: "0.93.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example
app.kubernetes.io/component: controller-manager
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ apiVersion: rbac.authorization.k8s.io/v1
kind: RoleBinding
metadata:
labels:
helm.sh/chart: opentelemetry-operator-0.46.0
helm.sh/chart: opentelemetry-operator-0.47.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.92.1"
app.kubernetes.io/version: "0.93.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example
app.kubernetes.io/component: controller-manager
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ apiVersion: v1
kind: Service
metadata:
labels:
helm.sh/chart: opentelemetry-operator-0.46.0
helm.sh/chart: opentelemetry-operator-0.47.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.92.1"
app.kubernetes.io/version: "0.93.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example
app.kubernetes.io/component: controller-manager
Expand All @@ -31,9 +31,9 @@ apiVersion: v1
kind: Service
metadata:
labels:
helm.sh/chart: opentelemetry-operator-0.46.0
helm.sh/chart: opentelemetry-operator-0.47.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.92.1"
app.kubernetes.io/version: "0.93.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example
app.kubernetes.io/component: controller-manager
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ metadata:
name: opentelemetry-operator
namespace: default
labels:
helm.sh/chart: opentelemetry-operator-0.46.0
helm.sh/chart: opentelemetry-operator-0.47.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.92.1"
app.kubernetes.io/version: "0.93.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example
app.kubernetes.io/component: controller-manager
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ metadata:
name: "example-opentelemetry-operator-cert-manager"
namespace: default
labels:
helm.sh/chart: opentelemetry-operator-0.46.0
helm.sh/chart: opentelemetry-operator-0.47.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.92.1"
app.kubernetes.io/version: "0.93.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example
app.kubernetes.io/component: webhook
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ metadata:
name: "example-opentelemetry-operator-metrics"
namespace: default
labels:
helm.sh/chart: opentelemetry-operator-0.46.0
helm.sh/chart: opentelemetry-operator-0.47.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.92.1"
app.kubernetes.io/version: "0.93.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example
app.kubernetes.io/component: controller-manager
Expand Down Expand Up @@ -43,9 +43,9 @@ metadata:
name: "example-opentelemetry-operator-webhook"
namespace: default
labels:
helm.sh/chart: opentelemetry-operator-0.46.0
helm.sh/chart: opentelemetry-operator-0.47.0
app.kubernetes.io/name: opentelemetry-operator
app.kubernetes.io/version: "0.92.1"
app.kubernetes.io/version: "0.93.0"
app.kubernetes.io/managed-by: Helm
app.kubernetes.io/instance: example
app.kubernetes.io/component: controller-manager
Expand Down
16 changes: 8 additions & 8 deletions charts/opentelemetry-operator/values.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -142,13 +142,13 @@
"default": "",
"title": "The tag Schema",
"examples": [
"v0.92.0"
"v0.93.0"
]
}
},
"examples": [{
"repository": "ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator",
"tag": "v0.92.0"
"tag": "v0.93.0"
}]
},
"collectorImage": {
Expand All @@ -173,13 +173,13 @@
"default": "",
"title": "The tag Schema",
"examples": [
"0.92.0"
"0.93.0"
]
}
},
"examples": [{
"repository": "otel/opentelemetry-collector-contrib",
"tag": "0.92.0"
"tag": "0.93.0"
}]
},
"opampBridgeImage": {
Expand Down Expand Up @@ -923,11 +923,11 @@
"examples": [{
"image": {
"repository": "ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator",
"tag": "v0.92.0"
"tag": "v0.93.0"
},
"collectorImage": {
"repository": "otel/opentelemetry-collector-contrib",
"tag": "0.92.0"
"tag": "0.93.0"
},
"opampBridgeImage": {
"repository": "",
Expand Down Expand Up @@ -1674,11 +1674,11 @@
"manager": {
"image": {
"repository": "ghcr.io/open-telemetry/opentelemetry-operator/opentelemetry-operator",
"tag": "v0.92.0"
"tag": "v0.93.0"
},
"collectorImage": {
"repository": "otel/opentelemetry-collector-contrib",
"tag": "0.92.0"
"tag": "0.93.0"
},
"opampBridgeImage": {
"repository": "",
Expand Down
2 changes: 1 addition & 1 deletion charts/opentelemetry-operator/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ manager:
tag: ""
collectorImage:
repository: otel/opentelemetry-collector-contrib
tag: 0.92.0
tag: 0.93.0
opampBridgeImage:
repository: ""
tag: ""
Expand Down

0 comments on commit 23f3bb3

Please sign in to comment.