diff --git a/charts/opentelemetry-collector/Chart.yaml b/charts/opentelemetry-collector/Chart.yaml index cbe1f9b0c9..c79b25b008 100644 --- a/charts/opentelemetry-collector/Chart.yaml +++ b/charts/opentelemetry-collector/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: opentelemetry-collector -version: 0.149.0 +version: 0.150.0 description: OpenTelemetry Collector Helm chart for Kubernetes type: application home: https://opentelemetry.io/ diff --git a/charts/opentelemetry-collector/templates/daemonset.yaml b/charts/opentelemetry-collector/templates/daemonset.yaml index 6cc106e800..49f34543db 100644 --- a/charts/opentelemetry-collector/templates/daemonset.yaml +++ b/charts/opentelemetry-collector/templates/daemonset.yaml @@ -1,5 +1,5 @@ {{- if eq .Values.mode "daemonset" -}} -apiVersion: apps/v1 +apiVersion: {{ .Values.apiVersion }} kind: DaemonSet metadata: name: {{ include "opentelemetry-collector.fullname" . }}-agent diff --git a/charts/opentelemetry-collector/templates/deployment.yaml b/charts/opentelemetry-collector/templates/deployment.yaml index 769177c546..8e8b9689c3 100644 --- a/charts/opentelemetry-collector/templates/deployment.yaml +++ b/charts/opentelemetry-collector/templates/deployment.yaml @@ -1,5 +1,5 @@ {{- if eq .Values.mode "deployment" -}} -apiVersion: apps/v1 +apiVersion: {{ .Values.apiVersion }} kind: Deployment metadata: name: {{ include "opentelemetry-collector.fullname" . }} diff --git a/charts/opentelemetry-collector/templates/statefulset.yaml b/charts/opentelemetry-collector/templates/statefulset.yaml index 7be4b3f1f6..f4dbf93651 100644 --- a/charts/opentelemetry-collector/templates/statefulset.yaml +++ b/charts/opentelemetry-collector/templates/statefulset.yaml @@ -1,5 +1,5 @@ {{- if eq .Values.mode "statefulset" -}} -apiVersion: apps/v1 +apiVersion: {{ .Values.apiVersion }} kind: StatefulSet metadata: name: {{ include "opentelemetry-collector.fullname" . }} @@ -29,6 +29,12 @@ spec: {{- include "opentelemetry-collector.selectorLabels" . | nindent 6 }} {{- include "opentelemetry-collector.component" . | nindent 6 }} updateStrategy: + {{- if eq .Values.rollout.strategy "RollingUpdate" }} + {{- with .Values.rollout.rollingUpdate }} + rollingUpdate: + {{- toYaml . | nindent 6 }} + {{- end }} + {{- end }} type: {{ .Values.rollout.strategy }} template: metadata: diff --git a/charts/opentelemetry-collector/values.schema.json b/charts/opentelemetry-collector/values.schema.json index ce7e9d01b7..2989d1b925 100644 --- a/charts/opentelemetry-collector/values.schema.json +++ b/charts/opentelemetry-collector/values.schema.json @@ -40,6 +40,10 @@ "" ] }, + "apiVersion": { + "type": "string", + "description": "Override the default apiVersion for custom controllers or testing new API versions. Applies to daemonset, deployment, and statefulset modes." + }, "namespaceOverride": { "type": "string", "description": "Name of the namespace to deploy the resources into." @@ -1283,6 +1287,7 @@ } }, "required": [ + "apiVersion", "mode" ] } diff --git a/charts/opentelemetry-collector/values.yaml b/charts/opentelemetry-collector/values.yaml index 0ac9fcfb9f..470fb2d166 100644 --- a/charts/opentelemetry-collector/values.yaml +++ b/charts/opentelemetry-collector/values.yaml @@ -8,6 +8,9 @@ fullnameOverride: "" # Valid values are "daemonset", "deployment", and "statefulset". mode: "" +# Override the default apiVersion for custom controllers or for testing new API versions. +apiVersion: "apps/v1" + # Specify which namespace should be used to deploy the resources into namespaceOverride: ""