Skip to content

Commit 8625c06

Browse files
geoandgeoand
authored
Merge pull request quarkusio#34956 from manusa/deps/kubernetes-client
Bump kubernetes-client-bom from 6.7.2 to 6.8.1
2 parents 49c0333 + cac2df1 commit 8625c06

File tree

7 files changed

+15
-18
lines changed

7 files changed

+15
-18
lines changed

‎bom/application/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@
162162
<kotlin.coroutine.version>1.7.3</kotlin.coroutine.version>
163163
<azure.toolkit-lib.version>0.27.0</azure.toolkit-lib.version>
164164
<kotlin-serialization.version>1.6.0</kotlin-serialization.version>
165-
<dekorate.version>3.7.0</dekorate.version> <!-- Please check with Java Operator SDK team before updating -->
165+
<dekorate.version>4.0.0</dekorate.version> <!-- Please check with Java Operator SDK team before updating -->
166166
<maven-invoker.version>3.2.0</maven-invoker.version>
167167
<awaitility.version>4.2.0</awaitility.version>
168168
<jboss-logmanager.version>3.0.2.Final</jboss-logmanager.version>

‎extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/AddCronJobResourceDecorator.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,16 @@ public AddCronJobResourceDecorator(String name, CronJobConfig config) {
2626
this.config = config;
2727
}
2828

29-
@SuppressWarnings("deprecation")
3029
@Override
3130
public void visit(KubernetesListFluent<?> list) {
32-
CronJobBuilder builder = list.getItems().stream()
31+
CronJobBuilder builder = list.buildItems().stream()
3332
.filter(this::containsCronJobResource)
3433
.map(replaceExistingCronJobResource(list))
3534
.findAny()
3635
.orElseGet(this::createCronJobResource)
3736
.accept(CronJobBuilder.class, this::initCronJobResourceWithDefaults);
3837

39-
if (Strings.isNullOrEmpty(builder.getSpec().getSchedule())) {
38+
if (Strings.isNullOrEmpty(builder.buildSpec().getSchedule())) {
4039
throw new IllegalArgumentException(
4140
"When generating a CronJob resource, you need to specify a schedule CRON expression.");
4241
}
@@ -49,7 +48,7 @@ private boolean containsCronJobResource(HasMetadata metadata) {
4948
}
5049

5150
private void initCronJobResourceWithDefaults(CronJobBuilder builder) {
52-
CronJobFluent.SpecNested<CronJobBuilder> spec = builder.editOrNewSpec();
51+
CronJobFluent<?>.SpecNested<CronJobBuilder> spec = builder.editOrNewSpec();
5352

5453
var jobTemplateSpec = spec
5554
.editOrNewJobTemplate()
@@ -106,7 +105,7 @@ private Function<HasMetadata, CronJobBuilder> replaceExistingCronJobResource(Kub
106105
};
107106
}
108107

109-
private boolean containsContainerWithName(CronJobFluent.SpecNested<CronJobBuilder> spec) {
108+
private boolean containsContainerWithName(CronJobFluent<?>.SpecNested<CronJobBuilder> spec) {
110109
var jobTemplate = spec.buildJobTemplate();
111110
if (jobTemplate == null
112111
|| jobTemplate.getSpec() == null

‎extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/AddJobResourceDecorator.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,9 @@ public AddJobResourceDecorator(String name, JobConfig config) {
2525
this.config = config;
2626
}
2727

28-
@SuppressWarnings("deprecation")
2928
@Override
3029
public void visit(KubernetesListFluent<?> list) {
31-
JobBuilder builder = list.getItems().stream()
30+
JobBuilder builder = list.buildItems().stream()
3231
.filter(this::containsJobResource)
3332
.map(replaceExistingJobResource(list))
3433
.findAny()
@@ -43,7 +42,7 @@ private boolean containsJobResource(HasMetadata metadata) {
4342
}
4443

4544
private void initJobResourceWithDefaults(JobBuilder builder) {
46-
JobFluent.SpecNested<JobBuilder> spec = builder.editOrNewSpec();
45+
JobFluent<?>.SpecNested<JobBuilder> spec = builder.editOrNewSpec();
4746

4847
spec.editOrNewSelector()
4948
.endSelector()
@@ -89,7 +88,7 @@ private Function<HasMetadata, JobBuilder> replaceExistingJobResource(KubernetesL
8988
};
9089
}
9190

92-
private boolean containsContainerWithName(JobFluent.SpecNested<JobBuilder> spec) {
91+
private boolean containsContainerWithName(JobFluent<?>.SpecNested<JobBuilder> spec) {
9392
List<Container> containers = spec.buildTemplate().getSpec().getContainers();
9493
return containers == null || containers.stream().anyMatch(c -> name.equals(c.getName()));
9594
}

‎extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/AddNodePortDecorator.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import io.fabric8.kubernetes.api.model.ServicePortBuilder;
1313
import io.fabric8.kubernetes.api.model.ServiceSpecFluent;
1414

15-
public class AddNodePortDecorator extends NamedResourceDecorator<ServiceSpecFluent> {
15+
public class AddNodePortDecorator extends NamedResourceDecorator<ServiceSpecFluent<?>> {
1616

1717
private static final Logger log = Logger.getLogger(AddNodePortDecorator.class);
1818

@@ -32,7 +32,7 @@ public AddNodePortDecorator(String name, int nodePort, String matchingPortName)
3232
@SuppressWarnings("unchecked")
3333
@Override
3434
public void andThenVisit(ServiceSpecFluent service, ObjectMeta resourceMeta) {
35-
ServiceSpecFluent.PortsNested<?> editPort = service.editMatchingPort(new Predicate<ServicePortBuilder>() {
35+
ServiceSpecFluent<?>.PortsNested<?> editPort = service.editMatchingPort(new Predicate<ServicePortBuilder>() {
3636
@Override
3737
public boolean test(ServicePortBuilder servicePortBuilder) {
3838
return servicePortBuilder.hasName() && servicePortBuilder.getName().equals(matchingPortName);

‎extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/AddStatefulSetResourceDecorator.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,9 @@ public AddStatefulSetResourceDecorator(String name, PlatformConfiguration config
2626
this.config = config;
2727
}
2828

29-
@SuppressWarnings("deprecation")
3029
@Override
3130
public void visit(KubernetesListFluent<?> list) {
32-
StatefulSetBuilder builder = list.getItems().stream()
31+
StatefulSetBuilder builder = list.buildItems().stream()
3332
.filter(this::containsStatefulSetResource)
3433
.map(replaceExistingStatefulSetResource(list))
3534
.findAny()
@@ -44,7 +43,7 @@ private boolean containsStatefulSetResource(HasMetadata metadata) {
4443
}
4544

4645
private void initStatefulSetResourceWithDefaults(StatefulSetBuilder builder) {
47-
StatefulSetFluent.SpecNested<StatefulSetBuilder> spec = builder.editOrNewSpec();
46+
StatefulSetFluent<?>.SpecNested<StatefulSetBuilder> spec = builder.editOrNewSpec();
4847

4948
spec.editOrNewSelector()
5049
.endSelector()
@@ -91,7 +90,7 @@ private Function<HasMetadata, StatefulSetBuilder> replaceExistingStatefulSetReso
9190
};
9291
}
9392

94-
private boolean containsContainerWithName(StatefulSetFluent.SpecNested<StatefulSetBuilder> spec) {
93+
private boolean containsContainerWithName(StatefulSetFluent<?>.SpecNested<StatefulSetBuilder> spec) {
9594
List<Container> containers = spec.buildTemplate().getSpec().getContainers();
9695
return containers == null || containers.stream().anyMatch(c -> name.equals(c.getName()));
9796
}

‎extensions/kubernetes/vanilla/deployment/src/main/java/io/quarkus/kubernetes/deployment/RemoveBuilderImageResourceDecorator.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public RemoveBuilderImageResourceDecorator(String name) {
2020

2121
@Override
2222
public void visit(KubernetesListBuilder builder) {
23-
List<HasMetadata> imageStreams = builder.getItems().stream()
23+
List<HasMetadata> imageStreams = builder.buildItems().stream()
2424
.filter(i -> i instanceof ImageStream)
2525
.map(i -> (HasMetadata) i)
2626
.filter(i -> i.getMetadata().getName().equalsIgnoreCase(name))

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@
6969

7070
<!-- Dependency versions -->
7171
<jacoco.version>0.8.10</jacoco.version>
72-
<kubernetes-client.version>6.7.2</kubernetes-client.version> <!-- Please check with Java Operator SDK team before updating -->
72+
<kubernetes-client.version>6.8.1</kubernetes-client.version> <!-- Please check with Java Operator SDK team before updating -->
7373

7474
<!-- Make sure to check compatibility between these 2 gRPC components before upgrade -->
7575
<grpc.version>1.57.2</grpc.version> <!-- when updating, verify if com.google.auth should not be updated too -->

0 commit comments

Comments
 (0)