From 3faa72d4ab6f4afc33573a4ae2eec28b4920f65b Mon Sep 17 00:00:00 2001 From: Yiannis Date: Fri, 30 Jun 2023 09:13:58 +0100 Subject: [PATCH] fix: Add Flux v1 API versions --- pkg/kube/kubehttp.go | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkg/kube/kubehttp.go b/pkg/kube/kubehttp.go index 5f8a1df3a79..b12895a7d71 100644 --- a/pkg/kube/kubehttp.go +++ b/pkg/kube/kubehttp.go @@ -12,9 +12,12 @@ import ( helmv2 "github.com/fluxcd/helm-controller/api/v2beta1" automation1 "github.com/fluxcd/image-automation-controller/api/v1beta1" reflectorv1 "github.com/fluxcd/image-reflector-controller/api/v1beta1" - kustomizev2 "github.com/fluxcd/kustomize-controller/api/v1beta2" - notificationv2 "github.com/fluxcd/notification-controller/api/v1beta1" - sourcev1 "github.com/fluxcd/source-controller/api/v1beta2" + kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1" + kustomizev1beta2 "github.com/fluxcd/kustomize-controller/api/v1beta2" + notificationv1 "github.com/fluxcd/notification-controller/api/v1" + notificationv1beta2 "github.com/fluxcd/notification-controller/api/v1beta2" + sourcev1 "github.com/fluxcd/source-controller/api/v1" + sourcev1beta2 "github.com/fluxcd/source-controller/api/v1beta2" "github.com/pkg/errors" pacv2beta2 "github.com/weaveworks/policy-agent/api/v2beta2" appsv1 "k8s.io/api/apps/v1" @@ -28,15 +31,18 @@ import ( func CreateScheme() (*apiruntime.Scheme, error) { scheme := apiruntime.NewScheme() builder := apiruntime.SchemeBuilder{ + sourcev1beta2.AddToScheme, sourcev1.AddToScheme, - kustomizev2.AddToScheme, + kustomizev1beta2.AddToScheme, + kustomizev1.AddToScheme, helmv2.AddToScheme, corev1.AddToScheme, extensionsv1.AddToScheme, appsv1.AddToScheme, rbacv1.AddToScheme, authv1.AddToScheme, - notificationv2.AddToScheme, + notificationv1beta2.AddToScheme, + notificationv1.AddToScheme, reflectorv1.AddToScheme, automation1.AddToScheme, pacv2beta2.AddToScheme,