Refactor volume mount logic

Makefile

@@ -170,9 +170,19 @@ generate: bootstrap code-gen crds mocks
 verify-generate: bootstrap generate
 	git diff --exit-code
 
+.PHONY: apply-ra
+apply-ra: bootstrap
+	kubectl apply -f ./charts/radix-operator/templates/radixapplication.yaml
+
+.PHONY: apply-rd
+apply-rd: bootstrap
+	kubectl apply -f ./charts/radix-operator/templates/radixdeployment.yaml
+
 HAS_GOLANGCI_LINT := $(shell command -v golangci-lint;)
 HAS_MOCKGEN       := $(shell command -v mockgen;)
 HAS_CONTROLLER_GEN := $(shell command -v controller-gen;)
+HAS_YQ := $(shell command -v yq;)
+HAS_KUBECTL := $(shell command -v kubectl;)
 
 .PHONY: bootstrap
 bootstrap: vendor
@@ -185,3 +195,9 @@ endif
 ifndef HAS_CONTROLLER_GEN
 	go install sigs.k8s.io/controller-tools/cmd/[email protected]
 endif
+ifndef HAS_YQ
+	go install github.com/mikefarah/yq/v4@latest
+endif
+ifndef HAS_KUBECTL
+	go install k8s.io/kubernetes/cmd/kubectl@latest
+endif

charts/radix-operator/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v2
 name: radix-operator
-version: 1.48.4
-appVersion: 1.68.4
+version: 1.49.0
+appVersion: 1.69.0
 kubeVersion: ">=1.24.0"
 description: Radix Operator
 keywords:

go.mod

@@ -7,7 +7,7 @@ toolchain go1.22.5
 require (
 	dario.cat/mergo v1.0.1
 	github.com/cert-manager/cert-manager v1.15.4
-	github.com/equinor/radix-common v1.9.4
+	github.com/equinor/radix-common v1.9.5
 	github.com/golang/mock v1.6.0
 	github.com/google/go-cmp v0.6.0
 	github.com/google/uuid v1.6.0

go.sum

@@ -14,8 +14,8 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1
 github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/emicklei/go-restful/v3 v3.12.1 h1:PJMDIM/ak7btuL8Ex0iYET9hxM3CI2sjZtzpL63nKAU=
 github.com/emicklei/go-restful/v3 v3.12.1/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
-github.com/equinor/radix-common v1.9.4 h1:ErSnB2tqlRwaQuQdaA0qzsReDtHDgubcvqRO098ncEw=
-github.com/equinor/radix-common v1.9.4/go.mod h1:+g0Wj0D40zz29DjNkYKVmCVeYy4OsFWKI7Qi9rA6kpY=
+github.com/equinor/radix-common v1.9.5 h1:p1xldkYUoavwIMguoxxOyVkOXLPA6K8qMsgzeztQtQw=
+github.com/equinor/radix-common v1.9.5/go.mod h1:+g0Wj0D40zz29DjNkYKVmCVeYy4OsFWKI7Qi9rA6kpY=
 github.com/evanphx/json-patch v5.9.0+incompatible h1:fBXyNpNMuTTDdquAq/uisOr2lShz4oaXpDTX2bLe7ls=
 github.com/evanphx/json-patch v5.9.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
 github.com/evanphx/json-patch/v5 v5.9.0 h1:kcBlZQbplgElYIlo/n1hJbls2z/1awpXxpRi0/FOJfg=

pipeline-runner/internal/jobs/build/acr.go

@@ -34,7 +34,7 @@ func NewACR() JobsBuilder {
 
 type acr struct{}
 
-func (c *acr) BuildJobs(useBuildCache bool, pipelineArgs model.PipelineArguments, cloneURL, gitCommitHash, gitTags string, componentImages []pipeline.BuildComponentImage, buildSecrets []string) []batchv1.Job {
+func (c *acr) BuildJobs(_ bool, pipelineArgs model.PipelineArguments, cloneURL, gitCommitHash, gitTags string, componentImages []pipeline.BuildComponentImage, buildSecrets []string) []batchv1.Job {
 	props := &acrKubeJobProps{
 		pipelineArgs:    pipelineArgs,
 		componentImages: componentImages,

pipeline-runner/internal/test/utils.go

@@ -3,12 +3,12 @@ package test
 import (
 	"context"
 
-	"github.com/equinor/radix-operator/pipeline-runner/internal/hash"
 	"github.com/equinor/radix-operator/pipeline-runner/model"
 	pipelineDefaults "github.com/equinor/radix-operator/pipeline-runner/model/defaults"
 	"github.com/equinor/radix-operator/pkg/apis/defaults"
 	radixv1 "github.com/equinor/radix-operator/pkg/apis/radix/v1"
 	"github.com/equinor/radix-operator/pkg/apis/utils"
+	"github.com/equinor/radix-operator/pkg/apis/utils/hash"
 	"gopkg.in/yaml.v3"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"

pipeline-runner/steps/applyconfig/step.go

@@ -21,6 +21,7 @@ import (
 	validate "github.com/equinor/radix-operator/pkg/apis/radixvalidators"
 	operatorutils "github.com/equinor/radix-operator/pkg/apis/utils"
 	"github.com/equinor/radix-operator/pkg/apis/utils/git"
+	"github.com/equinor/radix-operator/pkg/apis/utils/hash"
 	"github.com/rs/zerolog/log"
 	corev1 "k8s.io/api/core/v1"
 	kubeerrors "k8s.io/apimachinery/pkg/api/errors"
@@ -401,7 +402,7 @@ func isRadixConfigNewOrModifiedSinceDeployment(ctx context.Context, rd *radixv1.
 	if len(currentRdConfigHash) == 0 {
 		return true, nil
 	}
-	hashEqual, err := internal.CompareRadixApplicationHash(currentRdConfigHash, ra)
+	hashEqual, err := hash.CompareRadixApplicationHash(currentRdConfigHash, ra)
 	if !hashEqual && err == nil {
 		log.Ctx(ctx).Info().Msgf("RadixApplication updated since last deployment to environment %s", rd.Spec.Environment)
 	}
@@ -416,7 +417,7 @@ func isBuildSecretNewOrModifiedSinceDeployment(ctx context.Context, rd *radixv1.
 	if len(targetHash) == 0 {
 		return true, nil
 	}
-	hashEqual, err := internal.CompareBuildSecretHash(targetHash, buildSecret)
+	hashEqual, err := hash.CompareBuildSecretHash(targetHash, buildSecret)
 	if !hashEqual && err == nil {
 		log.Ctx(ctx).Info().Msgf("Build secrets updated since last deployment to environment %s", rd.Spec.Environment)
 	}

pipeline-runner/steps/deploy/step.go

@@ -9,6 +9,7 @@ import (
 	"github.com/equinor/radix-operator/pipeline-runner/steps/internal"
 	"github.com/equinor/radix-operator/pkg/apis/pipeline"
 	"github.com/equinor/radix-operator/pkg/apis/utils"
+	"github.com/equinor/radix-operator/pkg/apis/utils/hash"
 	"github.com/rs/zerolog/log"
 	k8serrors "k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -76,12 +77,12 @@ func (cli *DeployStepImplementation) deployToEnv(ctx context.Context, appName, e
 		commitID = pipelineInfo.PipelineArguments.CommitID // Commit ID specified by job arguments
 	}
 
-	radixApplicationHash, err := internal.CreateRadixApplicationHash(pipelineInfo.RadixApplication)
+	radixApplicationHash, err := hash.CreateRadixApplicationHash(pipelineInfo.RadixApplication)
 	if err != nil {
 		return err
 	}
 
-	buildSecretHash, err := internal.CreateBuildSecretHash(pipelineInfo.BuildSecret)
+	buildSecretHash, err := hash.CreateBuildSecretHash(pipelineInfo.BuildSecret)
 	if err != nil {
 		return err
 	}

pipeline-runner/steps/deployconfig/step_test.go

@@ -11,10 +11,10 @@ import (
 	"github.com/equinor/radix-operator/pipeline-runner/internal/watcher"
 	"github.com/equinor/radix-operator/pipeline-runner/model"
 	"github.com/equinor/radix-operator/pipeline-runner/steps/deployconfig"
-	"github.com/equinor/radix-operator/pipeline-runner/steps/internal"
 	"github.com/equinor/radix-operator/pkg/apis/kube"
 	radixv1 "github.com/equinor/radix-operator/pkg/apis/radix/v1"
 	"github.com/equinor/radix-operator/pkg/apis/utils"
+	"github.com/equinor/radix-operator/pkg/apis/utils/hash"
 	radixfake "github.com/equinor/radix-operator/pkg/client/clientset/versioned/fake"
 	"github.com/golang/mock/gomock"
 	kedafake "github.com/kedacore/keda/v2/pkg/generated/clientset/versioned/fake"
@@ -683,8 +683,8 @@ func (s *deployConfigTestSuite) createRadixDeployments(deploymentBuildersProps [
 }
 
 func (s *deployConfigTestSuite) buildRadixDeployments(deploymentBuildersProps []radixDeploymentBuildersProps, ra *radixv1.RadixApplication, sourceEnvMap map[string]radixv1.RadixDeployment) []radixv1.RadixDeployment {
-	radixConfigHash, _ := internal.CreateRadixApplicationHash(ra)
-	buildSecretHash, _ := internal.CreateBuildSecretHash(nil)
+	radixConfigHash, _ := hash.CreateRadixApplicationHash(ra)
+	buildSecretHash, _ := hash.CreateBuildSecretHash(nil)
 	var rdList []radixv1.RadixDeployment
 	for _, rdProps := range deploymentBuildersProps {
 		if sourceRd, ok := sourceEnvMap[rdProps.envName]; ok {

pipeline-runner/steps/internal/deployment_test.go

@@ -50,7 +50,7 @@ func TestConstructForTargetEnvironment_PicksTheCorrectEnvironmentConfig(t *testi
 						}).
 						WithVolumeMounts([]radixv1.RadixVolumeMount{
 							{
-								Type:      radixv1.MountTypeBlob,
+								Type:      radixv1.MountTypeBlobFuse2FuseCsiAzure,
 								Container: "some-container",
 								Path:      "some-path",
 							},

pkg/apis/batch/kubejob.go

@@ -15,6 +15,7 @@ import (
 	operatorUtils "github.com/equinor/radix-operator/pkg/apis/utils"
 	"github.com/equinor/radix-operator/pkg/apis/utils/annotations"
 	radixlabels "github.com/equinor/radix-operator/pkg/apis/utils/labels"
+	"github.com/equinor/radix-operator/pkg/apis/volumemount"
 	batchv1 "k8s.io/api/batch/v1"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
@@ -27,7 +28,7 @@ const (
 	jobPayloadVolumeName = "job-payload"
 )
 
-func (s *syncer) reconcileKubeJob(ctx context.Context, batchJob *radixv1.RadixBatchJob, rd *radixv1.RadixDeployment, jobComponent *radixv1.RadixDeployJobComponent, existingJobs []*batchv1.Job) error {
+func (s *syncer) reconcileKubeJob(ctx context.Context, batchJob *radixv1.RadixBatchJob, rd *radixv1.RadixDeployment, jobComponent *radixv1.RadixDeployJobComponent, existingJobs []*batchv1.Job, volumes []corev1.Volume) error {
 	batchJobKubeJobs := slice.FindAll(existingJobs, isKubeJobForBatchJob(batchJob))
 
 	if isBatchJobStopRequested(batchJob) {
@@ -51,7 +52,7 @@ func (s *syncer) reconcileKubeJob(ctx context.Context, batchJob *radixv1.RadixBa
 		return err
 	}
 
-	job, err := s.buildJob(ctx, batchJob, jobComponent, rd)
+	job, err := s.buildJob(ctx, batchJob, jobComponent, rd, volumes)
 	if err != nil {
 		return err
 	}
@@ -92,19 +93,14 @@ func (s *syncer) deleteJobs(ctx context.Context, jobsToDelete []*batchv1.Job) er
 	return nil
 }
 
-func (s *syncer) buildJob(ctx context.Context, batchJob *radixv1.RadixBatchJob, jobComponent *radixv1.RadixDeployJobComponent, rd *radixv1.RadixDeployment) (*batchv1.Job, error) {
+func (s *syncer) buildJob(ctx context.Context, batchJob *radixv1.RadixBatchJob, jobComponent *radixv1.RadixDeployJobComponent, rd *radixv1.RadixDeployment, volumes []corev1.Volume) (*batchv1.Job, error) {
 	jobLabels := s.batchJobIdentifierLabel(batchJob.Name, rd.Spec.AppName)
 	podLabels := radixlabels.Merge(
 		jobLabels,
 		radixlabels.ForPodWithRadixIdentity(jobComponent.Identity),
 	)
 	podAnnotations := annotations.ForClusterAutoscalerSafeToEvict(false)
 
-	volumes, err := s.getVolumes(ctx, rd.GetNamespace(), rd.Spec.Environment, batchJob, jobComponent, rd.Name)
-	if err != nil {
-		return nil, err
-	}
-
 	kubeJobName := getKubeJobName(s.radixBatch.GetName(), batchJob.Name)
 	containers, err := s.getContainers(ctx, rd, jobComponent, batchJob, kubeJobName)
 	if err != nil {
@@ -135,6 +131,7 @@ func (s *syncer) buildJob(ctx context.Context, batchJob *radixv1.RadixBatchJob,
 	}
 
 	serviceAccountSpec := deployment.NewServiceAccountSpec(rd, jobComponent)
+	volumes = s.appendPayloadSecretVolumes(batchJob, jobComponent, volumes)
 
 	job := &batchv1.Job{
 		ObjectMeta: metav1.ObjectMeta{
@@ -167,7 +164,6 @@ func (s *syncer) buildJob(ctx context.Context, batchJob *radixv1.RadixBatchJob,
 			TTLSecondsAfterFinished: pointers.Ptr(int32(86400)), // delete completed job after 24 hours
 		},
 	}
-
 	return job, nil
 }
 
@@ -179,27 +175,21 @@ func (s *syncer) getJobPodImagePullSecrets(rd *radixv1.RadixDeployment) []corev1
 	return imagePullSecrets
 }
 
-func (s *syncer) getVolumes(ctx context.Context, namespace, environment string, batchJob *radixv1.RadixBatchJob, radixJobComponent *radixv1.RadixDeployJobComponent, radixDeploymentName string) ([]corev1.Volume, error) {
-	volumes, err := deployment.GetVolumes(ctx, s.kubeClient, s.kubeUtil, namespace, environment, radixJobComponent, radixDeploymentName)
-	if err != nil {
-		return nil, err
-	}
-
-	if radixJobComponent.Payload != nil && batchJob.PayloadSecretRef != nil {
-		volumes = append(volumes, corev1.Volume{
-			Name: jobPayloadVolumeName,
-			VolumeSource: corev1.VolumeSource{
-				Secret: &corev1.SecretVolumeSource{
-					SecretName: batchJob.PayloadSecretRef.Name,
-					Items: []corev1.KeyToPath{
-						{Key: batchJob.PayloadSecretRef.Key, Path: "payload"},
-					},
+func (s *syncer) appendPayloadSecretVolumes(batchJob *radixv1.RadixBatchJob, radixJobComponent *radixv1.RadixDeployJobComponent, volumes []corev1.Volume) []corev1.Volume {
+	if radixJobComponent.Payload == nil || batchJob.PayloadSecretRef == nil {
+		return volumes
+	}
+	return append(volumes, corev1.Volume{
+		Name: jobPayloadVolumeName,
+		VolumeSource: corev1.VolumeSource{
+			Secret: &corev1.SecretVolumeSource{
+				SecretName: batchJob.PayloadSecretRef.Name,
+				Items: []corev1.KeyToPath{
+					{Key: batchJob.PayloadSecretRef.Key, Path: "payload"},
 				},
 			},
-		})
-	}
-
-	return volumes, nil
+		},
+	})
 }
 
 func (s *syncer) getContainers(ctx context.Context, rd *radixv1.RadixDeployment, jobComponent *radixv1.RadixDeployJobComponent, batchJob *radixv1.RadixBatchJob, kubeJobName string) ([]corev1.Container, error) {
@@ -276,7 +266,7 @@ func getContainerPorts(radixJobComponent *radixv1.RadixDeployJobComponent) []cor
 }
 
 func (s *syncer) getContainerVolumeMounts(batchJob *radixv1.RadixBatchJob, radixJobComponent *radixv1.RadixDeployJobComponent, radixDeploymentName string) ([]corev1.VolumeMount, error) {
-	volumeMounts, err := deployment.GetRadixDeployComponentVolumeMounts(radixJobComponent, radixDeploymentName)
+	volumeMounts, err := volumemount.GetRadixDeployComponentVolumeMounts(radixJobComponent, radixDeploymentName)
 	if err != nil {
 		return nil, err
 	}

pkg/apis/batch/syncer.go

@@ -10,6 +10,7 @@ import (
 	"github.com/equinor/radix-operator/pkg/apis/kube"
 	radixv1 "github.com/equinor/radix-operator/pkg/apis/radix/v1"
 	radixlabels "github.com/equinor/radix-operator/pkg/apis/utils/labels"
+	"github.com/equinor/radix-operator/pkg/apis/volumemount"
 	radixclient "github.com/equinor/radix-operator/pkg/client/clientset/versioned"
 	"github.com/rs/zerolog/log"
 	"k8s.io/apimachinery/pkg/api/errors"
@@ -86,22 +87,35 @@ func (s *syncer) reconcile(ctx context.Context) error {
 		return err
 	}
 
-	existingJobs, err := s.kubeUtil.ListJobsWithSelector(ctx, s.radixBatch.GetNamespace(), s.batchIdentifierLabel().String())
+	namespace := s.radixBatch.GetNamespace()
+	existingJobs, err := s.kubeUtil.ListJobsWithSelector(ctx, namespace, s.batchIdentifierLabel().String())
 	if err != nil {
 		return err
 	}
 
-	existingServices, err := s.kubeUtil.ListServicesWithSelector(ctx, s.radixBatch.GetNamespace(), s.batchIdentifierLabel().String())
+	existingServices, err := s.kubeUtil.ListServicesWithSelector(ctx, namespace, s.batchIdentifierLabel().String())
 	if err != nil {
 		return err
 	}
+	existingVolumes, err := volumemount.GetExistingJobAuxComponentVolumes(ctx, s.kubeUtil, namespace, jobComponent.GetName())
+	if err != nil {
+		return err
+	}
+	desiredVolumes, err := volumemount.GetVolumes(ctx, s.kubeUtil, namespace, jobComponent, rd.Name, existingVolumes)
+	if err != nil {
+		return err
+	}
+	actualVolumes, err := volumemount.CreateOrUpdateCsiAzureVolumeResourcesForDeployComponent(ctx, s.kubeUtil.KubeClient(), rd, namespace, jobComponent, desiredVolumes)
+	if err != nil {
+		return fmt.Errorf("failed to create or update csi azure volume resources: %w", err)
+	}
 
 	for i, batchJob := range s.radixBatch.Spec.Jobs {
 		if err := s.reconcileService(ctx, &batchJob, rd, jobComponent, existingServices); err != nil {
 			return fmt.Errorf("batchjob %s: failed to reconcile service: %w", batchJob.Name, err)
 		}
 
-		if err := s.reconcileKubeJob(ctx, &batchJob, rd, jobComponent, existingJobs); err != nil {
+		if err := s.reconcileKubeJob(ctx, &batchJob, rd, jobComponent, existingJobs, actualVolumes); err != nil {
 			return fmt.Errorf("batchjob %s: failed to reconcile kubejob: %w", batchJob.Name, err)
 		}