Merge pull request #180 from kube-logging/chore/bump-otel-versions

Author: csatib02

charts/telemetry-controller/templates/deployment.yaml

@@ -7,7 +7,7 @@ metadata:
   name: '{{ include "telemetry-controller.fullname" . }}'
   namespace: '{{ include "telemetry-controller.namespace" . }}'
 spec:
-  replicas: 1
+  replicas: {{ .Values.replicaCount }}
   selector:
     matchLabels:
       control-plane: controller-manager
@@ -17,6 +17,9 @@ spec:
     metadata:
       annotations:
         kubectl.kubernetes.io/default-container: manager
+    {{- with .Values.podAnnotations }}
+        {{ toYaml . | nindent 8 }}
+    {{- end }}
       labels:
         control-plane: controller-manager
         app.kubernetes.io/name: {{ include "telemetry-controller.name" . }}
@@ -35,7 +38,11 @@ spec:
           image:
             '{{ .Values.image.repository | default "" }}:{{ .Values.image.tag | default .Chart.AppVersion
             }}'
-          imagePullPolicy: IfNotPresent
+          imagePullPolicy: '{{ .Values.image.pullPolicy }}'
+        {{- with .Values.imagePullSecrets }}
+          imagePullSecrets:
+            {{- toYaml . | nindent 8 }}
+        {{- end }}
           livenessProbe:
             httpGet:
               path: /healthz

charts/telemetry-controller/templates/service.yaml

@@ -7,17 +7,18 @@ metadata:
   name: {{ include "telemetry-controller.fullname" . }}-metrics-service
   namespace: {{ .Release.Namespace }}
 spec:
+  type: {{ .Values.service.type }}
   ports:
     {{- if .Values.monitoring.secure }}
-    - name: https
-      port: 8443
-      protocol: TCP
-      targetPort: 8443
+    - name: {{ .Values.service.https.name }}
+      port: {{ .Values.service.https.port }}
+      protocol: {{ .Values.service.https.protocol }}
+      targetPort: {{ .Values.service.https.targetPort }}
     {{- else }}
-    - name: http
-      port: 8080
-      protocol: TCP
-      targetPort: 8080
+    - name: {{ .Values.service.http.name }}
+      port: {{ .Values.service.http.port }}
+      protocol: {{ .Values.service.http.protocol }}
+      targetPort: {{ .Values.service.http.targetPort }}
     {{- end }}
   selector:
     control-plane: controller-manager

charts/telemetry-controller/templates/serviceaccount.yaml

@@ -3,5 +3,9 @@ kind: ServiceAccount
 metadata:
   labels:
 {{ include "telemetry-controller.labels" . | indent 4 }}
+  annotations:
+    {{- with .Values.serviceAccount.annotations }}
+    {{ toYaml . | indent 4 }}
+    {{- end }}
   name: '{{ include "telemetry-controller.serviceAccountName" . }}'
   namespace: "{{.Release.Namespace}}"

charts/telemetry-controller/values.yaml

@@ -6,9 +6,9 @@ replicaCount: 1
 
 image:
   repository: ghcr.io/kube-logging/telemetry-controller
-  pullPolicy: IfNotPresent
   # Overrides the image tag whose default is the chart appVersion.
   tag: ""
+  pullPolicy: IfNotPresent
 
 extraArgs:
   - --leader-elect=true
@@ -21,8 +21,6 @@ fullnameOverride: ""
 serviceAccount:
   # Specifies whether a service account should be created
   create: true
-  # Automatically mount a ServiceAccount's API credentials?
-  automount: true
   # Annotations to add to the service account
   annotations: {}
   # The name of the service account to use.
@@ -43,17 +41,24 @@ securityContext:
 
 service:
   type: ClusterIP
-  port: 8443
+  https:
+    name: https
+    port: 8443
+    protocol: TCP
+    targetPort: 8443
+  http:
+    name: http
+    port: 8080
+    protocol: TCP
+    targetPort: 8080
 
+# -- Configuration for the opentelemetry-operator sub-chart.
 opentelemetry-operator:
   admissionWebhooks:
     certManager:
       enabled: false
     autoGenerateCert:
       enabled: true
-  manager:
-    collectorImage:
-      repository: otel/opentelemetry-collector-k8s
 
 monitoring:
   secure: true

docs/demos/persistence-and-retry-mechanisms/receivers/receiver-db.yaml

@@ -6,7 +6,7 @@ metadata:
 spec:
   managementState: managed
   mode: deployment
-  image: otel/opentelemetry-collector-contrib:0.112.0
+  image: otel/opentelemetry-collector-contrib:0.129.1
   volumeMounts:
     - name: export-db
       mountPath: /etc/otelcol-contrib/

docs/demos/persistence-and-retry-mechanisms/receivers/receiver-web.yaml

@@ -6,7 +6,7 @@ metadata:
 spec:
   managementState: managed
   mode: deployment
-  image: otel/opentelemetry-collector-contrib:0.112.0
+  image: otel/opentelemetry-collector-contrib:0.129.1
   volumeMounts:
     - name: export-web
       mountPath: /etc/otelcol-contrib/

docs/examples/simple-demo-with-secretref/receiver.yaml

@@ -5,7 +5,7 @@ metadata:
   namespace: receiver
 spec:
   managementState: managed
-  image: otel/opentelemetry-collector-contrib:0.112.0
+  image: otel/opentelemetry-collector-contrib:0.129.1
   volumes:
     - name: certs-volume
       secret:

e2e/testdata/filestorage/receiver.yaml

@@ -5,7 +5,7 @@ metadata:
   namespace: telemetry-controller-system
 spec:
   managementState: managed
-  image: otel/opentelemetry-collector-contrib:0.112.0
+  image: otel/opentelemetry-collector-contrib:0.129.1
   volumeMounts:
     - name: e2e
       mountPath: /tmp/otelcol-contrib/

e2e/testdata/one_tenant_two_subscriptions/receiver.yaml

@@ -5,7 +5,7 @@ metadata:
   namespace: telemetry-controller-system
 spec:
   managementState: managed
-  image: otel/opentelemetry-collector-contrib:0.112.0
+  image: otel/opentelemetry-collector-contrib:0.129.1
   config:
     receivers:
       otlp:

e2e/testdata/problem_tracking/problem/receiver.yaml

@@ -5,7 +5,7 @@ metadata:
   namespace: telemetry-controller-system
 spec:
   managementState: managed
-  image: otel/opentelemetry-collector-contrib:0.112.0
+  image: otel/opentelemetry-collector-contrib:0.129.1
   config:
     receivers:
       otlp: