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
16 changes: 16 additions & 0 deletions controllers/rabbitmqcluster_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ type RabbitmqClusterReconciler struct {
PodExecutor PodExecutor
DefaultRabbitmqImage string
DefaultUserUpdaterImage string
DefaultImagePullSecrets string
}

// the rbac rule requires an empty row at the end to render
Expand Down Expand Up @@ -129,6 +130,21 @@ func (r *RabbitmqClusterReconciler) Reconcile(ctx context.Context, req ctrl.Requ
}
}

if rabbitmqCluster.Spec.ImagePullSecrets == nil {
for _, reference := range strings.Split(r.DefaultImagePullSecrets, ",") {
rabbitmqCluster.Spec.ImagePullSecrets = append(rabbitmqCluster.Spec.ImagePullSecrets, corev1.LocalObjectReference{Name: reference})
}
if err = r.Update(ctx, rabbitmqCluster); err != nil {
if k8serrors.IsConflict(err) {
logger.Info("failed to update image pull secrets because of conflict; requeueing...",
"namespace", rabbitmqCluster.Namespace,
"name", rabbitmqCluster.Name)
return ctrl.Result{RequeueAfter: 2 * time.Second}, nil
}
return ctrl.Result{}, err
}
}

if rabbitmqCluster.UsesDefaultUserUpdaterImage() {
rabbitmqCluster.Spec.SecretBackend.Vault.DefaultUserUpdaterImage = &r.DefaultUserUpdaterImage
if err = r.Update(ctx, rabbitmqCluster); err != nil {
Expand Down
20 changes: 18 additions & 2 deletions controllers/rabbitmqcluster_controller_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -74,16 +74,32 @@ var _ = Describe("RabbitmqClusterController", func() {
Expect(fetchedCluster.Spec.Image).To(Equal(defaultRabbitmqImage))
})

var sts *appsv1.StatefulSet
By("creating a statefulset with default configurations", func() {
sts := statefulSet(ctx, cluster)
sts = statefulSet(ctx, cluster)

Expect(sts.Name).To(Equal(cluster.ChildResourceName("server")))
Expect(sts.Spec.Template.Spec.ImagePullSecrets).To(BeEmpty())

Expect(len(sts.Spec.VolumeClaimTemplates)).To(Equal(1))
Expect(sts.Spec.VolumeClaimTemplates[0].Spec.StorageClassName).To(BeNil())
})

By("setting the default imagePullSecrets", func() {
Expect(sts.Spec.Template.Spec.ImagePullSecrets).To(ConsistOf(
[]corev1.LocalObjectReference{
{
Name: "image-secret-1",
},
{
Name: "image-secret-2",
},
{
Name: "image-secret-3",
},
},
))
})

By("creating the server conf configmap", func() {
cfm := configMap(ctx, cluster, "server-conf")
Expect(cfm.Name).To(Equal(cluster.ChildResourceName("server-conf")))
Expand Down
2 changes: 2 additions & 0 deletions controllers/suite_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ const (
controllerName = "rabbitmqcluster-controller"
defaultRabbitmqImage = "default-rabbit-image:stable"
defaultUserUpdaterImage = "default-UU-image:unstable"
defaultImagePullSecrets = "image-secret-1,image-secret-2,image-secret-3"
)

var (
Expand Down Expand Up @@ -94,6 +95,7 @@ var _ = BeforeSuite(func() {
PodExecutor: fakeExecutor,
DefaultRabbitmqImage: defaultRabbitmqImage,
DefaultUserUpdaterImage: defaultUserUpdaterImage,
DefaultImagePullSecrets: defaultImagePullSecrets,
}).SetupWithManager(mgr)
Expect(err).ToNot(HaveOccurred())

Expand Down
6 changes: 6 additions & 0 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ func main() {
metricsAddr string
defaultRabbitmqImage = "rabbitmq:3.8.21-management"
defaultUserUpdaterImage = "rabbitmqoperator/default-user-credential-updater:1.0.0"
defaultImagePullSecrets = ""
)

flag.StringVar(&metricsAddr, "metrics-bind-address", ":9782", "The address the metric endpoint binds to.")
Expand Down Expand Up @@ -75,6 +76,10 @@ func main() {
defaultUserUpdaterImage = configuredDefaultUserUpdaterImage
}

if configuredDefaultImagePullSecrets, ok := os.LookupEnv("DEFAULT_IMAGE_PULL_SECRETS"); ok {
defaultImagePullSecrets = configuredDefaultImagePullSecrets
}

options := ctrl.Options{
Scheme: scheme,
MetricsBindAddress: metricsAddr,
Expand Down Expand Up @@ -127,6 +132,7 @@ func main() {
PodExecutor: controllers.NewPodExecutor(),
DefaultRabbitmqImage: defaultRabbitmqImage,
DefaultUserUpdaterImage: defaultUserUpdaterImage,
DefaultImagePullSecrets: defaultImagePullSecrets,
}).SetupWithManager(mgr)
if err != nil {
log.Error(err, "unable to create controller", controllerName)
Expand Down