Merge branch 'main' into fix/tempoIngesterPVC

grafana · Nov 11, 2024 · e4a00a6 · e4a00a6
2 parents 2da94f2 + 51db949
commit e4a00a6
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 7 deletions.
diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml
@@ -72,9 +72,22 @@ jobs:
           kubectl_version: ${{ inputs.kind_kubectl_version }}
           node_image: ${{ inputs.kind_node_image }}
 
-      - name: Apply Gateway API CRDs
+      - name: Check Kubernetes version and apply Gateway API CRDs
         if: steps.list-changed.outputs.changed == 'true'
-        run: kubectl apply -k https://github.com/kubernetes-sigs/gateway-api/config/crd
+        run: |
+          # Get Kubernetes version and extract the major.minor version
+          version=$(kubectl version -o json | jq -r '.serverVersion.major + "." + .serverVersion.minor' | tr -d '+')
+          major_version=$(echo $version | cut -d. -f1)
+          minor_version=$(echo $version | cut -d. -f2)
+          
+          # Compare version with 1.23. The gateway CRDs use x-kubernetes-validations, which is only supported from 1.23 onwards.
+          if [ "$major_version" -eq 1 ] && [ "$minor_version" -ge 23 ] || [ "$major_version" -gt 1 ]; then
+            echo "Kubernetes version $version >= 1.23, applying Gateway API CRDs"
+            kubectl apply -k https://github.com/kubernetes-sigs/gateway-api/config/crd
+          else
+            echo "Kubernetes version $version < 1.23, skipping Gateway API CRDs installation"
+            echo "Please use an older version of Gateway API CRDs or upgrade your Kubernetes version"
+          fi
 
       - name: Run chart-testing (install)
         run: |

diff --git a/.github/workflows/update-helm-repo.yaml b/.github/workflows/update-helm-repo.yaml
@@ -94,8 +94,7 @@ jobs:
     needs: [setup]
     runs-on: ubuntu-latest
     permissions:
-      contents: write # to push chart release, create release, and push tags to github
-      packages: write # to push package to ghcr
+      packages: write # allows GITHUB_TOKEN to push package to ghcr
     env:
       github_app_id: ${{ secrets.github_app_id }}
     if: needs.setup.outputs.changed == 'true'
@@ -234,7 +233,9 @@ jobs:
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
-          password: ${{ env.AUTHTOKEN }}
+          # GitHub App installation token cannot push package to the org's package registry;
+          # using GITHUB_TOKEN here instead to avoid using PAT.
+          password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Push charts to GHCR
         run: |

diff --git a/charts/tempo/Chart.yaml b/charts/tempo/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: tempo
 description: Grafana Tempo Single Binary Mode
 type: application
-version: 1.13.0
+version: 1.14.0
 appVersion: 2.6.1
 engine: gotpl
 home: https://grafana.net

diff --git a/charts/tempo/README.md b/charts/tempo/README.md
@@ -1,6 +1,6 @@
 # tempo
 
-![Version: 1.13.0](https://img.shields.io/badge/Version-1.13.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.6.1](https://img.shields.io/badge/AppVersion-2.6.1-informational?style=flat-square)
+![Version: 1.14.0](https://img.shields.io/badge/Version-1.14.0-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.6.1](https://img.shields.io/badge/AppVersion-2.6.1-informational?style=flat-square)
 
 Grafana Tempo Single Binary Mode
 
@@ -31,6 +31,7 @@ Grafana Tempo Single Binary Mode
 | networkPolicy.ingress | bool | `true` |  |
 | nodeSelector | object | `{}` | Node labels for pod assignment. See: https://kubernetes.io/docs/user-guide/node-selection/ |
 | persistence.accessModes[0] | string | `"ReadWriteOnce"` |  |
+| persistence.enableStatefulSetAutoDeletePVC | bool | `false` | Enable StatefulSetAutoDeletePVC feature |
 | persistence.enabled | bool | `false` |  |
 | persistence.size | string | `"10Gi"` |  |
 | podAnnotations | object | `{}` | Pod Annotations |

diff --git a/charts/tempo/templates/statefulset.yaml b/charts/tempo/templates/statefulset.yaml
@@ -14,6 +14,11 @@ spec:
   {{- if .Values.revisionHistoryLimit }}
   revisionHistoryLimit: {{ .Values.revisionHistoryLimit }}
   {{- end }}
+  {{- if and (semverCompare ">= 1.23-0" .Capabilities.KubeVersion.Version) (.Values.persistence.enableStatefulSetAutoDeletePVC) (.Values.persistence.enabled) }}
+  persistentVolumeClaimRetentionPolicy:
+    whenDeleted: Delete
+    whenScaled: Delete
+  {{- end }}
   selector:
     matchLabels:
       {{- include "tempo.selectorLabels" . | nindent 6 }}

diff --git a/charts/tempo/values.yaml b/charts/tempo/values.yaml
@@ -276,6 +276,8 @@ serviceMonitor:
 
 persistence:
   enabled: false
+    # -- Enable StatefulSetAutoDeletePVC feature
+  enableStatefulSetAutoDeletePVC: false
   # storageClassName: local-path
   accessModes:
     - ReadWriteOnce