fluxcd
/
helm-controller
mirror of https://github.com/fluxcd/helm-controller.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Allow cross-shard dependency check 

Signed-off-by: Stefan Prodan <stefan.prodan@gmail.com>
This commit is contained in:
Stefan Prodan 2024-09-25 12:07:00 +03:00
parent c71258e597
commit 72ec296d18
No known key found for this signature in database
GPG Key ID: 3299AEB0E4085BAF
3 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
internal/controller/helmrelease_controller.go
View File

@ -91,6 +91,7 @@ type HelmReleaseReconciler struct {
GetClusterConfig func() (*rest.Config, error)
ClientOpts runtimeClient.Options
KubeConfigOpts runtimeClient.KubeConfigOptions
APIReader client.Reader
FieldManager string
DefaultServiceAccount string
@ -585,7 +586,7 @@ func (r *HelmReleaseReconciler) checkDependencies(ctx context.Context, obj *v2.H
}
dHr := &v2.HelmRelease{}
if err := r.Get(ctx, ref, dHr); err != nil {
if err := r.APIReader.Get(ctx, ref, dHr); err != nil {
return fmt.Errorf("unable to get '%s' dependency: %w", ref, err)
}

21
internal/controller/helmrelease_controller_test.go
View File

@ -111,6 +111,7 @@ func TestHelmReleaseReconciler_reconcileRelease(t *testing.T) {
EventRecorder: record.NewFakeRecorder(32),
requeueDependency: 5 * time.Second,
}
r.APIReader = r.Client
res, err := r.reconcileRelease(context.TODO(), patch.NewSerialPatcher(obj, r.Client), obj)
g.Expect(err).To(Equal(errWaitForDependency))
@ -142,6 +143,7 @@ func TestHelmReleaseReconciler_reconcileRelease(t *testing.T) {
WithObjects(obj).
Build(),
}
r.APIReader = r.Client
_, err := r.reconcileRelease(context.TODO(), patch.NewSerialPatcher(obj, r.Client), obj)
g.Expect(err).To(HaveOccurred())
@ -173,6 +175,7 @@ func TestHelmReleaseReconciler_reconcileRelease(t *testing.T) {
Build(),
EventRecorder: record.NewFakeRecorder(32),
}
r.APIReader = r.Client
res, err := r.reconcileRelease(context.TODO(), patch.NewSerialPatcher(obj, r.Client), obj)
g.Expect(err).To(HaveOccurred())
@ -286,6 +289,7 @@ func TestHelmReleaseReconciler_reconcileRelease(t *testing.T) {
WithObjects(chart, obj).
Build(),
}
r.APIReader = r.Client
res, err := r.reconcileRelease(context.TODO(), patch.NewSerialPatcher(obj, r.Client), obj)
g.Expect(err).To(Equal(errWaitForChart))
@ -347,6 +351,7 @@ func TestHelmReleaseReconciler_reconcileRelease(t *testing.T) {
Build(),
EventRecorder: record.NewFakeRecorder(32),
}
r.APIReader = r.Client
_, err := r.reconcileRelease(context.TODO(), patch.NewSerialPatcher(obj, r.Client), obj)
g.Expect(err).To(HaveOccurred())
@ -398,6 +403,7 @@ func TestHelmReleaseReconciler_reconcileRelease(t *testing.T) {
Build(),
requeueDependency: 10 * time.Second,
}
r.APIReader = r.Client
res, err := r.reconcileRelease(context.TODO(), patch.NewSerialPatcher(obj, r.Client), obj)
g.Expect(err).To(Equal(errWaitForDependency))
@ -486,6 +492,7 @@ func TestHelmReleaseReconciler_reconcileRelease(t *testing.T) {
r := &HelmReleaseReconciler{
Client: c,
APIReader: c,
GetClusterConfig: GetTestClusterConfig,
EventRecorder: record.NewFakeRecorder(32),
}
@ -566,6 +573,7 @@ func TestHelmReleaseReconciler_reconcileRelease(t *testing.T) {
r := &HelmReleaseReconciler{
Client: c,
APIReader: c,
GetClusterConfig: GetTestClusterConfig,
EventRecorder: record.NewFakeRecorder(32),
}
@ -641,6 +649,7 @@ func TestHelmReleaseReconciler_reconcileRelease(t *testing.T) {
r := &HelmReleaseReconciler{
Client: c,
APIReader: c,
GetClusterConfig: GetTestClusterConfig,
EventRecorder: record.NewFakeRecorder(32),
}
@ -712,6 +721,7 @@ func TestHelmReleaseReconciler_reconcileRelease(t *testing.T) {
r := &HelmReleaseReconciler{
Client: c,
APIReader: c,
GetClusterConfig: GetTestClusterConfig,
EventRecorder: record.NewFakeRecorder(32),
}
@ -801,6 +811,7 @@ func TestHelmReleaseReconciler_reconcileRelease(t *testing.T) {
r := &HelmReleaseReconciler{
Client: c,
APIReader: c,
GetClusterConfig: GetTestClusterConfig,
EventRecorder: record.NewFakeRecorder(32),
FieldManager: "test",
@ -2127,6 +2138,7 @@ func TestHelmReleaseReconciler_reconcileDelete(t *testing.T) {
r := &HelmReleaseReconciler{
Client: testEnv.Client,
APIReader: testEnv.Client,
GetClusterConfig: GetTestClusterConfig,
EventRecorder: record.NewFakeRecorder(32),
}
@ -2237,6 +2249,7 @@ func TestHelmReleaseReconciler_reconcileReleaseDeletion(t *testing.T) {
r := &HelmReleaseReconciler{
Client: testEnv.Client,
APIReader: testEnv.Client,
GetClusterConfig: GetTestClusterConfig,
EventRecorder: record.NewFakeRecorder(32),
}
@ -2299,6 +2312,7 @@ func TestHelmReleaseReconciler_reconcileReleaseDeletion(t *testing.T) {
r := &HelmReleaseReconciler{
Client: testEnv.Client,
APIReader: testEnv.Client,
GetClusterConfig: GetTestClusterConfig,
}
@ -2399,6 +2413,7 @@ func TestHelmReleaseReconciler_reconcileReleaseDeletion(t *testing.T) {
r := &HelmReleaseReconciler{
Client: testEnv.Client,
APIReader: testEnv.Client,
GetClusterConfig: GetTestClusterConfig,
}
@ -2526,6 +2541,7 @@ func TestHelmReleaseReconciler_reconcileReleaseDeletion(t *testing.T) {
r := &HelmReleaseReconciler{
Client: testEnv.Client,
APIReader: testEnv.Client,
GetClusterConfig: GetTestClusterConfig,
}
@ -2668,6 +2684,7 @@ func TestHelmReleaseReconciler_reconcileUninstall(t *testing.T) {
r := &HelmReleaseReconciler{
Client: testEnv.Client,
APIReader: testEnv.Client,
GetClusterConfig: GetTestClusterConfig,
EventRecorder: record.NewFakeRecorder(32),
}
@ -2886,7 +2903,8 @@ func TestHelmReleaseReconciler_checkDependencies(t *testing.T) {
}
r := &HelmReleaseReconciler{
Client: c.Build(),
Client: c.Build(),
APIReader: c.Build(),
}
err := r.checkDependencies(context.TODO(), tt.obj)
@ -3029,6 +3047,7 @@ func TestHelmReleaseReconciler_adoptLegacyRelease(t *testing.T) {
r := &HelmReleaseReconciler{
Client: testEnv.Client,
APIReader: testEnv.Client,
GetClusterConfig: GetTestClusterConfig,
}

1
main.go
View File

@ -270,6 +270,7 @@ func main() {
if err = (&controller.HelmReleaseReconciler{
Client: mgr.GetClient(),
APIReader: mgr.GetAPIReader(),
EventRecorder: eventRecorder,
Metrics: metricsH,
GetClusterConfig: ctrl.GetConfig,