From 7448a667a0c9b49c0f6c9940034e08e830a37ab6 Mon Sep 17 00:00:00 2001 From: Hidde Beydals Date: Tue, 28 Feb 2023 11:07:03 +0100 Subject: [PATCH] receiver: update default ImageRepository version Signed-off-by: Hidde Beydals --- internal/server/receiver_handlers.go | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/internal/server/receiver_handlers.go b/internal/server/receiver_handlers.go index 492bc8e..28ca40d 100644 --- a/internal/server/receiver_handlers.go +++ b/internal/server/receiver_handlers.go @@ -42,6 +42,15 @@ import ( apiv1 "github.com/fluxcd/notification-controller/api/v1beta2" ) +// defaultFluxAPIVersions is a map of Flux API kinds to their API versions. +var defaultFluxAPIVersions = map[string]string{ + "Bucket": "source.toolkit.fluxcd.io/v1beta2", + "HelmRepository": "source.toolkit.fluxcd.io/v1beta2", + "GitRepository": "source.toolkit.fluxcd.io/v1beta2", + "OCIRepository": "source.toolkit.fluxcd.io/v1beta2", + "ImageRepository": "image.toolkit.fluxcd.io/v1beta2", +} + func (s *ReceiverServer) handlePayload() func(w http.ResponseWriter, r *http.Request) { return func(w http.ResponseWriter, r *http.Request) { ctx := context.Background() @@ -348,20 +357,12 @@ func (s *ReceiverServer) annotate(ctx context.Context, resource apiv1.CrossNames Name: resource.Name, } - apiVersionMap := map[string]string{ - "Bucket": "source.toolkit.fluxcd.io/v1beta2", - "HelmRepository": "source.toolkit.fluxcd.io/v1beta2", - "GitRepository": "source.toolkit.fluxcd.io/v1beta2", - "OCIRepository": "source.toolkit.fluxcd.io/v1beta2", - "ImageRepository": "image.toolkit.fluxcd.io/v1beta1", - } - apiVersion := resource.APIVersion if apiVersion == "" { - if apiVersionMap[resource.Kind] == "" { + if defaultFluxAPIVersions[resource.Kind] == "" { return fmt.Errorf("apiVersion must be specified for kind '%s'", resource.Kind) } - apiVersion = apiVersionMap[resource.Kind] + apiVersion = defaultFluxAPIVersions[resource.Kind] } group, version := getGroupVersion(apiVersion)