Skip to content

Migrate OCIRepository and Bucket from source.toolkit/v1beta2 to v1 #96

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jacisko wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Migrate OCIRepository and Bucket from source.toolkit/v1beta2 to v1 #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
64790c6
Migrate OCIRepository and Bucket from source.toolkit/v1beta2 to v1
jacisko Jun 29, 2026
995250b
regenerate examples/setup.yaml for flux v2.8.8
jacisko Jun 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions api/v1alpha1/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import (

fluxeventv1beta1 "github.com/fluxcd/pkg/apis/event/v1beta1"
fluxsourcev1 "github.com/fluxcd/source-controller/api/v1"
fluxsourcev1beta2 "github.com/fluxcd/source-controller/api/v1beta2"

"github.com/sap/component-operator-runtime/pkg/component"
"github.com/sap/component-operator-runtime/pkg/manifests"
Expand Down Expand Up @@ -154,10 +153,10 @@ func (r *SourceReference) Load(ctx context.Context, clnt client.Client, componen
source = &fluxsourcev1.GitRepository{}
case sourceRef.FluxOciRepository != nil:
sourceName = sourceRef.FluxOciRepository.WithDefaultNamespace(component.Namespace)
source = &fluxsourcev1beta2.OCIRepository{}
source = &fluxsourcev1.OCIRepository{}
case sourceRef.FluxBucket != nil:
sourceName = sourceRef.FluxBucket.WithDefaultNamespace(component.Namespace)
source = &fluxsourcev1beta2.Bucket{}
source = &fluxsourcev1.Bucket{}
case sourceRef.FluxHelmChart != nil:
sourceName = sourceRef.FluxHelmChart.WithDefaultNamespace(component.Namespace)
source = &fluxsourcev1.HelmChart{}
Expand Down
14 changes: 7 additions & 7 deletions examples/sample.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ spec:
# name: podinfo-helm
# path: podinfo
---
apiVersion: source.toolkit.fluxcd.io/v1beta2
apiVersion: source.toolkit.fluxcd.io/v1
kind: GitRepository
metadata:
name: podinfo
Expand All @@ -44,7 +44,7 @@ spec:
tag: 6.6.3
url: https://github.com/stefanprodan/podinfo
# ---
# apiVersion: source.toolkit.fluxcd.io/v1beta2
# apiVersion: source.toolkit.fluxcd.io/v1
# kind: OCIRepository
# metadata:
# name: podinfo-helm
Expand All @@ -54,7 +54,7 @@ spec:
# ref:
# tag: 6.6.3
# ---
# apiVersion: source.toolkit.fluxcd.io/v1beta2
# apiVersion: source.toolkit.fluxcd.io/v1
# kind: HelmRepository
# metadata:
# name: podinfo-oci
Expand All @@ -63,15 +63,15 @@ spec:
# type: oci
# url: oci://ghcr.io/stefanprodan/charts
# ---
# apiVersion: source.toolkit.fluxcd.io/v1beta2
# apiVersion: source.toolkit.fluxcd.io/v1
# kind: HelmRepository
# metadata:
# name: podinfo-helm
# spec:
# interval: 1m0s
# url: https://stefanprodan.github.io/podinfo
# ---
# apiVersion: source.toolkit.fluxcd.io/v1beta2
# apiVersion: source.toolkit.fluxcd.io/v1
# kind: HelmChart
# metadata:
# name: podinfo-git
Expand All @@ -83,7 +83,7 @@ spec:
# kind: GitRepository
# name: podinfo
# ---
# apiVersion: source.toolkit.fluxcd.io/v1beta2
# apiVersion: source.toolkit.fluxcd.io/v1
# kind: HelmChart
# metadata:
# name: podinfo-oci
Expand All @@ -96,7 +96,7 @@ spec:
# name: podinfo-oci
# version: 6.6.3
# ---
# apiVersion: source.toolkit.fluxcd.io/v1beta2
# apiVersion: source.toolkit.fluxcd.io/v1
# kind: HelmChart
# metadata:
# name: podinfo-helm
Expand Down
Loading
Loading