Skip to content

fix: buildx driver opt using k8s driver even if not enabled #6349

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

Merged
merged 2 commits into from
Feb 2, 2025
Merged

fix: buildx driver opt using k8s driver even if not enabled #6349

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
30f76d9
fix: milibyte for memory config in infra configuration
Ash-exp Feb 1, 2025
6c779d8
fix: buildx driver opt using k8s driver even if not enabled
Ash-exp Feb 1, 2025
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
3 changes: 3 additions & 0 deletions pkg/infraConfig/service/infraConfigService.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -730,6 +730,9 @@ func (impl *InfraConfigServiceImpl) sanitizeUpdatableConfigurations(updatableInf
func (impl *InfraConfigServiceImpl) getAppliedInfraConfigForProfile(appliedProfileConfig, defaultProfileConfig *v1.ProfileBeanDto, variableSnapshots map[string]map[string]string, targetPlatformsList []string) (map[string]*v1.InfraConfig, error) {
resp := make(map[string]*v1.InfraConfig)
for _, targetPlatform := range targetPlatformsList {
if !appliedProfileConfig.GetBuildxDriverType().IsPlatformSupported(targetPlatform) {
continue
}
appliedConfiguration := impl.getAppliedConfigurationForTargetPlatform(appliedProfileConfig, defaultProfileConfig, targetPlatform)
infraConfigForTrigger, err := impl.getInfraConfigurationForTrigger(appliedConfiguration)
if err != nil {
Expand Down
2 changes: 2 additions & 0 deletions pkg/infraConfig/units/bean/memory_unit_type.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ const (

func (memoryUnitStr MemoryUnitStr) GetUnitSuffix() UnitType {
switch memoryUnitStr {
case MILLIBYTE:
return MilliByte
case BYTE:
return Byte
case KIBYTE:
Expand Down
Loading