feat: Changes needed to upgrade the otel operator to 0.76.0

.changelog/3877.changed.txt

@@ -0,0 +1 @@
+feat: Changes needed to upgrade the otel operator to 0.76.0

deploy/helm/sumologic/Chart.yaml

@@ -33,7 +33,7 @@ dependencies:
     repository: https://sumologic.github.io/tailing-sidecar
     condition: tailing-sidecar-operator.enabled
   - name: opentelemetry-operator
-    version: 0.56.1
+    version: 0.76.0
     repository: https://open-telemetry.github.io/opentelemetry-helm-charts
     condition: opentelemetry-operator.enabled,sumologic.metrics.collector.otelcol.enabled
   - name: prometheus-windows-exporter

deploy/helm/sumologic/templates/_helpers/_common.tpl

@@ -95,6 +95,10 @@ sumologic.com/app: setup
 {{- template "sumologic.labels.app.setup" . }}
 {{- end -}}
 
+{{- define "sumologic.labels.app.setup.configmap.crds" -}}
+{{- template "sumologic.labels.app.setup" . }}-crds
+{{- end -}}
+
 {{- define "sumologic.labels.app.setup.roles.role" -}}
 {{- template "sumologic.labels.app.setup" . }}
 {{- end -}}
@@ -211,6 +215,10 @@ helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
 {{ template "sumologic.metadata.name.setup" . }}
 {{- end -}}
 
+{{- define "sumologic.metadata.name.setup.job-crd" -}}
+{{ template "sumologic.metadata.name.setup.job" . }}-crd
+{{- end -}}
+
 {{- define "sumologic.metadata.name.setup.configmap-custom" -}}
 {{ template "sumologic.metadata.name.setup" . }}-custom
 {{- end -}}
@@ -219,6 +227,10 @@ helm.sh/hook-delete-policy: before-hook-creation,hook-succeeded
 {{ template "sumologic.metadata.name.setup" . }}
 {{- end -}}
 
+{{- define "sumologic.metadata.name.setup.configmap-crds" -}}
+{{ template "sumologic.metadata.name.setup" . }}-crds
+{{- end -}}
+
 {{- define "sumologic.metadata.name.setup.roles.role" -}}
 {{ template "sumologic.metadata.name.setup" . }}
 {{- end -}}

deploy/helm/sumologic/templates/_helpers/_metrics.tpl

@@ -98,6 +98,14 @@ Return the otelcol metrics collector image
 {{- end -}}
 {{- end -}}
 
+{{- define "sumologic.metrics.collector.otelcol.managementState" -}}
+{{printf "managed"}}
+{{- end -}}
+
+{{- define "sumologic.metrics.collector.otelcol.upgradeStrategy" -}}
+{{printf "automatic"}}
+{{- end -}}
+
 {{- define "metrics.collector.otelcol.affinity" -}}
 {{- if .Values.sumologic.metrics.collector.otelcol.affinity -}}
 {{- toYaml .Values.sumologic.metrics.collector.otelcol.affinity -}}

deploy/helm/sumologic/templates/metrics/collector/otelcol/opentelemetrycollector.yaml

@@ -8,7 +8,7 @@
 {{ else }}
 {{ $finalConfig = mergeOverwrite $baseConfig $mergeConfig }}
 {{ end }}
-apiVersion: opentelemetry.io/v1alpha1
+apiVersion: opentelemetry.io/v1beta1
 kind: OpenTelemetryCollector
 metadata:
   name: {{ template "sumologic.metadata.name.metrics.collector.opentelemetrycollector" . }}
@@ -28,6 +28,8 @@ spec:
   mode: statefulset
   replicas: {{ .Values.sumologic.metrics.collector.otelcol.replicaCount }}
   serviceAccount: {{ template "sumologic.metadata.name.metrics.collector.serviceaccount" . }}
+  managementState: {{ template "sumologic.metrics.collector.otelcol.managementState" . }}
+  upgradeStrategy: {{ template "sumologic.metrics.collector.otelcol.upgradeStrategy" . }}
   targetAllocator:
 {{- if .Values.sumologic.metrics.collector.otelcol.allocationStrategy }}
     allocationStrategy: {{ .Values.sumologic.metrics.collector.otelcol.allocationStrategy }}
@@ -41,13 +43,11 @@ spec:
 {{- if .Values.sumologic.metrics.collector.otelcol.serviceMonitorSelector }}
         {{ .Values.sumologic.metrics.collector.otelcol.serviceMonitorSelector | toYaml | nindent 8 }}
 {{- else }}
-        release: {{ .Release.Name }}
 {{- end }}
       podMonitorSelector:
 {{- if .Values.sumologic.metrics.collector.otelcol.podMonitorSelector }}
         {{ .Values.sumologic.metrics.collector.otelcol.podMonitorSelector | toYaml | nindent 8 }}
 {{- else }}
-        release: {{ .Release.Name }}
 {{- end }}
     serviceAccount: {{ template "sumologic.metadata.name.metrics.targetallocator.serviceaccount" . }}
 {{- if not (empty (include "metrics.collector.otelcol.nodeSelector" .)) }}
@@ -129,6 +129,6 @@ spec:
     mountPath: /tmp
   - name: file-storage
     mountPath: /var/lib/storage/otc
-  config: |
+  config:
 {{- $finalConfig | toYaml | nindent 4 }}
 {{- end }}

deploy/helm/sumologic/templates/setup/crds-configmap.yaml

@@ -0,0 +1,17 @@
+{{- if .Values.sumologic.installCRDs -}}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ template "sumologic.metadata.name.setup.configmap-crds" . }}
+  namespace: {{ template "sumologic.namespace"  . }}
+  annotations:
+{{ include "sumologic.annotations.app.setup.helmsh" "2" | indent 4 }}
+  labels:
+    app: {{ template "sumologic.labels.app.setup.configmap.crds" . }}
+    {{- include "sumologic.labels.common" . | nindent 4 }}
+data:
+  crds-configmaps.yaml: |-
+      {{ range $path, $bytes := .Files.Glob (printf "crds/*")}}
+      {{- $.Files.Get $path | nindent 8 }}
+      {{ end }}
+{{- end -}}

deploy/helm/sumologic/templates/setup/job.yaml

@@ -59,18 +59,24 @@ spec:
         configMap:
           name: {{ template "sumologic.metadata.name.setup.configmap-custom" . }}
           defaultMode: 0777
+      - name: manifests
+        configMap:
+          name: {{ template "sumologic.metadata.name.setup.configmap-crds" . }}
+          defaultMode: 0777
       containers:
       - name: setup
         image: {{ .Values.sumologic.setup.job.image.repository }}:{{ .Values.sumologic.setup.job.image.tag }}
         imagePullPolicy: {{ .Values.sumologic.setup.job.image.pullPolicy }}
-        command: ["/etc/terraform/setup.sh"]
+        command: ["/etc/terraform/setup.sh", "kubectl apply --server-side -f /manifests/crds-configmaps.yaml --force-conflicts"]
         resources:
           {{- toYaml .Values.sumologic.setup.job.resources | nindent 10 }}
         volumeMounts:
         - name: setup
           mountPath: /etc/terraform
         - name: custom
           mountPath: /customer-scripts
+        - name: manifests
+          mountPath: /manifests
         envFrom:
         - secretRef:
             name: {{ .Values.sumologic.envFromSecret | default (include "sumologic.metadata.name.setup.secret" .)}}

deploy/helm/sumologic/values.yaml

@@ -15,6 +15,9 @@ sumologic:
   ## If enabled, a pre-delete hook will destroy Collector in Sumo Logic
   cleanupEnabled: false
 
+  ## Installation of CRDs
+  installCRDs: true
+
   ## If enabled, accessId and accessKey will be sourced from Secret Name given
   ## Be sure to include at least the following env variables in your secret
   ## (1) SUMOLOGIC_ACCESSID, (2) SUMOLOGIC_ACCESSKEY
@@ -532,11 +535,11 @@ sumologic:
 
         ## Selector for ServiceMonitors used for target discovery. By default, this selects resources created by this Chart.
         ## See https://github.com/open-telemetry/opentelemetry-operator/blob/main/docs/api.md#opentelemetrycollectorspectargetallocatorprometheuscr
-        # serviceMonitorSelector:
+        serviceMonitorSelector: {}
 
         ## Selector for PodMonitors used for target discovery. By default, this selects resources created by this Chart.
         ## See https://github.com/open-telemetry/opentelemetry-operator/blob/main/docs/api.md#opentelemetrycollectorspectargetallocatorprometheuscr
-        # podMonitorSelector:
+        podMonitorSelector: {}
 
         securityContext:
           ## The group ID of all processes in the statefulset containers. This can be anything, but it does need to be set.
@@ -2468,6 +2471,10 @@ tailing-sidecar-operator:
 opentelemetry-operator:
   enabled: true
 
+  ## CRDs are installed manually, do not create them
+  crds:
+    create: false
+
   ## Specific for OpenTelemetry Operator chart values
   admissionWebhooks:
     create: true