From 9577b314d8c20e75c458eb2b199bbe09caee5914 Mon Sep 17 00:00:00 2001 From: Seppel Hardt Date: Mon, 15 Apr 2024 08:19:40 +0200 Subject: [PATCH] Feature/#1240 medusa pull secret ref (#1241) --- CHANGELOG/CHANGELOG-1.14.md | 4 ++- controllers/k8ssandra/medusa_reconciler.go | 2 +- pkg/medusa/reconcile.go | 7 +++-- pkg/medusa/reconcile_test.go | 36 ++++++++++++++++++++++ 4 files changed, 44 insertions(+), 5 deletions(-) diff --git a/CHANGELOG/CHANGELOG-1.14.md b/CHANGELOG/CHANGELOG-1.14.md index fa097a8db..629c50d66 100644 --- a/CHANGELOG/CHANGELOG-1.14.md +++ b/CHANGELOG/CHANGELOG-1.14.md @@ -16,6 +16,8 @@ When cutting a new release, update the `unreleased` heading to the tag being gen ## unreleased * [BUGFIX] [#1253](https://github.com/k8ssandra/k8ssandra-operator/issues/1253) Medusa storage secrets are now labelled with a unique label. * [FEATURE] [#1260](https://github.com/k8ssandra/k8ssandra-operator/issues/1260) Update controller-gen to version 0.14.0. +* [BUGFIX] [#1240](https://github.com/k8ssandra/k8ssandra-operator/issues/1240) The PullSecretRef for medusa is ignored in the standalone deployment of medusa + ## v1.14.0 - 2024-04-02 @@ -27,4 +29,4 @@ When cutting a new release, update the `unreleased` heading to the tag being gen * [BUGFIX] [#1252](https://github.com/k8ssandra/k8ssandra-operator/issues/1252) Sanitize DC name in pods selector * [CHANGE] Update Medusa to v0.20.1 * [BUGFIX] [#1235](https://github.com/k8ssandra/k8ssandra-operator/issues/1235) Prevent operator from modifying the spec when superUserRef is not set. Also, remove the injection to mount secrets to cassandra container. -* [BUGFIX] [#1239](https://github.com/k8ssandra/k8ssandra-operator/issues/1239) Use `concurrent_transfers` setting from MedusaConfiguration object if it is actually set. +* [BUGFIX] [#1239](https://github.com/k8ssandra/k8ssandra-operator/issues/1239) Use `concurrent_transfers` setting from MedusaConfiguration object if it is actually set. \ No newline at end of file diff --git a/controllers/k8ssandra/medusa_reconciler.go b/controllers/k8ssandra/medusa_reconciler.go index 6894a0526..a71629f43 100644 --- a/controllers/k8ssandra/medusa_reconciler.go +++ b/controllers/k8ssandra/medusa_reconciler.go @@ -83,7 +83,7 @@ func (r *K8ssandraClusterReconciler) reconcileMedusa( } // Create the Medusa standalone pod - desiredMedusaStandalone := medusa.StandaloneMedusaDeployment(*medusaContainer, kc.SanitizedName(), dcConfig.SanitizedName(), namespace, logger) + desiredMedusaStandalone := medusa.StandaloneMedusaDeployment(*medusaContainer, kc.SanitizedName(), dcConfig.SanitizedName(), namespace, logger, kc.Spec.Medusa.ContainerImage) // Add the volumes previously computed to the Medusa standalone pod for _, volume := range volumes { diff --git a/pkg/medusa/reconcile.go b/pkg/medusa/reconcile.go index f16a21477..5bcd30ba5 100644 --- a/pkg/medusa/reconcile.go +++ b/pkg/medusa/reconcile.go @@ -505,7 +505,7 @@ func MedusaPurgeCronJobName(clusterName string, dcName string) string { return fmt.Sprintf("%s-%s-medusa-purge", clusterName, dcName) } -func StandaloneMedusaDeployment(medusaContainer corev1.Container, clusterName, dcName, namespace string, logger logr.Logger) *appsv1.Deployment { +func StandaloneMedusaDeployment(medusaContainer corev1.Container, clusterName, dcName, namespace string, logger logr.Logger, medusaImage *images.Image) *appsv1.Deployment { // The standalone medusa pod won't be able to resolve its own IP address using DNS entries medusaContainer.Env = append(medusaContainer.Env, corev1.EnvVar{Name: "MEDUSA_RESOLVE_IP_ADDRESSES", Value: "False"}) medusaDeployment := &appsv1.Deployment{ @@ -530,8 +530,9 @@ func StandaloneMedusaDeployment(medusaContainer corev1.Container, clusterName, d Containers: []corev1.Container{ medusaContainer, }, - Volumes: []corev1.Volume{}, - Hostname: MedusaStandaloneDeploymentName(clusterName, dcName), + ImagePullSecrets: images.CollectPullSecrets(medusaImage.ApplyDefaults(defaultMedusaImage)), + Volumes: []corev1.Volume{}, + Hostname: MedusaStandaloneDeploymentName(clusterName, dcName), }, }, }, diff --git a/pkg/medusa/reconcile_test.go b/pkg/medusa/reconcile_test.go index 9d75d31cd..f9b49bd7a 100644 --- a/pkg/medusa/reconcile_test.go +++ b/pkg/medusa/reconcile_test.go @@ -9,6 +9,7 @@ import ( api "github.com/k8ssandra/k8ssandra-operator/apis/k8ssandra/v1alpha1" medusaapi "github.com/k8ssandra/k8ssandra-operator/apis/medusa/v1alpha1" "github.com/k8ssandra/k8ssandra-operator/pkg/cassandra" + "github.com/k8ssandra/k8ssandra-operator/pkg/images" "github.com/stretchr/testify/assert" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/resource" @@ -595,6 +596,41 @@ func TestInitContainerCustomResources(t *testing.T) { } +func TestStandaloneMedusaDeploymentImageSettings(t *testing.T) { + medusaSpec := &medusaapi.MedusaClusterTemplate{ + StorageProperties: medusaapi.Storage{ + StorageProvider: "s3", + StorageSecretRef: corev1.LocalObjectReference{ + Name: "secret", + }, + BucketName: "bucket", + }, + ContainerImage: &images.Image{ + Registry: "reg1", + Name: "img1", + Repository: "repo1", + Tag: "tag1", + PullPolicy: "Always", + PullSecretRef: &corev1.LocalObjectReference{Name: "main-secret"}, + }, + } + + dcConfig := cassandra.DatacenterConfig{} + + logger := logr.New(logr.Discard().GetSink()) + + medusaContainer, err := CreateMedusaMainContainer(&dcConfig, medusaSpec, false, "test", logger) + assert.NoError(t, err) + UpdateMedusaInitContainer(&dcConfig, medusaSpec, false, "test", logger) + UpdateMedusaMainContainer(&dcConfig, medusaContainer) + + desiredMedusaStandalone := StandaloneMedusaDeployment(*medusaContainer, "dc1", dcConfig.SanitizedName(), "test", logger, medusaSpec.ContainerImage) + + assert.Equal(t, "main-secret", desiredMedusaStandalone.Spec.Template.Spec.ImagePullSecrets[0].Name, "expected standalone container image pull secret to be set") + assert.Equal(t, "reg1/repo1/img1:tag1", desiredMedusaStandalone.Spec.Template.Spec.Containers[0].Image, "expected standalone container image to be set to reg1/repo1/img1:tag1") + assert.Equal(t, corev1.PullAlways, desiredMedusaStandalone.Spec.Template.Spec.Containers[0].ImagePullPolicy, "expected standalone pull policy to be set to Always") +} + func TestExternalSecretsFlag(t *testing.T) { medusaSpec := &medusaapi.MedusaClusterTemplate{ StorageProperties: medusaapi.Storage{