Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion Taskfile.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ includes:
flatten: true
excludes: []
vars:
NESTED_MODULES: api
API_DIRS: '{{.ROOT_DIR}}/api/v1beta1/...'
MANIFEST_OUT: '{{.ROOT_DIR}}/api/crds/manifests'
CODE_DIRS: '{{.ROOT_DIR}}/... {{.ROOT_DIR}}/cmd/... {{.ROOT_DIR}}/internal/... {{.ROOT_DIR}}/test/... {{.ROOT_DIR}}/api/v1beta1/...'
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v0.1.12-dev
v0.1.13
4 changes: 2 additions & 2 deletions charts/control-plane-operator/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ apiVersion: v2
name: control-plane-operator
description: A Helm chart for the Cloud Orchestration Control Plane Operator
type: application
version: v0.1.12
appVersion: v0.1.12
version: v0.1.13
appVersion: v0.1.13
home: https://github.com/openmcp-project/control-plane-operator
sources:
- https://github.com/openmcp-project/control-plane-operator
2 changes: 1 addition & 1 deletion charts/control-plane-operator/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ image:
repository: ghcr.io/openmcp-project/images/control-plane-operator
pullPolicy: IfNotPresent
# Overrides the image tag whose default is the chart appVersion.
tag: v0.1.12
tag: v0.1.13

imagePullSecrets: []
nameOverride: ""
Expand Down
208 changes: 117 additions & 91 deletions go.mod

Large diffs are not rendered by default.

1,887 changes: 1,652 additions & 235 deletions go.sum

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions internal/controller/controlplane_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@ func (r *ControlPlaneReconciler) newJuggler(ctx context.Context, cp *corev1beta1
}

func (r *ControlPlaneReconciler) registerReconcilers(juggler *juggler.Juggler, logger logr.Logger, remoteClient client.Client) {
fr := fluxcd.NewFluxReconciler(logger, r.Client, remoteClient)
fr := fluxcd.NewFluxReconciler(logger, r.Client, remoteClient, utils.LabelComponentName)
fr.RegisterType(
&components.BTPServiceOperator{},
&components.CertManager{},
Expand All @@ -346,7 +346,7 @@ func (r *ControlPlaneReconciler) registerReconcilers(juggler *juggler.Juggler, l
)
juggler.RegisterReconciler(fr)

or := object.NewReconciler(logger, remoteClient)
or := object.NewReconciler(logger, remoteClient, utils.LabelComponentName)
or.RegisterType(
&components.ClusterRole{},
&components.CrossplaneProvider{},
Expand Down
2 changes: 1 addition & 1 deletion pkg/controlplane/components/clusterrole_component.go
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ func (*ClusterRole) OrphanDetectorContext() object.DetectorContext {
ListType: &rbacv1.ClusterRoleList{},
FilterCriteria: object.FilterCriteria{
utils.IsManaged(),
object.HasComponentLabel(),
utils.HasComponentLabel(),
},
ConvertFunc: func(list client.ObjectList) []juggler.Component {
clusterRoles := []juggler.Component{}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ func (c *CrossplaneDeploymentRuntimeConfig) OrphanDetectorContext() object.Detec
ListType: &crossplanev1beta1.DeploymentRuntimeConfigList{},
FilterCriteria: object.FilterCriteria{
utils.IsManaged(),
object.HasComponentLabel(),
utils.HasComponentLabel(),
},
ConvertFunc: func(list client.ObjectList) []juggler.Component {
cdrcs := []juggler.Component{}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ func (*CrossplaneProvider) OrphanDetectorContext() object.DetectorContext {
ListType: &crossplanev1.ProviderList{},
FilterCriteria: object.FilterCriteria{
utils.IsManaged(),
object.HasComponentLabel(),
utils.HasComponentLabel(),
},
ConvertFunc: func(list client.ObjectList) []juggler.Component {
providers := []juggler.Component{}
Expand Down
2 changes: 1 addition & 1 deletion pkg/controlplane/components/secret_component.go
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ func (*Secret) OrphanDetectorContext() object.DetectorContext {
ListType: &corev1.SecretList{},
FilterCriteria: object.FilterCriteria{
utils.IsManaged(),
object.HasComponentLabel(),
utils.HasComponentLabel(),
},
ConvertFunc: func(list client.ObjectList) []juggler.Component {
secrets := []juggler.Component{}
Expand Down
28 changes: 13 additions & 15 deletions pkg/juggler/fluxcd/flux_reconciler.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,30 +17,28 @@ import (
"github.com/openmcp-project/control-plane-operator/pkg/utils"
)

const (
labelComponentName = "controlplane.core.orchestrate.cloud.sap/component"
)

var (
errNotFluxComponent = errors.New("not a flux component")
)

var _ juggler.ComponentReconciler = &FluxReconciler{}

func NewFluxReconciler(logger logr.Logger, localClient client.Client, remoteClient client.Client) *FluxReconciler {
func NewFluxReconciler(logger logr.Logger, localClient client.Client, remoteClient client.Client, labelComponentName string) *FluxReconciler {
return &FluxReconciler{
logger: logger,
localClient: localClient,
remoteClient: remoteClient,
knownTypes: sets.Set[reflect.Type]{},
logger: logger,
localClient: localClient,
remoteClient: remoteClient,
knownTypes: sets.Set[reflect.Type]{},
labelComponentName: labelComponentName,
}
}

type FluxReconciler struct {
localClient client.Client
remoteClient client.Client
logger logr.Logger
knownTypes sets.Set[reflect.Type]
localClient client.Client
remoteClient client.Client
logger logr.Logger
knownTypes sets.Set[reflect.Type]
labelComponentName string
}

// KnownTypes implements juggler.ComponentReconciler.
Expand Down Expand Up @@ -218,7 +216,7 @@ func (r *FluxReconciler) installOrUpdateManifesto(ctx context.Context, fluxCompo
}

utils.SetManagedBy(obj)
utils.SetLabel(obj, labelComponentName, fluxComponent.GetName())
utils.SetLabel(obj, r.labelComponentName, fluxComponent.GetName())
return nil
})

Expand All @@ -245,7 +243,7 @@ func (r *FluxReconciler) installOrUpdateSource(ctx context.Context, fluxComponen
}

utils.SetManagedBy(obj)
utils.SetLabel(obj, labelComponentName, fluxComponent.GetName())
utils.SetLabel(obj, r.labelComponentName, fluxComponent.GetName())
return nil
})

Expand Down
16 changes: 9 additions & 7 deletions pkg/juggler/fluxcd/flux_reconciler_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ import (

var errBoom = errors.New("boom")

const testLabelComponentName = "flux.juggler.test.io/component"

func TestNewFluxReconciler(t *testing.T) {
tests := []struct {
name string
Expand Down Expand Up @@ -56,7 +58,7 @@ func TestNewFluxReconciler(t *testing.T) {
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
actual := NewFluxReconciler(tt.logger, tt.localClient, tt.remoteClient)
actual := NewFluxReconciler(tt.logger, tt.localClient, tt.remoteClient, "")
if !assert.Equal(t, actual, tt.expected) {
t.Errorf("NewReconciler() = %v, want %v", actual, tt.expected)
}
Expand Down Expand Up @@ -361,7 +363,7 @@ func TestFluxReconciler_Observe(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {

r := NewFluxReconciler(logr.Logger{}, fake.NewClientBuilder().WithScheme(scheme).WithObjects(tt.localObjects...).Build(), nil)
r := NewFluxReconciler(logr.Logger{}, fake.NewClientBuilder().WithScheme(scheme).WithObjects(tt.localObjects...).Build(), nil, testLabelComponentName)
actualObservation, actualError := r.Observe(context.TODO(), tt.obj)
if !assert.Equal(t, tt.expectedObservation, actualObservation) {
t.Errorf("ObjectReconciler.Observe() = %v, want %v", actualObservation, tt.expectedObservation)
Expand Down Expand Up @@ -613,7 +615,7 @@ func TestFluxReconciler_Uninstall(t *testing.T) {
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
r := NewFluxReconciler(logr.Logger{}, fake.NewClientBuilder().WithScheme(scheme).WithObjects(tt.localObjects...).Build(), nil)
r := NewFluxReconciler(logr.Logger{}, fake.NewClientBuilder().WithScheme(scheme).WithObjects(tt.localObjects...).Build(), nil, testLabelComponentName)
actual := r.Uninstall(context.TODO(), tt.obj)
if !errors.Is(actual, tt.expected) {
t.Errorf("ObjectReconciler.Uninstall() = %v, want %v", actual, tt.expected)
Expand Down Expand Up @@ -672,7 +674,7 @@ func TestFluxReconciler_Install(t *testing.T) {
}
if !assert.Equal(t, helmRepo.GetLabels(), map[string]string{
"app.kubernetes.io/managed-by": "control-plane-operator",
labelComponentName: component.GetName(),
testLabelComponentName: component.GetName(),
}) {
return errors.New("labels not equal")
}
Expand Down Expand Up @@ -717,7 +719,7 @@ func TestFluxReconciler_Install(t *testing.T) {
}
if !assert.Equal(t, helmRelease.GetLabels(), map[string]string{
"app.kubernetes.io/managed-by": "control-plane-operator",
labelComponentName: component.GetName(),
testLabelComponentName: component.GetName(),
}) {
return errors.New("labels not equal")
}
Expand All @@ -729,7 +731,7 @@ func TestFluxReconciler_Install(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
fakeLocalClient := fake.NewClientBuilder().WithScheme(scheme).Build()
r := NewFluxReconciler(logr.Logger{}, fakeLocalClient, nil)
r := NewFluxReconciler(logr.Logger{}, fakeLocalClient, nil, testLabelComponentName)
ctx := context.TODO()
actual := r.Install(ctx, tt.obj)

Expand All @@ -747,7 +749,7 @@ func TestFluxReconciler_Install(t *testing.T) {
}

func Test_FluxReconciler_Types(t *testing.T) {
r := NewFluxReconciler(logr.Logger{}, nil, nil)
r := NewFluxReconciler(logr.Logger{}, nil, nil, "")
r.RegisterType(FakeFluxComponent{}, FakeFluxComponent{})
assert.Len(t, r.KnownTypes(), 1)
assert.Equal(t, r.KnownTypes()[0], reflect.TypeOf(FakeFluxComponent{}))
Expand Down
4 changes: 0 additions & 4 deletions pkg/juggler/object/object_component.go
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,3 @@ type DetectorContext struct {
type OrphanedObjectsDetector interface {
OrphanDetectorContext() DetectorContext
}

func HasComponentLabel() client.ListOption {
return client.HasLabels{labelComponentName}
}
22 changes: 10 additions & 12 deletions pkg/juggler/object/object_reconciler.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,29 +15,27 @@ import (
"github.com/openmcp-project/control-plane-operator/pkg/utils"
)

const (
labelComponentName = "controlplane.core.orchestrate.cloud.sap/component"
)

var (
errNotObjectComponent = errors.New("not an object component")
)

var _ juggler.ComponentReconciler = &ObjectReconciler{}
var _ juggler.OrphanedComponentsDetector = &ObjectReconciler{}

func NewReconciler(logger logr.Logger, remoteClient client.Client) *ObjectReconciler {
func NewReconciler(logger logr.Logger, remoteClient client.Client, labelComponentName string) *ObjectReconciler {
return &ObjectReconciler{
logger: logger,
remoteClient: remoteClient,
knownTypes: sets.Set[reflect.Type]{},
logger: logger,
remoteClient: remoteClient,
knownTypes: sets.Set[reflect.Type]{},
labelComponentName: labelComponentName,
}
}

type ObjectReconciler struct {
logger logr.Logger
remoteClient client.Client
knownTypes sets.Set[reflect.Type]
logger logr.Logger
remoteClient client.Client
knownTypes sets.Set[reflect.Type]
labelComponentName string
}

// DetectOrphanedComponents implements juggler.OrphanedComponentsDetector.
Expand Down Expand Up @@ -200,7 +198,7 @@ func (r *ObjectReconciler) applyObject(ctx context.Context, component juggler.Co

_, err = controllerutil.CreateOrUpdate(ctx, r.remoteClient, obj, func() error {
utils.SetManagedBy(obj)
utils.SetLabel(obj, labelComponentName, component.GetName())
utils.SetLabel(obj, r.labelComponentName, component.GetName())
return objectComponent.ReconcileObject(ctx, obj)
})
return err
Expand Down
18 changes: 10 additions & 8 deletions pkg/juggler/object/object_reconciler_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ import (

var errBoom = errors.New("boom")

const testLabelComponentName = "object.juggler.test.io/component"

func TestObjectReconciler_Install(t *testing.T) {
tests := []struct {
name string
Expand Down Expand Up @@ -77,7 +79,7 @@ func TestObjectReconciler_Install(t *testing.T) {
}
if !assert.Equal(t, secret.GetLabels(), map[string]string{
"app.kubernetes.io/managed-by": "control-plane-operator",
labelComponentName: comp.GetName(),
testLabelComponentName: comp.GetName(),
}) {
return errors.New("labels not equal")
}
Expand Down Expand Up @@ -117,7 +119,7 @@ func TestObjectReconciler_Install(t *testing.T) {
}
if !assert.Equal(t, secret.GetLabels(), map[string]string{
"app.kubernetes.io/managed-by": "control-plane-operator",
labelComponentName: comp.GetName(),
testLabelComponentName: comp.GetName(),
}) {
return errors.New("labels not equal")
}
Expand All @@ -131,7 +133,7 @@ func TestObjectReconciler_Install(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
fakeRemoteClient := fake.NewClientBuilder().WithObjects(tt.remoteObjects...).Build()
r := NewReconciler(logr.Logger{}, fakeRemoteClient)
r := NewReconciler(logr.Logger{}, fakeRemoteClient, testLabelComponentName)
ctx := context.TODO()
actual := r.Install(ctx, tt.obj)
if !errors.Is(actual, tt.error) {
Expand Down Expand Up @@ -368,7 +370,7 @@ func TestObjectReconciler_Uninstall(t *testing.T) {
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
fakeClient := fake.NewClientBuilder().WithObjects(tt.remoteObjects...).Build()
r := NewReconciler(logr.Logger{}, fakeClient)
r := NewReconciler(logr.Logger{}, fakeClient, testLabelComponentName)
ctx := context.TODO()
actual := r.Uninstall(ctx, tt.obj)
if !errors.Is(actual, tt.expected) {
Expand Down Expand Up @@ -413,7 +415,7 @@ func TestNewReconciler(t *testing.T) {
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
actual := NewReconciler(tt.logger, tt.remoteClient)
actual := NewReconciler(tt.logger, tt.remoteClient, "")
if !assert.Equal(t, tt.expected, actual) {
t.Errorf("NewReconciler() = %v, want %v", actual, tt.expected)
}
Expand Down Expand Up @@ -528,7 +530,7 @@ func TestObjectReconciler_Observe(t *testing.T) {
}
for _, tt := range tests {
t.Run(tt.name, func(t *testing.T) {
r := NewReconciler(logr.Logger{}, fake.NewClientBuilder().WithObjects(tt.remoteObjects...).Build())
r := NewReconciler(logr.Logger{}, fake.NewClientBuilder().WithObjects(tt.remoteObjects...).Build(), testLabelComponentName)
ctx := context.TODO()
actualObservation, actualError := r.Observe(ctx, tt.obj)
if !assert.Equal(t, tt.expectedObservation, actualObservation) {
Expand All @@ -542,7 +544,7 @@ func TestObjectReconciler_Observe(t *testing.T) {
}

func Test_ObjectReconciler_Types(t *testing.T) {
r := NewReconciler(logr.Logger{}, nil)
r := NewReconciler(logr.Logger{}, nil, "")
r.RegisterType(FakeObjectComponent{}, FakeObjectComponent{})
assert.Len(t, r.KnownTypes(), 1)
assert.Equal(t, r.KnownTypes()[0], reflect.TypeOf(FakeObjectComponent{}))
Expand Down Expand Up @@ -622,7 +624,7 @@ func Test_ObjectReconciler_DetectOrphanedComponents(t *testing.T) {
for _, tC := range testCases {
t.Run(tC.desc, func(t *testing.T) {
fakeClient := fake.NewClientBuilder().WithObjects(tC.initObjs...).WithInterceptorFuncs(tC.interceptorFuncs).Build()
r := NewReconciler(logr.Logger{}, fakeClient)
r := NewReconciler(logr.Logger{}, fakeClient, testLabelComponentName)
for _, cc := range tC.configuredComponents {
r.RegisterType(cc.(ObjectComponent))
}
Expand Down
5 changes: 5 additions & 0 deletions pkg/utils/meta.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
const (
labelManagedBy = "app.kubernetes.io/managed-by"
labelManagedByValue = "control-plane-operator"
LabelComponentName = "controlplane.core.orchestrate.cloud.sap/component"
)

func SetLabel(obj v1.Object, label string, value string) {
Expand All @@ -26,3 +27,7 @@ func SetManagedBy(obj v1.Object) {
func IsManaged() client.MatchingLabels {
return client.MatchingLabels{labelManagedBy: labelManagedByValue}
}

func HasComponentLabel() client.ListOption {
return client.HasLabels{LabelComponentName}
}
5 changes: 5 additions & 0 deletions pkg/utils/meta_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -86,3 +86,8 @@ func TestIsManaged(t *testing.T) {
got := IsManaged()
assert.DeepEqual(t, got, client.MatchingLabels{labelManagedBy: labelManagedByValue})
}

func TestHasComponentLabel(t *testing.T) {
got := HasComponentLabel()
assert.DeepEqual(t, got, client.HasLabels{LabelComponentName})
}