Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix volume mounts merge #1085

Merged
merged 3 commits into from
Apr 15, 2024
Merged

Fix volume mounts merge #1085

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3a7b984
Fixed merge of volume-mounts and horizontal-scaling
satr Apr 15, 2024
020e191
Added unit-tests
satr Apr 15, 2024
fe2eeb8
Merge branch 'master' into fix-volume-mounts-merge
satr Apr 15, 2024
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
4 changes: 2 additions & 2 deletions charts/radix-operator/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v2
name: radix-operator
version: 1.31.1
appVersion: 1.51.0
version: 1.31.2
appVersion: 1.51.1
kubeVersion: ">=1.24.0"
description: Radix Operator
keywords:
Expand Down
8 changes: 4 additions & 4 deletions pkg/apis/deployment/radixcomponent.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ func getRadixCommonComponentHorizontalScaling(radixComponent radixv1.RadixCommon
if radixComponent.GetHorizontalScaling() == nil {
return environmentHorizontalScaling, nil
}
finalHorizontalScaling := radixComponent.GetHorizontalScaling()
finalHorizontalScaling := radixComponent.GetHorizontalScaling().DeepCopy()
if environmentHorizontalScaling.MinReplicas != nil {
finalHorizontalScaling.MinReplicas = environmentHorizontalScaling.MinReplicas
}
Expand Down Expand Up @@ -138,15 +138,15 @@ func getRadixCommonComponentVolumeMounts(radixComponent radixv1.RadixCommonCompo
var errs []error
var finalVolumeMounts []radixv1.RadixVolumeMount
for _, componentVolumeMount := range componentVolumeMounts {
finalVolumeMount := componentVolumeMount
finalVolumeMount := componentVolumeMount.DeepCopy()
volumeMountName := componentVolumeMount.Name
if envVolumeMount, ok := environmentVolumeMountMap[volumeMountName]; ok {
if err := mergo.Merge(&finalVolumeMount, envVolumeMount, mergo.WithOverride, mergo.WithTransformers(booleanPointerTransformer)); err != nil {
if err := mergo.Merge(finalVolumeMount, envVolumeMount, mergo.WithOverride, mergo.WithTransformers(booleanPointerTransformer)); err != nil {
errs = append(errs, fmt.Errorf("failed to merge component and environment volume-mounts %s: %w", volumeMountName, err))
}
delete(environmentVolumeMountMap, volumeMountName)
}
finalVolumeMounts = append(finalVolumeMounts, finalVolumeMount)
finalVolumeMounts = append(finalVolumeMounts, *finalVolumeMount)
}
for _, environmentVolumeMount := range environmentVolumeMountMap {
volumeMount := environmentVolumeMount
Expand Down
163 changes: 159 additions & 4 deletions pkg/apis/deployment/radixcomponent_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"testing"

"github.com/equinor/radix-common/utils/pointers"
"github.com/equinor/radix-common/utils/slice"
"github.com/equinor/radix-operator/pkg/apis/defaults"
"github.com/equinor/radix-operator/pkg/apis/pipeline"
radixv1 "github.com/equinor/radix-operator/pkg/apis/radix/v1"
Expand Down Expand Up @@ -1101,8 +1102,73 @@ func Test_GetRadixComponents_HorizontalScaling(t *testing.T) {

ra := utils.ARadixApplication().WithComponents(componentBuilder).BuildRA()

deployComponent, _ := GetRadixComponentsForEnv(ra, env, componentImages, envVarsMap, nil)
assert.Equal(t, testCase.expectedHorizontalScaling, deployComponent[0].HorizontalScaling)
deployComponents, _ := GetRadixComponentsForEnv(ra, env, componentImages, envVarsMap, nil)
deployComponent, exists := slice.FindFirst(deployComponents, func(component radixv1.RadixDeployComponent) bool {
return component.Name == componentName
})
require.True(t, exists)
assert.Equal(t, testCase.expectedHorizontalScaling, deployComponent.HorizontalScaling)
})
}
}

func Test_GetRadixComponents_HorizontalScalingMultipleEnvs(t *testing.T) {
componentImages := make(pipeline.DeployComponentImages)
componentImages["app"] = pipeline.DeployComponentImage{ImagePath: anyImagePath}
envVarsMap := make(radixv1.EnvVarsMap)
envVarsMap[defaults.RadixCommitHashEnvironmentVariable] = "anycommit"
envVarsMap[defaults.RadixGitTagsEnvironmentVariable] = "anytag"
const (
env1 = "env1"
env2 = "env2"
)
ptrInt1 := pointers.Ptr[int32](1)
ptrInt2 := pointers.Ptr[int32](2)
ptrInt70 := pointers.Ptr[int32](70)
ptrInt75 := pointers.Ptr[int32](75)
ptrInt80 := pointers.Ptr[int32](80)
ptrInt85 := pointers.Ptr[int32](85)

testCases := []struct {
description string
componentHorizontalScaling *radixv1.RadixHorizontalScaling
environmentHorizontalScaling map[string]*radixv1.RadixHorizontalScaling

expectedHorizontalScaling map[string]*radixv1.RadixHorizontalScaling
}{
{
description: "Component sets HorizontalScaling",
componentHorizontalScaling: getRadixHorizontalScaling(ptrInt2, 10, ptrInt80, ptrInt70),
environmentHorizontalScaling: map[string]*radixv1.RadixHorizontalScaling{
env1: getRadixHorizontalScaling(ptrInt1, 8, ptrInt85, ptrInt75),
},
expectedHorizontalScaling: map[string]*radixv1.RadixHorizontalScaling{
env1: getRadixHorizontalScaling(ptrInt1, 8, ptrInt85, ptrInt75),
env2: getRadixHorizontalScaling(ptrInt2, 10, ptrInt80, ptrInt70),
},
},
}

for _, testCase := range testCases {
t.Run(testCase.description, func(t *testing.T) {
componentBuilder := utils.NewApplicationComponentBuilder().WithName(componentName)
for envName, hs := range testCase.environmentHorizontalScaling {
componentBuilder = componentBuilder.WithEnvironmentConfig(utils.AnEnvironmentConfig().WithEnvironment(envName).WithHorizontalScaling(hs.MinReplicas, hs.MaxReplicas, getHSCPUAverageUtilization(hs.RadixHorizontalScalingResources), getHSMemoryAverageUtilization(hs.RadixHorizontalScalingResources)))
}
if testCase.componentHorizontalScaling != nil {
hs := testCase.componentHorizontalScaling
componentBuilder = componentBuilder.WithHorizontalScaling(hs.MinReplicas, hs.MaxReplicas, getHSCPUAverageUtilization(hs.RadixHorizontalScalingResources), getHSMemoryAverageUtilization(hs.RadixHorizontalScalingResources))
}

ra := utils.ARadixApplication().WithEnvironment(env1, "").WithEnvironment(env2, "").WithComponent(componentBuilder).BuildRA()
for _, envName := range []string{env1, env2} {
deployComponents, _ := GetRadixComponentsForEnv(ra, envName, componentImages, envVarsMap, nil)
deployComponent, exists := slice.FindFirst(deployComponents, func(component radixv1.RadixDeployComponent) bool {
return component.Name == componentName
})
require.True(t, exists)
assert.Equal(t, testCase.expectedHorizontalScaling[envName], deployComponent.HorizontalScaling)
}
})
}
}
Expand Down Expand Up @@ -1251,8 +1317,97 @@ func Test_GetRadixComponents_VolumeMounts(t *testing.T) {

ra := utils.ARadixApplication().WithComponents(componentBuilder).BuildRA()

deployComponent, _ := GetRadixComponentsForEnv(ra, env, componentImages, envVarsMap, nil)
assert.Equal(t, testCase.expectedVolumeMounts, deployComponent[0].VolumeMounts)
deployComponents, _ := GetRadixComponentsForEnv(ra, env, componentImages, envVarsMap, nil)
deployComponent, exists := slice.FindFirst(deployComponents, func(component radixv1.RadixDeployComponent) bool {
return component.Name == componentName
})
require.True(t, exists)
assert.Equal(t, testCase.expectedVolumeMounts, deployComponent.VolumeMounts)
})
}
}

func Test_GetRadixComponents_VolumeMounts_MultipleEnvs(t *testing.T) {
componentImages := make(pipeline.DeployComponentImages)
componentImages["app"] = pipeline.DeployComponentImage{ImagePath: anyImagePath}
envVarsMap := make(radixv1.EnvVarsMap)
envVarsMap[defaults.RadixCommitHashEnvironmentVariable] = "anycommit"
envVarsMap[defaults.RadixGitTagsEnvironmentVariable] = "anytag"

const (
path1 = "/home/path1"
path2 = "/home/path2"
container1 = "container1"
container2 = "container2"
user1000 = "1000"
user2000 = "2000"
group1100 = "1100"
group2200 = "2200"
skuStandardLRS = "Standard_LRS"
skuStandardGRS = "Standard_GRS"
env1 = "env1"
env2 = "env2"
)
var (
accessModeReadWriteMany = strings.ToLower(string(corev1.ReadWriteMany))
accessModeReadOnlyMany = strings.ToLower(string(corev1.ReadOnlyMany))
bindingModeImmediate = strings.ToLower(string(storagev1.VolumeBindingImmediate))
bindingModeWaitForFirstConsumer = strings.ToLower(string(storagev1.VolumeBindingWaitForFirstConsumer))
)
testCases := []struct {
description string
componentVolumeMounts []radixv1.RadixVolumeMount
environmentVolumeMounts map[string][]radixv1.RadixVolumeMount
expectedVolumeMounts map[string][]radixv1.RadixVolumeMount
}{
{
description: "Env overrides component VolumeMounts for blobFuse2",
componentVolumeMounts: []radixv1.RadixVolumeMount{
{Name: "storage1", Path: path1, BlobFuse2: &radixv1.RadixBlobFuse2VolumeMount{
Container: container1, GID: group1100, UID: user1000, SkuName: skuStandardLRS, RequestsStorage: "1M", AccessMode: accessModeReadWriteMany, BindingMode: bindingModeImmediate, UseAdls: pointers.Ptr(true),
Streaming: &radixv1.RadixVolumeMountStreaming{Enabled: pointers.Ptr(true), BlockSize: pointers.Ptr[uint64](1), MaxBuffers: pointers.Ptr[uint64](2), BufferSize: pointers.Ptr[uint64](3), StreamCache: pointers.Ptr[uint64](4), MaxBlocksPerFile: pointers.Ptr[uint64](5)},
}},
},
environmentVolumeMounts: map[string][]radixv1.RadixVolumeMount{
env1: {
{Name: "storage1", Path: path2, BlobFuse2: &radixv1.RadixBlobFuse2VolumeMount{
Container: container2, GID: group2200, UID: user2000, SkuName: skuStandardGRS, RequestsStorage: "2M", AccessMode: accessModeReadOnlyMany, BindingMode: bindingModeWaitForFirstConsumer, UseAdls: pointers.Ptr(false),
Streaming: &radixv1.RadixVolumeMountStreaming{Enabled: pointers.Ptr(false), BlockSize: pointers.Ptr[uint64](11), MaxBuffers: pointers.Ptr[uint64](22), BufferSize: pointers.Ptr[uint64](33), StreamCache: pointers.Ptr[uint64](44), MaxBlocksPerFile: pointers.Ptr[uint64](55)},
}}},
},
expectedVolumeMounts: map[string][]radixv1.RadixVolumeMount{
env1: {
{Name: "storage1", Path: path2, BlobFuse2: &radixv1.RadixBlobFuse2VolumeMount{
Container: container2, GID: group2200, UID: user2000, SkuName: skuStandardGRS, RequestsStorage: "2M", AccessMode: accessModeReadOnlyMany, BindingMode: bindingModeWaitForFirstConsumer, UseAdls: pointers.Ptr(false),
Streaming: &radixv1.RadixVolumeMountStreaming{Enabled: pointers.Ptr(false), BlockSize: pointers.Ptr[uint64](11), MaxBuffers: pointers.Ptr[uint64](22), BufferSize: pointers.Ptr[uint64](33), StreamCache: pointers.Ptr[uint64](44), MaxBlocksPerFile: pointers.Ptr[uint64](55)},
}}},
env2: {
{Name: "storage1", Path: path1, BlobFuse2: &radixv1.RadixBlobFuse2VolumeMount{
Container: container1, GID: group1100, UID: user1000, SkuName: skuStandardLRS, RequestsStorage: "1M", AccessMode: accessModeReadWriteMany, BindingMode: bindingModeImmediate, UseAdls: pointers.Ptr(true),
Streaming: &radixv1.RadixVolumeMountStreaming{Enabled: pointers.Ptr(true), BlockSize: pointers.Ptr[uint64](1), MaxBuffers: pointers.Ptr[uint64](2), BufferSize: pointers.Ptr[uint64](3), StreamCache: pointers.Ptr[uint64](4), MaxBlocksPerFile: pointers.Ptr[uint64](5)},
}}},
},
},
}

for _, testCase := range testCases {
t.Run(testCase.description, func(t *testing.T) {
componentBuilder := utils.NewApplicationComponentBuilder().WithName(componentName).WithVolumeMounts(testCase.componentVolumeMounts)
for envName, volumeMounts := range testCase.environmentVolumeMounts {
componentBuilder = componentBuilder.WithEnvironmentConfig(utils.AnEnvironmentConfig().WithEnvironment(envName).WithVolumeMounts(volumeMounts))
}

ra := utils.ARadixApplication().WithEnvironment(env1, "").WithEnvironment(env2, "").
WithComponents(componentBuilder).BuildRA()

for _, envName := range []string{env1, env2} {
deployComponents, _ := GetRadixComponentsForEnv(ra, envName, componentImages, envVarsMap, nil)
deployComponent, exists := slice.FindFirst(deployComponents, func(component radixv1.RadixDeployComponent) bool {
return component.Name == componentName
})
require.True(t, exists)
assert.Equal(t, testCase.expectedVolumeMounts[envName], deployComponent.VolumeMounts)
}
})
}
}
Expand Down
110 changes: 104 additions & 6 deletions pkg/apis/deployment/radixjobcomponent_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import (
"testing"

"github.com/equinor/radix-common/utils/pointers"
"github.com/equinor/radix-common/utils/slice"
"github.com/equinor/radix-operator/pkg/apis/defaults"
"github.com/equinor/radix-operator/pkg/apis/pipeline"
radixv1 "github.com/equinor/radix-operator/pkg/apis/radix/v1"
Expand Down Expand Up @@ -682,10 +683,14 @@ func TestGetRadixJobComponentsForEnv_ReadOnlyFileSystem(t *testing.T) {

ra := utils.ARadixApplication().WithEnvironment(environment, "master").WithJobComponents(componentBuilders...).BuildRA()

deployJobComponent, err := NewJobComponentsBuilder(ra, environment, componentImages, make(radixv1.EnvVarsMap), nil).JobComponents()
deployComponents, err := NewJobComponentsBuilder(ra, environment, componentImages, make(radixv1.EnvVarsMap), nil).JobComponents()
assert.NoError(t, err)
deployComponent, exists := slice.FindFirst(deployComponents, func(component radixv1.RadixDeployJobComponent) bool {
return component.Name == "jobComponentName"
})
require.True(t, exists)

assert.Equal(t, ts.expectedReadOnlyFile, deployJobComponent[0].ReadOnlyFileSystem)
assert.Equal(t, ts.expectedReadOnlyFile, deployComponent.ReadOnlyFileSystem)

})
}
Expand Down Expand Up @@ -733,8 +738,12 @@ func Test_GetRadixJobComponentAndEnv_Monitoring(t *testing.T) {
WithMonitoring(pointers.Ptr(false)),
)).BuildRA()

deployComponent, _ := NewJobComponentsBuilder(ra, env, componentImages, envVarsMap, nil).JobComponents()
assert.Equal(t, testCase.expectedMonitoring, deployComponent[0].Monitoring)
deployComponents, _ := NewJobComponentsBuilder(ra, env, componentImages, envVarsMap, nil).JobComponents()
deployComponent, exists := slice.FindFirst(deployComponents, func(component radixv1.RadixDeployJobComponent) bool {
return component.Name == componentName
})
require.True(t, exists)
assert.Equal(t, testCase.expectedMonitoring, deployComponent.Monitoring)
})
}
}
Expand Down Expand Up @@ -946,8 +955,97 @@ func Test_GetRadixJobComponents_VolumeMounts(t *testing.T) {
WithVolumeMounts(testCase.environmentVolumeMounts),
)).BuildRA()

deployComponent, _ := NewJobComponentsBuilder(ra, env, componentImages, envVarsMap, nil).JobComponents()
assert.Equal(t, testCase.expectedVolumeMounts, deployComponent[0].VolumeMounts)
deployComponents, _ := NewJobComponentsBuilder(ra, env, componentImages, envVarsMap, nil).JobComponents()
deployComponent, exists := slice.FindFirst(deployComponents, func(component radixv1.RadixDeployJobComponent) bool {
return component.Name == componentName
})
require.True(t, exists)
assert.Equal(t, testCase.expectedVolumeMounts, deployComponent.VolumeMounts)
})
}
}

func Test_GetRadixJobComponents_VolumeMounts_MultipleEnvs(t *testing.T) {
componentImages := make(pipeline.DeployComponentImages)
componentImages["app"] = pipeline.DeployComponentImage{ImagePath: anyImagePath}
envVarsMap := make(radixv1.EnvVarsMap)
envVarsMap[defaults.RadixCommitHashEnvironmentVariable] = "anycommit"
envVarsMap[defaults.RadixGitTagsEnvironmentVariable] = "anytag"

const (
path1 = "/home/path1"
path2 = "/home/path2"
container1 = "container1"
container2 = "container2"
user1000 = "1000"
user2000 = "2000"
group1100 = "1100"
group2200 = "2200"
skuStandardLRS = "Standard_LRS"
skuStandardGRS = "Standard_GRS"
env1 = "env1"
env2 = "env2"
)
var (
accessModeReadWriteMany = strings.ToLower(string(corev1.ReadWriteMany))
accessModeReadOnlyMany = strings.ToLower(string(corev1.ReadOnlyMany))
bindingModeImmediate = strings.ToLower(string(storagev1.VolumeBindingImmediate))
bindingModeWaitForFirstConsumer = strings.ToLower(string(storagev1.VolumeBindingWaitForFirstConsumer))
)
testCases := []struct {
description string
componentVolumeMounts []radixv1.RadixVolumeMount
environmentVolumeMounts map[string][]radixv1.RadixVolumeMount
expectedVolumeMounts map[string][]radixv1.RadixVolumeMount
}{
{
description: "Env overrides component VolumeMounts for blobFuse2",
componentVolumeMounts: []radixv1.RadixVolumeMount{
{Name: "storage1", Path: path1, BlobFuse2: &radixv1.RadixBlobFuse2VolumeMount{
Container: container1, GID: group1100, UID: user1000, SkuName: skuStandardLRS, RequestsStorage: "1M", AccessMode: accessModeReadWriteMany, BindingMode: bindingModeImmediate, UseAdls: pointers.Ptr(true),
Streaming: &radixv1.RadixVolumeMountStreaming{Enabled: pointers.Ptr(true), BlockSize: pointers.Ptr[uint64](1), MaxBuffers: pointers.Ptr[uint64](2), BufferSize: pointers.Ptr[uint64](3), StreamCache: pointers.Ptr[uint64](4), MaxBlocksPerFile: pointers.Ptr[uint64](5)},
}},
},
environmentVolumeMounts: map[string][]radixv1.RadixVolumeMount{
env1: {
{Name: "storage1", Path: path2, BlobFuse2: &radixv1.RadixBlobFuse2VolumeMount{
Container: container2, GID: group2200, UID: user2000, SkuName: skuStandardGRS, RequestsStorage: "2M", AccessMode: accessModeReadOnlyMany, BindingMode: bindingModeWaitForFirstConsumer, UseAdls: pointers.Ptr(false),
Streaming: &radixv1.RadixVolumeMountStreaming{Enabled: pointers.Ptr(false), BlockSize: pointers.Ptr[uint64](11), MaxBuffers: pointers.Ptr[uint64](22), BufferSize: pointers.Ptr[uint64](33), StreamCache: pointers.Ptr[uint64](44), MaxBlocksPerFile: pointers.Ptr[uint64](55)},
}}},
},
expectedVolumeMounts: map[string][]radixv1.RadixVolumeMount{
env1: {
{Name: "storage1", Path: path2, BlobFuse2: &radixv1.RadixBlobFuse2VolumeMount{
Container: container2, GID: group2200, UID: user2000, SkuName: skuStandardGRS, RequestsStorage: "2M", AccessMode: accessModeReadOnlyMany, BindingMode: bindingModeWaitForFirstConsumer, UseAdls: pointers.Ptr(false),
Streaming: &radixv1.RadixVolumeMountStreaming{Enabled: pointers.Ptr(false), BlockSize: pointers.Ptr[uint64](11), MaxBuffers: pointers.Ptr[uint64](22), BufferSize: pointers.Ptr[uint64](33), StreamCache: pointers.Ptr[uint64](44), MaxBlocksPerFile: pointers.Ptr[uint64](55)},
}}},
env2: {
{Name: "storage1", Path: path1, BlobFuse2: &radixv1.RadixBlobFuse2VolumeMount{
Container: container1, GID: group1100, UID: user1000, SkuName: skuStandardLRS, RequestsStorage: "1M", AccessMode: accessModeReadWriteMany, BindingMode: bindingModeImmediate, UseAdls: pointers.Ptr(true),
Streaming: &radixv1.RadixVolumeMountStreaming{Enabled: pointers.Ptr(true), BlockSize: pointers.Ptr[uint64](1), MaxBuffers: pointers.Ptr[uint64](2), BufferSize: pointers.Ptr[uint64](3), StreamCache: pointers.Ptr[uint64](4), MaxBlocksPerFile: pointers.Ptr[uint64](5)},
}}},
},
},
}

for _, testCase := range testCases {
t.Run(testCase.description, func(t *testing.T) {
componentBuilder := utils.NewApplicationJobComponentBuilder().WithName(componentName).WithVolumeMounts(testCase.componentVolumeMounts)
for envName, volumeMounts := range testCase.environmentVolumeMounts {
componentBuilder = componentBuilder.WithEnvironmentConfig(utils.AJobComponentEnvironmentConfig().WithEnvironment(envName).WithVolumeMounts(volumeMounts))
}

ra := utils.ARadixApplication().WithEnvironment(env1, "").WithEnvironment(env2, "").
WithJobComponents(componentBuilder).BuildRA()

for _, envName := range []string{env1, env2} {
deployComponents, _ := NewJobComponentsBuilder(ra, envName, componentImages, envVarsMap, nil).JobComponents()
deployComponent, exists := slice.FindFirst(deployComponents, func(component radixv1.RadixDeployJobComponent) bool {
return component.Name == componentName
})
require.True(t, exists)
assert.Equal(t, testCase.expectedVolumeMounts[envName], deployComponent.VolumeMounts)
}
})
}
}