Compare commits

..

4 Commits

Author SHA1 Message Date
Stefan Prodan
d29c60d2e6 Merge pull request #1885 from renatovassaomb/rv/drop-policy-v1beta1
Removes deprecated `policy/v1beta1` API from PodDisruptionBudget templates
2026-03-11 15:30:08 +02:00
Sanskar Jaiswal
481d9c3d1f Merge pull request #1811 from cdoble84-uk/prometheus-chart-fix
fix(chart): fixes a compatibility issue with the Helm Chart and Prometheus v3.0+
2026-03-09 20:03:47 +05:30
Chris Doble
5bf3cc5c95 Fixes a compatibility issue with the Helm Chart and Prometheus v3.0+
In the Flagger Helm Chart Prometheus config the storage retention duration is set via this flag --storage.tsdb.retention. This Flag was deprecated in a previous version of Prometheus and removed from Prometheus v3.0+ which means the current Flagger Helm Chart is incompatible with the newer Prometheus versions. This flag has now been updated to --storage.tsdb.retention.time which is backwards compatible down to Prometheus v2.51 at least.

Signed-off-by: Chris Doble <chrisdoble84@gmail.com>
2026-03-09 18:06:00 +05:30
Renato Vassão
36a208835d Removes deprecated policy/v1beta1 api from PodDisruptionBudget templates
Signed-off-by: Renato Vassão <renato.vassao@mindbodyonline.com>
2026-03-06 10:21:45 -03:00
9 changed files with 23 additions and 31 deletions

View File

@@ -19,7 +19,7 @@ jobs:
labels: ubuntu-latest-16-cores
steps:
- name: Checkout
uses: actions/checkout@v6
uses: actions/checkout@v5
- name: Setup Go
uses: actions/setup-go@v6
with:

View File

@@ -38,16 +38,16 @@ jobs:
- knative
steps:
- name: Checkout
uses: actions/checkout@v6
uses: actions/checkout@v5
- name: Setup Kubernetes
uses: helm/kind-action@v1.14.0
uses: helm/kind-action@v1.12.0
if: matrix.provider != 'skipper'
with:
version: v0.23.0
cluster_name: kind
node_image: kindest/node:v1.30.0@sha256:047357ac0cfea04663786a612ba1eaba9702bef25227a794b52890dd8bcd692e
- name: Setup Kubernetes for skipper
uses: helm/kind-action@v1.14.0
uses: helm/kind-action@v1.12.0
if: matrix.provider == 'skipper'
with:
version: v0.23.0

View File

@@ -12,7 +12,7 @@ jobs:
permissions:
contents: write
steps:
- uses: actions/checkout@v6
- uses: actions/checkout@v5
- name: Publish Helm charts
uses: stefanprodan/helm-gh-pages@v1.7.0
with:

View File

@@ -16,8 +16,8 @@ jobs:
id-token: write
packages: write
steps:
- uses: actions/checkout@v6
- uses: sigstore/cosign-installer@v4.0.0
- uses: actions/checkout@v5
- uses: sigstore/cosign-installer@v3.10.0
- name: Prepare
id: prep
run: |
@@ -25,19 +25,19 @@ jobs:
echo "BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_OUTPUT
echo "VERSION=${VERSION}" >> $GITHUB_OUTPUT
- name: Setup QEMU
uses: docker/setup-qemu-action@v4
uses: docker/setup-qemu-action@v3
- name: Setup Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v4
uses: docker/setup-buildx-action@v3
- name: Login to GitHub Container Registry
uses: docker/login-action@v4
uses: docker/login-action@v3
with:
registry: ghcr.io
username: fluxcdbot
password: ${{ secrets.GHCR_TOKEN }}
- name: Generate image meta
id: meta
uses: docker/metadata-action@v6
uses: docker/metadata-action@v5
with:
images: |
${{ env.IMAGE }}
@@ -45,7 +45,7 @@ jobs:
type=raw,value=${{ steps.prep.outputs.VERSION }}
- name: Publish image
id: build-push
uses: docker/build-push-action@v7
uses: docker/build-push-action@v6
with:
push: true
builder: ${{ steps.buildx.outputs.name }}

View File

@@ -27,13 +27,13 @@ jobs:
id-token: write # needed for keyless signing
packages: write # needed for ghcr access
steps:
- uses: actions/checkout@v6
- uses: actions/checkout@v5
- name: Setup Go
uses: actions/setup-go@v6
with:
go-version: 1.25.x
- uses: fluxcd/flux2/action@main
- uses: sigstore/cosign-installer@v4.0.0
- uses: sigstore/cosign-installer@v3.10.0
- name: Prepare
id: prep
run: |
@@ -47,19 +47,19 @@ jobs:
echo "BUILD_DATE=$(date -u +'%Y-%m-%dT%H:%M:%SZ')" >> $GITHUB_OUTPUT
echo "VERSION=${VERSION}" >> $GITHUB_OUTPUT
- name: Setup QEMU
uses: docker/setup-qemu-action@v4
uses: docker/setup-qemu-action@v3
- name: Setup Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v4
uses: docker/setup-buildx-action@v3
- name: Login to GitHub Container Registry
uses: docker/login-action@v4
uses: docker/login-action@v3
with:
registry: ghcr.io
username: fluxcdbot
password: ${{ secrets.GHCR_TOKEN }}
- name: Generate image meta
id: meta
uses: docker/metadata-action@v6
uses: docker/metadata-action@v5
with:
images: |
${{ env.IMAGE }}
@@ -67,7 +67,7 @@ jobs:
type=raw,value=${{ steps.prep.outputs.VERSION }}
- name: Publish image
id: build-push
uses: docker/build-push-action@v7
uses: docker/build-push-action@v6
with:
sbom: true
provenance: true
@@ -121,7 +121,7 @@ jobs:
- uses: anchore/sbom-action/download-syft@v0
- name: Create release and SBOM
id: run-goreleaser
uses: goreleaser/goreleaser-action@v7
uses: goreleaser/goreleaser-action@v6
if: startsWith(github.ref, 'refs/tags/v')
with:
version: latest

View File

@@ -17,7 +17,7 @@ jobs:
permissions:
security-events: write
steps:
- uses: actions/checkout@v6
- uses: actions/checkout@v5
- name: Run FOSSA scan and upload build data
uses: fossa-contrib/fossa-action@v3
with:
@@ -30,7 +30,7 @@ jobs:
security-events: write
steps:
- name: Checkout repository
uses: actions/checkout@v6
uses: actions/checkout@v5
- name: Setup Go
uses: actions/setup-go@v6
with:

View File

@@ -1,9 +1,5 @@
{{- if .Values.podDisruptionBudget.enabled }}
{{- if .Capabilities.APIVersions.Has "policy/v1/PodDisruptionBudget" -}}
apiVersion: policy/v1
{{- else }}
apiVersion: policy/v1beta1
{{- end }}
kind: PodDisruptionBudget
metadata:
name: {{ template "flagger.name" . }}

View File

@@ -233,7 +233,7 @@ spec:
image: {{ .Values.prometheus.image }}
imagePullPolicy: IfNotPresent
args:
- '--storage.tsdb.retention={{ .Values.prometheus.retention }}'
- '--storage.tsdb.retention.time={{ .Values.prometheus.retention }}'
- '--config.file=/etc/prometheus/prometheus.yml'
ports:
- containerPort: 9090

View File

@@ -1,9 +1,5 @@
{{- if .Values.podDisruptionBudget.enabled }}
{{- if .Capabilities.APIVersions.Has "policy/v1/PodDisruptionBudget" -}}
apiVersion: policy/v1
{{- else }}
apiVersion: policy/v1beta1
{{- end }}
kind: PodDisruptionBudget
metadata:
name: {{ include "loadtester.fullname" . }}