Merge pull request #1188 from fluxcd/release-v1.7.2

Release v1.7.2

.github/workflows/release.yaml

@@ -32,7 +32,7 @@ jobs:
     uses: slsa-framework/slsa-github-generator/.github/workflows/generator_generic_slsa3.yml@v2.1.0
     with:
       provenance-name: "provenance.intoto.jsonl"
-      base64-subjects: "${{ needs.release.outputs.hashes }}"
+      base64-subjects: "${{ needs.release.outputs.release-digests }}"
       upload-assets: true
   dockerhub-provenance:
     needs: [release]
@@ -44,9 +44,9 @@ jobs:
     if: startsWith(github.ref, 'refs/tags/v')
     uses: slsa-framework/slsa-github-generator/.github/workflows/generator_container_slsa3.yml@v2.1.0
     with:
-      image: ${{ needs.release.outputs.image_url }}
-      digest: ${{ needs.release.outputs.image_digest }}
-      registry-username: fluxcdbot
+      image: ${{ needs.release.outputs.image-name }}
+      digest: ${{ needs.release.outputs.image-digest }}
+      registry-username: ${{ github.repository_owner == 'fluxcd' && 'fluxcdbot' || github.repository_owner }}
     secrets:
       registry-password: ${{ secrets.DOCKER_FLUXCD_PASSWORD }}
   ghcr-provenance:
@@ -59,8 +59,8 @@ jobs:
     if: startsWith(github.ref, 'refs/tags/v')
     uses: slsa-framework/slsa-github-generator/.github/workflows/generator_container_slsa3.yml@v2.1.0
     with:
-      image: ghcr.io/${{ needs.release.outputs.image_url }}
-      digest: ${{ needs.release.outputs.image_digest }}
-      registry-username: fluxcdbot
+      image: ghcr.io/${{ needs.release.outputs.image-name }}
+      digest: ${{ needs.release.outputs.image-digest }}
+      registry-username: fluxcdbot # not necessary for ghcr.io
     secrets:
-      registry-password: ${{ secrets.GHCR_TOKEN }}
+      registry-password: ${{ secrets.GITHUB_TOKEN }}

CHANGELOG.md

@@ -2,6 +2,26 @@
 
 All notable changes to this project are documented in this file.
 
+## 1.7.2
+
+**Release date:** 2025-10-06
+
+This patch release fixes the default Flux API versions in the Receiver handler.
+
+Fixes:
+- Update default API versions to GA
+  [#1186](https://github.com/fluxcd/notification-controller/pull/1186)
+
+## 1.7.1
+
+**Release date:** 2025-09-24
+
+This patch release fixes the release workflow.
+
+Fixes:
+- Fix release workflow
+  [#1179](https://github.com/fluxcd/notification-controller/pull/1179)
+
 ## 1.7.0
 
 **Release date:** 2025-09-24

config/manager/kustomization.yaml

@@ -6,4 +6,4 @@ resources:
 images:
   - name: fluxcd/notification-controller
     newName: fluxcd/notification-controller
-    newTag: v1.7.0
+    newTag: v1.7.2

docs/spec/v1/receivers.md

@@ -121,7 +121,7 @@ handle the incoming webhook request.
 #### Supported Receiver types
 
 | Receiver                                   | Type           | Supports filtering using [Events](#events) |
-| ------------------------------------------ | -------------- | ------------------------------------------ |
+|--------------------------------------------|----------------|--------------------------------------------|
 | [Generic webhook](#generic)                | `generic`      | ❌                                          |
 | [Generic webhook with HMAC](#generic-hmac) | `generic-hmac` | ❌                                          |
 | [GitHub](#github)                          | `github`       | ✅                                          |
@@ -426,7 +426,7 @@ spec:
   secretRef:
     name: webhook-token
   resources:
-    - apiVersion: image.toolkit.fluxcd.io/v1beta2
+    - apiVersion: image.toolkit.fluxcd.io/v1
       kind: ImageRepository
       name: webapp
 ```
@@ -459,7 +459,7 @@ spec:
   secretRef:
     name: webhook-token
   resources:
-    - apiVersion: image.toolkit.fluxcd.io/v1beta2
+    - apiVersion: image.toolkit.fluxcd.io/v1
       kind: ImageRepository
       name: webapp
 ```
@@ -493,7 +493,7 @@ spec:
   secretRef:
     name: webhook-token
   resources:
-    - apiVersion: image.toolkit.fluxcd.io/v1beta2
+    - apiVersion: image.toolkit.fluxcd.io/v1
       kind: ImageRepository
       name: webapp
 ```
@@ -537,7 +537,7 @@ spec:
   secretRef:
     name: webhook-token
   resources:
-    - apiVersion: image.toolkit.fluxcd.io/v1beta2
+    - apiVersion: image.toolkit.fluxcd.io/v1
       kind: ImageRepository
       name: webapp
 ```
@@ -576,7 +576,7 @@ spec:
   secretRef:
     name: webhook-token
   resources:
-    - apiVersion: image.toolkit.fluxcd.io/v1beta2
+    - apiVersion: image.toolkit.fluxcd.io/v1
       kind: ImageRepository
       name: webapp
       namespace: default
@@ -662,11 +662,9 @@ called.
 A resource entry contains the following fields:
 
 - `apiVersion` (Optional): The Flux Custom Resource API group and version, such as
-  `source.toolkit.fluxcd.io/v1beta2`.
-- `kind`: The Flux Custom Resource kind, supported values are `Bucket`,
-  `GitRepository`, `Kustomization`, `HelmRelease`, `HelmChart`,
-  `HelmRepository`, `ImageRepository`, `ImagePolicy`, `ImageUpdateAutomation`
-  and `OCIRepository`.
+  `source.toolkit.fluxcd.io/v1`.
+- `kind`: The Flux Custom Resource kind, e.g. `Bucket`,
+  `GitRepository`, `OCIRepository` or `ImageRepository`.
 - `name`: The Flux Custom Resource `.metadata.name` or `*` (if `matchLabels` is specified)
 - `namespace` (Optional): The Flux Custom Resource `.metadata.namespace`.
   When not specified, the Receiver's `.metadata.namespace` is used instead.
@@ -679,7 +677,7 @@ To reconcile a single object, set the `kind`, `name` and `namespace`:
 
 ```yaml
 resources:
-  - apiVersion: image.toolkit.fluxcd.io/v1beta2
+  - apiVersion: image.toolkit.fluxcd.io/v1
     kind: ImageRepository
     name: podinfo
 ```
@@ -690,7 +688,7 @@ To reconcile objects of a particular kind with specific labels:
 
 ```yaml
 resources:
-  - apiVersion: image.toolkit.fluxcd.io/v1beta2
+  - apiVersion: image.toolkit.fluxcd.io/v1
     kind: ImageRepository
     name: "*"
     matchLabels:
@@ -717,7 +715,7 @@ spec:
   secretRef:
     name: flux-gar-token
   resources:
-    - apiVersion: image.toolkit.fluxcd.io/v1beta2
+    - apiVersion: image.toolkit.fluxcd.io/v1
       kind: ImageRepository
       name: "*"
       matchLabels:
@@ -739,7 +737,7 @@ spec:
   secretRef:
     name: flux-gar-token
   resources:
-    - apiVersion: image.toolkit.fluxcd.io/v1beta2
+    - apiVersion: image.toolkit.fluxcd.io/v1
       kind: ImageRepository
       name: "*"
       matchLabels:

go.mod

@@ -16,7 +16,7 @@ require (
 	github.com/chainguard-dev/git-urls v1.0.2
 	github.com/elazarl/goproxy v1.7.2
 	github.com/fluxcd/cli-utils v0.36.0-flux.15
-	github.com/fluxcd/notification-controller/api v1.7.0
+	github.com/fluxcd/notification-controller/api v1.7.2
 	github.com/fluxcd/pkg/apis/event v0.19.0
 	github.com/fluxcd/pkg/apis/meta v1.21.0
 	github.com/fluxcd/pkg/auth v0.31.0

internal/server/receiver_handlers.go

@@ -60,8 +60,8 @@ var defaultFluxAPIVersions = map[string]string{
 	"HelmChart":       "source.toolkit.fluxcd.io/v1",
 	"HelmRepository":  "source.toolkit.fluxcd.io/v1",
 	"GitRepository":   "source.toolkit.fluxcd.io/v1",
-	"OCIRepository":   "source.toolkit.fluxcd.io/v1beta2",
-	"ImageRepository": "image.toolkit.fluxcd.io/v1beta2",
+	"OCIRepository":   "source.toolkit.fluxcd.io/v1",
+	"ImageRepository": "image.toolkit.fluxcd.io/v1",
 }
 
 // IndexReceiverWebhookPath is a client.IndexerFunc that returns the Receiver's