Merge branch 'main' into chore/remove-nexus

Author: xeniape

.github/workflows/generate_prs.yml

@@ -9,17 +9,24 @@ on:
       message:
         description: "Message to include in the generated commits:"
         required: true
+      custom-pr-title:
+        description: "Optionally a custom PR title. If unset, default will be used"
       dry-run:
         description: "Dry Run (PRs are not generated)"
         type: boolean
         default: true
+      fail-fast:
+        description: "Fail fast (if one job fails, all other are cancelled)"
+        type: boolean
+        default: false
 
 permissions: {}
 
 jobs:
   create-prs:
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: ${{ inputs.fail-fast }}
       # If you add a new repository here, also add it to config/repositories.yaml
       matrix:
         repository:
@@ -155,12 +162,18 @@ jobs:
       # Generate PRs
       - name: Run playbook
         if: ${{ !inputs.dry-run }}
+        env:
+          CUSTOM_PR_TITLE: ${{ inputs.custom-pr-title }}
+          GH_ACCESS_TOKEN: ${{ secrets.gh_access_token }}
         run: |
           # Funnel via JSON to ensure that values are escaped properly
-          echo '{}' | jq '{commit_hash: $ENV.GITHUB_SHA, author: $ENV.AUTHOR, reason: $ENV.REASON, base_dir: $pwd, gh_access_token: $ENV.GH_ACCESS_TOKEN}' --arg pwd "$(pwd)" > vars.json
+          # Check if custom PR title is set. If so, insert it into the extra vars
+          if [ -n "$CUSTOM_PR_TITLE" ]; then
+            echo '{}' | jq '{commit_hash: $ENV.GITHUB_SHA, author: $ENV.AUTHOR, reason: $ENV.REASON, custom_pr_title: $ENV.CUSTOM_PR_TITLE, base_dir: $pwd, gh_access_token: $ENV.GH_ACCESS_TOKEN}' --arg pwd "$(pwd)" > vars.json
+          else
+            echo '{}' | jq '{commit_hash: $ENV.GITHUB_SHA, author: $ENV.AUTHOR, reason: $ENV.REASON, base_dir: $pwd, gh_access_token: $ENV.GH_ACCESS_TOKEN}' --arg pwd "$(pwd)" > vars.json
+          fi
           ansible-playbook playbook/playbook.yaml --extra-vars "@vars.json"
-        env:
-          GH_ACCESS_TOKEN: ${{ secrets.gh_access_token }}
 
       # Do Not Generate PRs
       - name: Run playbook (dry-run)

playbook/group_vars/all/vars

@@ -19,7 +19,7 @@ commit_message: |
     Reference-to: stackabletech/operator-templating@{{ commit_short_hash }} ({{ reason }})
 
 # Title and body of created PRs
-pr_title: "chore: Update templated files ({{ commit_short_hash }})"
+pr_title: "{{ custom_pr_title | default('chore: Update templated files (' + commit_short_hash + ')') }}"
 pr_body: |
     > [!NOTE]
     > _Autogenerated PR to update templated files since the last template run up to stackabletech/operator-templating@{{ commit_hash }}._

template/deploy/helm/[[operator]]/templates/_telemetry.tpl

@@ -0,0 +1,59 @@
+{{/*
+Create a list of telemetry related env vars.
+*/}}
+{{- define "telemetry.envVars" -}}
+{{- with .Values.telemetry }}
+{{- if not .consoleLog.enabled }}
+- name: CONSOLE_LOG_DISABLED
+  value: "true"
+{{- end }}
+{{- if and .consoleLog.enabled .consoleLog.level }}
+- name: CONSOLE_LOG_LEVEL
+  value: {{ .consoleLog.level }}
+{{ end }}
+{{- if and .consoleLog.enabled .consoleLog.format }}
+- name: CONSOLE_LOG_FORMAT
+  value: {{ .consoleLog.format }}
+{{ end }}
+{{- if .fileLog.enabled }}
+- name: FILE_LOG_DIRECTORY
+  value: /stackable/logs/{{ include "operator.appname" $ }}
+{{- end }}
+{{- if and .fileLog.enabled .fileLog.level }}
+- name: FILE_LOG_LEVEL
+  value: {{ .fileLog.level }}
+{{- end }}
+{{- if and .fileLog.enabled .fileLog.rotationPeriod }}
+- name: FILE_LOG_ROTATION_PERIOD
+  value: {{ .fileLog.rotationPeriod }}
+{{- end }}
+{{- if and .fileLog.enabled .fileLog.maxFiles }}
+- name: FILE_LOG_MAX_FILES
+  value: {{ quote .fileLog.maxFiles }}
+{{- end }}
+{{- if .otelLogExporter.enabled }}
+- name: OTEL_LOG_EXPORTER_ENABLED
+  value: "true"
+{{- end }}
+{{- if and .otelLogExporter.enabled .otelLogExporter.level }}
+- name: OTEL_LOG_EXPORTER_LEVEL
+  value: {{ .otelLogExporter.level }}
+{{- end }}
+{{- if and .otelLogExporter.enabled .otelLogExporter.endpoint }}
+- name: OTEL_EXPORTER_OTLP_LOGS_ENDPOINT
+  value: {{ .otelLogExporter.endpoint }}
+{{- end }}
+{{- if .otelTraceExporter.enabled }}
+- name: OTEL_TRACE_EXPORTER_ENABLED
+  value: "true"
+{{- end }}
+{{- if and .otelTraceExporter.enabled .otelTraceExporter.level }}
+- name: OTEL_TRACE_EXPORTER_LEVEL
+  value: {{ .otelTraceExporter.level }}
+{{- end }}
+{{- if and .otelTraceExporter.enabled .otelTraceExporter.endpoint }}
+- name: OTEL_EXPORTER_OTLP_TRACES_ENDPOINT
+  value: {{ .otelTraceExporter.endpoint }}
+{{- end }}
+{{- end }}
+{{- end }}

template/deploy/helm/[[operator]]/templates/deployment.yaml.j2

@@ -52,6 +52,7 @@ spec:
             - name: KUBERNETES_CLUSTER_DOMAIN
               value: {{ .Values.kubernetesClusterDomain | quote }}
             {{- end }}
+            {{- include "telemetry.envVars" . | nindent 12 }}
 {[% if operator.product_string in ['kafka'] %}]
             - name: KAFKA_BROKER_CLUSTERROLE
               value: {{ include "operator.fullname" . }}-kafka-broker-clusterrole