From 44f5b43a4c38441564817970d73e32180c4f932c Mon Sep 17 00:00:00 2001 From: Soule BA Date: Tue, 7 Jun 2022 15:41:25 +0200 Subject: [PATCH] Update flux types api versions Signed-off-by: Soule BA --- docs/spec/v1beta1/receiver.md | 32 ++++++++++++++-------------- internal/server/receiver_handlers.go | 8 +++---- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/docs/spec/v1beta1/receiver.md b/docs/spec/v1beta1/receiver.md index bf49afe74..d712cc7f6 100644 --- a/docs/spec/v1beta1/receiver.md +++ b/docs/spec/v1beta1/receiver.md @@ -101,19 +101,19 @@ spec: secretRef: name: webhook-token resources: - - apiVersion: source.toolkit.fluxcd.io/v1beta1 + - apiVersion: source.toolkit.fluxcd.io/v1beta2 kind: GitRepository name: webapp namespace: default - - apiVersion: source.toolkit.fluxcd.io/v1beta1 + - apiVersion: source.toolkit.fluxcd.io/v1beta2 kind: HelmRepository name: webapp namespace: default - - apiVersion: source.toolkit.fluxcd.io/v1beta1 + - apiVersion: source.toolkit.fluxcd.io/v1beta2 kind: Bucket name: webapp namespace: default - - apiVersion: image.toolkit.fluxcd.io/v1alpha1 + - apiVersion: image.toolkit.fluxcd.io/v1beta1 kind: ImageRepository name: webapp namespace: default @@ -134,7 +134,7 @@ spec: secretRef: name: webhook-token resources: - - apiVersion: source.toolkit.fluxcd.io/v1beta1 + - apiVersion: source.toolkit.fluxcd.io/v1beta2 kind: GitRepository name: webapp namespace: default @@ -188,10 +188,10 @@ spec: secretRef: name: webhook-token resources: - - apiVersion: source.toolkit.fluxcd.io/v1beta1 + - apiVersion: source.toolkit.fluxcd.io/v1beta2 kind: GitRepository name: webapp - - apiVersion: source.toolkit.fluxcd.io/v1beta1 + - apiVersion: source.toolkit.fluxcd.io/v1beta2 kind: HelmRepository name: webapp ``` @@ -221,10 +221,10 @@ spec: secretRef: name: webhook-token resources: - - apiVersion: source.toolkit.fluxcd.io/v1beta1 + - apiVersion: source.toolkit.fluxcd.io/v1beta2 kind: GitRepository name: webapp-frontend - - apiVersion: source.toolkit.fluxcd.io/v1beta1 + - apiVersion: source.toolkit.fluxcd.io/v1beta2 kind: GitRepository name: webapp-backend ``` @@ -247,7 +247,7 @@ spec: secretRef: name: webhook-token resources: - - apiVersion: source.toolkit.fluxcd.io/v1beta1 + - apiVersion: source.toolkit.fluxcd.io/v1beta2 kind: GitRepository name: webapp ``` @@ -272,10 +272,10 @@ spec: secretRef: name: webhook-token resources: - - apiVersion: source.toolkit.fluxcd.io/v1beta1 + - apiVersion: source.toolkit.fluxcd.io/v1beta2 kind: HelmRepository name: webapp - - apiVersion: image.toolkit.fluxcd.io/v1alpha1 + - apiVersion: image.toolkit.fluxcd.io/v1beta1 kind: ImageRepository name: webapp ``` @@ -296,7 +296,7 @@ spec: secretRef: name: webhook-token resources: - - apiVersion: image.toolkit.fluxcd.io/v1alpha1 + - apiVersion: image.toolkit.fluxcd.io/v1beta1 kind: ImageRepository name: webapp ``` @@ -314,7 +314,7 @@ spec: secretRef: name: webhook-token resources: - - apiVersion: image.toolkit.fluxcd.io/v1alpha1 + - apiVersion: image.toolkit.fluxcd.io/vbeta1 kind: ImageRepository name: webapp ``` @@ -332,7 +332,7 @@ spec: secretRef: name: webhook-token resources: - - apiVersion: image.toolkit.fluxcd.io/v1alpha1 + - apiVersion: image.toolkit.fluxcd.io/v1beta1 kind: ImageRepository name: webapp ``` @@ -354,7 +354,7 @@ spec: secretRef: name: webhook-token resources: - - apiVersion: image.toolkit.fluxcd.io/v1alpha1 + - apiVersion: image.toolkit.fluxcd.io/v1beta1 kind: ImageRepository name: webapp namespace: default diff --git a/internal/server/receiver_handlers.go b/internal/server/receiver_handlers.go index 5037fc708..10e4ed881 100644 --- a/internal/server/receiver_handlers.go +++ b/internal/server/receiver_handlers.go @@ -356,10 +356,10 @@ func (s *ReceiverServer) annotate(ctx context.Context, resource v1beta1.CrossNam } apiVersionMap := map[string]string{ - "Bucket": "source.toolkit.fluxcd.io/v1beta1", - "HelmRepository": "source.toolkit.fluxcd.io/v1beta1", - "GitRepository": "source.toolkit.fluxcd.io/v1beta1", - "ImageRepository": "image.toolkit.fluxcd.io/v1alpha1", + "Bucket": "source.toolkit.fluxcd.io/v1beta2", + "HelmRepository": "source.toolkit.fluxcd.io/v1beta2", + "GitRepository": "source.toolkit.fluxcd.io/v1beta2", + "ImageRepository": "image.toolkit.fluxcd.io/v1beta1", } apiVersion := resource.APIVersion