Skip to content

Commit 1b4de83

Browse files
erikgbcasibbald
erikgb
and
casibbald
authored
chore: bump all use of Flux APIs to their latest version (#5241)
Co-authored-by: Charles Sibbald <123247+casibbald@users.noreply.github.com>
1 parent 13e4467 commit 1b4de83

15 files changed

Lines changed: 41 additions & 45 deletions

File tree

‎core/fluxsync/adapters.go‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,11 @@ package fluxsync
22

33
import (
44
helmv2 "github.com/fluxcd/helm-controller/api/v2"
5-
imgautomationv1 "github.com/fluxcd/image-automation-controller/api/v1beta2"
6-
reflectorv1 "github.com/fluxcd/image-reflector-controller/api/v1beta2"
5+
imgautomationv1 "github.com/fluxcd/image-automation-controller/api/v1"
6+
reflectorv1 "github.com/fluxcd/image-reflector-controller/api/v1"
77
kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1"
88
"github.com/fluxcd/pkg/apis/meta"
99
sourcev1 "github.com/fluxcd/source-controller/api/v1"
10-
sourcev1b2 "github.com/fluxcd/source-controller/api/v1beta2"
1110
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
1211
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
1312
"k8s.io/apimachinery/pkg/runtime"
@@ -144,7 +143,7 @@ func (obj HelmRepositoryAdapter) DeepCopyClientObject() client.Object {
144143
}
145144

146145
type OCIRepositoryAdapter struct {
147-
*sourcev1b2.OCIRepository
146+
*sourcev1.OCIRepository
148147
}
149148

150149
func (obj OCIRepositoryAdapter) GetLastHandledReconcileRequest() string {
@@ -156,7 +155,7 @@ func (obj OCIRepositoryAdapter) AsClientObject() client.Object {
156155
}
157156

158157
func (obj OCIRepositoryAdapter) GroupVersionKind() schema.GroupVersionKind {
159-
return sourcev1b2.GroupVersion.WithKind(sourcev1b2.OCIRepositoryKind)
158+
return sourcev1.GroupVersion.WithKind(sourcev1.OCIRepositoryKind)
160159
}
161160

162161
func (obj OCIRepositoryAdapter) SetSuspended(suspend bool) error {
@@ -380,8 +379,8 @@ func ToReconcileable(gvk schema.GroupVersionKind) Reconcilable {
380379
return HelmRepositoryAdapter{HelmRepository: &sourcev1.HelmRepository{}}
381380
case sourcev1.HelmChartKind:
382381
return HelmChartAdapter{HelmChart: &sourcev1.HelmChart{}}
383-
case sourcev1b2.OCIRepositoryKind:
384-
return OCIRepositoryAdapter{OCIRepository: &sourcev1b2.OCIRepository{}}
382+
case sourcev1.OCIRepositoryKind:
383+
return OCIRepositoryAdapter{OCIRepository: &sourcev1.OCIRepository{}}
385384
case reflectorv1.ImageRepositoryKind:
386385
return ImageRepositoryAdapter{ImageRepository: &reflectorv1.ImageRepository{}}
387386
case imgautomationv1.ImageUpdateAutomationKind:

‎core/server/suspend_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import (
44
"testing"
55

66
helmv2 "github.com/fluxcd/helm-controller/api/v2"
7-
imgautomationv1 "github.com/fluxcd/image-automation-controller/api/v1beta2"
8-
reflectorv1 "github.com/fluxcd/image-reflector-controller/api/v1beta2"
7+
imgautomationv1 "github.com/fluxcd/image-automation-controller/api/v1"
8+
reflectorv1 "github.com/fluxcd/image-reflector-controller/api/v1"
99
kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1"
1010
sourcev1 "github.com/fluxcd/source-controller/api/v1"
1111
. "github.com/onsi/gomega"

‎core/server/sync_test.go‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,11 @@ import (
77
"time"
88

99
helmv2 "github.com/fluxcd/helm-controller/api/v2"
10-
imgautomationv1 "github.com/fluxcd/image-automation-controller/api/v1beta2"
11-
reflectorv1 "github.com/fluxcd/image-reflector-controller/api/v1beta2"
10+
imgautomationv1 "github.com/fluxcd/image-automation-controller/api/v1"
11+
reflectorv1 "github.com/fluxcd/image-reflector-controller/api/v1"
1212
kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1"
1313
"github.com/fluxcd/pkg/apis/meta"
1414
sourcev1 "github.com/fluxcd/source-controller/api/v1"
15-
sourcev1b2 "github.com/fluxcd/source-controller/api/v1beta2"
1615
. "github.com/onsi/gomega"
1716
"google.golang.org/grpc/metadata"
1817
corev1 "k8s.io/api/core/v1"
@@ -159,7 +158,7 @@ func TestSync(t *testing.T) {
159158
msg: &pb.SyncFluxObjectRequest{
160159
Objects: []*pb.ObjectRef{{
161160
ClusterName: "Default",
162-
Kind: sourcev1b2.OCIRepositoryKind,
161+
Kind: sourcev1.OCIRepositoryKind,
163162
}},
164163
WithSource: false,
165164
},
@@ -309,7 +308,7 @@ func simulateReconcile(ctx context.Context, k client.Client, name types.Namespac
309308

310309
return k.Status().Update(ctx, obj)
311310

312-
case *sourcev1b2.OCIRepository:
311+
case *sourcev1.OCIRepository:
313312
if err := k.Get(ctx, name, obj); err != nil {
314313
return err
315314
}
@@ -463,16 +462,16 @@ func makeHelmRelease(name string, ns corev1.Namespace, repo *sourcev1.HelmReposi
463462
}
464463
}
465464

466-
func makeOCIRepo(name string, ns corev1.Namespace) *sourcev1b2.OCIRepository {
467-
return &sourcev1b2.OCIRepository{
465+
func makeOCIRepo(name string, ns corev1.Namespace) *sourcev1.OCIRepository {
466+
return &sourcev1.OCIRepository{
468467
ObjectMeta: metav1.ObjectMeta{
469468
Name: name,
470469
Namespace: ns.Name,
471470
},
472-
Spec: sourcev1b2.OCIRepositorySpec{
471+
Spec: sourcev1.OCIRepositorySpec{
473472
URL: "oci://ghcr.io/some/chart",
474473
},
475-
Status: sourcev1b2.OCIRepositoryStatus{
474+
Status: sourcev1.OCIRepositoryStatus{
476475
ReconcileRequestStatus: meta.ReconcileRequestStatus{
477476
LastHandledReconcileAt: time.Now().Format(time.RFC3339Nano),
478477
},

‎pkg/kube/kubehttp.go‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,12 @@ import (
77
"strings"
88

99
helmv2 "github.com/fluxcd/helm-controller/api/v2"
10-
imgautomationv1 "github.com/fluxcd/image-automation-controller/api/v1beta2"
11-
reflectorv1 "github.com/fluxcd/image-reflector-controller/api/v1beta2"
10+
imgautomationv1 "github.com/fluxcd/image-automation-controller/api/v1"
11+
reflectorv1 "github.com/fluxcd/image-reflector-controller/api/v1"
1212
kustomizev1 "github.com/fluxcd/kustomize-controller/api/v1"
1313
notificationv1 "github.com/fluxcd/notification-controller/api/v1"
1414
notificationv1b3 "github.com/fluxcd/notification-controller/api/v1beta3"
1515
sourcev1 "github.com/fluxcd/source-controller/api/v1"
16-
sourcev1b2 "github.com/fluxcd/source-controller/api/v1beta2"
1716
appsv1 "k8s.io/api/apps/v1"
1817
authv1 "k8s.io/api/authentication/v1"
1918
corev1 "k8s.io/api/core/v1"
@@ -33,7 +32,6 @@ func CreateScheme() (*apiruntime.Scheme, error) {
3332
builder := apiruntime.SchemeBuilder{
3433
clientgoscheme.AddToScheme,
3534
sourcev1.AddToScheme,
36-
sourcev1b2.AddToScheme,
3735
kustomizev1.AddToScheme,
3836
helmv2.AddToScheme,
3937
corev1.AddToScheme,

‎tools/dev-resources/image-policy/podinfo-image-policy.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apiVersion: image.toolkit.fluxcd.io/v1beta2
1+
apiVersion: image.toolkit.fluxcd.io/v1
22
kind: ImagePolicy
33
metadata:
44
name: podinfo

‎tools/dev-resources/image-policy/podinfo-image-repository.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apiVersion: image.toolkit.fluxcd.io/v1beta2
1+
apiVersion: image.toolkit.fluxcd.io/v1
22
kind: ImageRepository
33
metadata:
44
name: podinfo

‎tools/dev-resources/image-policy/podinfo-image-update-automation.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apiVersion: image.toolkit.fluxcd.io/v1beta2
1+
apiVersion: image.toolkit.fluxcd.io/v1
22
kind: ImageUpdateAutomation
33
metadata:
44
name: podinfo

‎ui/components/__tests__/ProviderDetail.test.tsx‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ describe("ProviderDetail", () => {
1818

1919
const responseObject = {
2020
payload:
21-
'{"apiVersion":"notification.toolkit.fluxcd.io/v1beta2","kind":"Provider","metadata":{"creationTimestamp":"2025-02-14T16:27:55Z","generation":1,"labels":{"kustomize.toolkit.fluxcd.io/name":"flux-system","kustomize.toolkit.fluxcd.io/namespace":"flux-system"},"managedFields":[{"apiVersion":"notification.toolkit.fluxcd.io/v1beta3","fieldsType":"FieldsV1","fieldsV1":{"f:metadata":{"f:labels":{"f:kustomize.toolkit.fluxcd.io/name":{},"f:kustomize.toolkit.fluxcd.io/namespace":{}}},"f:spec":{"f:secretRef":{"f:name":{}},"f:type":{}}},"manager":"kustomize-controller","operation":"Apply","time":"2025-02-14T17:19:51Z"}],"name":"discord-bot","namespace":"flux-system","resourceVersion":"189450782","uid":"6ef27ec3-4e7c-45b9-906f-4777de2c0c0f"},"spec":{"secretRef":{"name":"discord-webhook"},"type":"discord"}}\n',
21+
'{"apiVersion":"notification.toolkit.fluxcd.io/v1beta3","kind":"Provider","metadata":{"creationTimestamp":"2025-02-14T16:27:55Z","generation":1,"labels":{"kustomize.toolkit.fluxcd.io/name":"flux-system","kustomize.toolkit.fluxcd.io/namespace":"flux-system"},"managedFields":[{"apiVersion":"notification.toolkit.fluxcd.io/v1beta3","fieldsType":"FieldsV1","fieldsV1":{"f:metadata":{"f:labels":{"f:kustomize.toolkit.fluxcd.io/name":{},"f:kustomize.toolkit.fluxcd.io/namespace":{}}},"f:spec":{"f:secretRef":{"f:name":{}},"f:type":{}}},"manager":"kustomize-controller","operation":"Apply","time":"2025-02-14T17:19:51Z"}],"name":"discord-bot","namespace":"flux-system","resourceVersion":"189450782","uid":"6ef27ec3-4e7c-45b9-906f-4777de2c0c0f"},"spec":{"secretRef":{"name":"discord-webhook"},"type":"discord"}}\n',
2222
clusterName: "Default",
2323
tenant: "",
2424
uid: randomUUID(),
@@ -32,7 +32,7 @@ describe("ProviderDetail", () => {
3232
const objects = [
3333
{
3434
payload:
35-
'{"apiVersion":"notification.toolkit.fluxcd.io/v1beta2","kind":"Alert","metadata":{"creationTimestamp":"2025-02-14T16:27:55Z","generation":1,"labels":{"kustomize.toolkit.fluxcd.io/name":"flux-system","kustomize.toolkit.fluxcd.io/namespace":"flux-system"},"managedFields":[{"apiVersion":"notification.toolkit.fluxcd.io/v1beta3","fieldsType":"FieldsV1","fieldsV1":{"f:metadata":{"f:labels":{"f:kustomize.toolkit.fluxcd.io/name":{},"f:kustomize.toolkit.fluxcd.io/namespace":{}}},"f:spec":{"f:eventMetadata":{"f:cluster":{},"f:env":{},"f:region":{}},"f:eventSeverity":{},"f:eventSources":{},"f:inclusionList":{},"f:providerRef":{"f:name":{}},"f:summary":{}}},"manager":"kustomize-controller","operation":"Apply","time":"2025-02-14T17:19:51Z"}],"name":"discord-error","namespace":"flux-system","resourceVersion":"189450780","uid":"7edf429a-5550-47d4-affc-f512fda2d057"},"spec":{"eventSeverity":"info","eventSources":[{"kind":"GitRepository","name":"*"},{"kind":"Kustomization","name":"*"}],"inclusionList":[".*failed.*"],"providerRef":{"name":"discord-bot"},"summary":"An error occurred during reconciliation"}}\n',
35+
'{"apiVersion":"notification.toolkit.fluxcd.io/v1beta3","kind":"Alert","metadata":{"creationTimestamp":"2025-02-14T16:27:55Z","generation":1,"labels":{"kustomize.toolkit.fluxcd.io/name":"flux-system","kustomize.toolkit.fluxcd.io/namespace":"flux-system"},"managedFields":[{"apiVersion":"notification.toolkit.fluxcd.io/v1beta3","fieldsType":"FieldsV1","fieldsV1":{"f:metadata":{"f:labels":{"f:kustomize.toolkit.fluxcd.io/name":{},"f:kustomize.toolkit.fluxcd.io/namespace":{}}},"f:spec":{"f:eventMetadata":{"f:cluster":{},"f:env":{},"f:region":{}},"f:eventSeverity":{},"f:eventSources":{},"f:inclusionList":{},"f:providerRef":{"f:name":{}},"f:summary":{}}},"manager":"kustomize-controller","operation":"Apply","time":"2025-02-14T17:19:51Z"}],"name":"discord-error","namespace":"flux-system","resourceVersion":"189450780","uid":"7edf429a-5550-47d4-affc-f512fda2d057"},"spec":{"eventSeverity":"info","eventSources":[{"kind":"GitRepository","name":"*"},{"kind":"Kustomization","name":"*"}],"inclusionList":[".*failed.*"],"providerRef":{"name":"discord-bot"},"summary":"An error occurred during reconciliation"}}\n',
3636
clusterName: "Default",
3737
tenant: "",
3838
uid: randomUUID(),
@@ -42,7 +42,7 @@ describe("ProviderDetail", () => {
4242
},
4343
{
4444
payload:
45-
'{"apiVersion":"notification.toolkit.fluxcd.io/v1beta2","kind":"Alert","metadata":{"creationTimestamp":"2025-02-14T16:27:55Z","generation":1,"labels":{"kustomize.toolkit.fluxcd.io/name":"flux-system","kustomize.toolkit.fluxcd.io/namespace":"flux-system"},"managedFields":[{"apiVersion":"notification.toolkit.fluxcd.io/v1beta3","fieldsType":"FieldsV1","fieldsV1":{"f:metadata":{"f:labels":{"f:kustomize.toolkit.fluxcd.io/name":{},"f:kustomize.toolkit.fluxcd.io/namespace":{}}},"f:spec":{"f:eventMetadata":{"f:cluster":{},"f:env":{},"f:region":{}},"f:eventSeverity":{},"f:eventSources":{},"f:inclusionList":{},"f:providerRef":{"f:name":{}},"f:summary":{}}},"manager":"kustomize-controller","operation":"Apply","time":"2025-02-14T17:19:51Z"}],"name":"discord-info","namespace":"flux-system","resourceVersion":"189450781","uid":"c82c6df2-ee90-4258-97f8-bd1a8861478c"},"spec":{"eventSeverity":"info","eventSources":[{"kind":"Kustomization","name":"*"}],"inclusionList":[".*passed.*"],"providerRef":{"name":"discord-bot"},"summary":"A reconciliation has been completed successfully"}}\n',
45+
'{"apiVersion":"notification.toolkit.fluxcd.io/v1beta3","kind":"Alert","metadata":{"creationTimestamp":"2025-02-14T16:27:55Z","generation":1,"labels":{"kustomize.toolkit.fluxcd.io/name":"flux-system","kustomize.toolkit.fluxcd.io/namespace":"flux-system"},"managedFields":[{"apiVersion":"notification.toolkit.fluxcd.io/v1beta3","fieldsType":"FieldsV1","fieldsV1":{"f:metadata":{"f:labels":{"f:kustomize.toolkit.fluxcd.io/name":{},"f:kustomize.toolkit.fluxcd.io/namespace":{}}},"f:spec":{"f:eventMetadata":{"f:cluster":{},"f:env":{},"f:region":{}},"f:eventSeverity":{},"f:eventSources":{},"f:inclusionList":{},"f:providerRef":{"f:name":{}},"f:summary":{}}},"manager":"kustomize-controller","operation":"Apply","time":"2025-02-14T17:19:51Z"}],"name":"discord-info","namespace":"flux-system","resourceVersion":"189450781","uid":"c82c6df2-ee90-4258-97f8-bd1a8861478c"},"spec":{"eventSeverity":"info","eventSources":[{"kind":"Kustomization","name":"*"}],"inclusionList":[".*passed.*"],"providerRef":{"name":"discord-bot"},"summary":"A reconciliation has been completed successfully"}}\n',
4646
clusterName: "Default",
4747
tenant: "",
4848
uid: randomUUID(),

0 commit comments

Comments
 (0)