Skip to content

Commit 8506ed5

Browse files
Merge branch 'master' into COMP-1145-fix-ssrf
2 parents 22352b3 + 448edc1 commit 8506ed5

File tree

15 files changed

+63
-484
lines changed

15 files changed

+63
-484
lines changed

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.32.0
1+
1.32.1

build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ dependencies {
4949
implementation 'io.seqera:jedis-lock:1.0.0'
5050
implementation 'io.seqera:lib-data-queue-redis:1.1.1'
5151
implementation 'io.seqera:lib-data-stream-redis:1.1.2'
52+
implementation 'io.seqera:lib-data-range-redis:1.0.0'
5253
implementation 'io.seqera:lib-jedis-pool:1.0.0'
5354
implementation 'io.micronaut:micronaut-http-client'
5455
implementation 'io.micronaut:micronaut-jackson-databind'

changelog.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
# Wave changelog
2+
1.32.1 - 14 Jan 2026
3+
- Fix noarch node selector validation in K8sServiceImpl (#963) [cd21beec2]
4+
- Add complete tests for CranOpts custom commands (#960) [913f7506d]
5+
26
1.32.0 - 12 Jan 2026
37
- Upgrade to Micronaut 4.10.6 (#951) [6dda24c2b]
48
- Use noarch node selector for mirror and transfer jobs (#953) [54f985174]

src/main/groovy/io/seqera/wave/service/cleanup/CleanupStore.groovy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
package io.seqera.wave.service.cleanup
2020

2121
import groovy.transform.CompileStatic
22-
import io.seqera.wave.store.range.AbstractRangeStore
23-
import io.seqera.wave.store.range.impl.RangeProvider
22+
import io.seqera.data.range.AbstractRangeStore
23+
import io.seqera.data.range.impl.RangeProvider
2424
import jakarta.inject.Singleton
2525
/**
2626
* Implements a timed range to store and retrieve IDs

src/main/groovy/io/seqera/wave/service/k8s/K8sServiceImpl.groovy

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,12 @@ import io.seqera.wave.configuration.BlobCacheConfig
5757
import io.seqera.wave.configuration.BuildConfig
5858
import io.seqera.wave.configuration.MirrorConfig
5959
import io.seqera.wave.configuration.ScanConfig
60-
import io.seqera.wave.core.ContainerPlatform
6160
import io.seqera.wave.service.scan.Trivy
6261
import jakarta.inject.Inject
6362
import jakarta.inject.Singleton
63+
6464
import static io.seqera.wave.service.builder.BuildStrategy.BUILDKIT_ENTRYPOINT
65+
import static io.seqera.wave.util.K8sHelper.validateNodeSelectorPlatforms
6566
/**
6667
* implements the support for Kubernetes cluster
6768
*
@@ -148,11 +149,7 @@ class K8sServiceImpl implements K8sService {
148149
throw new IllegalArgumentException("Build workspace should be a sub-directory of 'wave.build.k8s.storage.mountPath' - offending value: '$buildConfig.buildWorkspace' - expected value: '$storageMountPath'")
149150
}
150151
// validate node selectors
151-
final platforms = nodeSelectorMap ?: Collections.<String,String>emptyMap()
152-
for( Map.Entry<String,String> it : platforms ) {
153-
log.debug "Checking container platform '$it.key'; selector '$it.value'"
154-
ContainerPlatform.of(it.key) // <-- if invalid it will throw an exception
155-
}
152+
validateNodeSelectorPlatforms(nodeSelectorMap)
156153
}
157154

158155
/**

src/main/groovy/io/seqera/wave/store/range/AbstractRangeStore.groovy

Lines changed: 0 additions & 53 deletions
This file was deleted.

src/main/groovy/io/seqera/wave/store/range/RangeStore.groovy

Lines changed: 0 additions & 30 deletions
This file was deleted.

src/main/groovy/io/seqera/wave/store/range/impl/LocalRangeProvider.groovy

Lines changed: 0 additions & 63 deletions
This file was deleted.

src/main/groovy/io/seqera/wave/store/range/impl/RangeProvider.groovy

Lines changed: 0 additions & 31 deletions
This file was deleted.

src/main/groovy/io/seqera/wave/store/range/impl/RedisRangeProvider.groovy

Lines changed: 0 additions & 76 deletions
This file was deleted.

0 commit comments

Comments
 (0)