Skip to content

Commit 9b781ca

Browse files
committed
fix cannot save k8s latest version kubeconfig file
1 parent fdcc7ab commit 9b781ca

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

docker/src/main/java/com/flowci/docker/K8sManager.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public boolean hasNamespace() {
6464
}
6565

6666
public void createNamespace() {
67-
Resource<Namespace, DoneableNamespace> resource = client.namespaces().withName(option.getNamespace());
67+
Resource<Namespace> resource = client.namespaces().withName(option.getNamespace());
6868
Namespace namespace = resource.get();
6969
if (Objects.isNull(namespace)) {
7070
Namespace built = new NamespaceBuilder()
@@ -264,8 +264,7 @@ public void pull(String image, int timeoutInSeconds, Consumer<String> progress)
264264
}
265265

266266
private List<Pod> listPods(String name, String status) {
267-
NonNamespaceOperation<Pod, PodList, DoneablePod, PodResource<Pod, DoneablePod>> operation = client.pods()
268-
.inNamespace(option.getNamespace());
267+
NonNamespaceOperation<Pod, PodList, PodResource<Pod>> operation = client.pods().inNamespace(option.getNamespace());
269268

270269
if (StringHelper.hasValue(name)) {
271270
if (name.endsWith("*")) {
@@ -282,7 +281,7 @@ private List<Pod> listPods(String name, String status) {
282281
return operation.list().getItems();
283282
}
284283

285-
private PodResource<Pod, DoneablePod> podResource(String name) {
284+
private PodResource<Pod> podResource(String name) {
286285
return client.pods()
287286
.inNamespace(option.getNamespace())
288287
.withName(name);

pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<junit.version>4.13.1</junit.version>
2929
<spring.version>2.6.0</spring.version>
3030
<snakeyaml.version>1.26</snakeyaml.version>
31-
<jackson.version>2.12.1</jackson.version>
31+
<jackson.version>2.13.1</jackson.version>
3232
<curator.version>4.3.0</curator.version>
3333
<caffeine.version>2.6.2</caffeine.version>
3434
<h2.version>1.4.197</h2.version>
@@ -41,7 +41,7 @@
4141
<java-jwt.version>3.8.1</java-jwt.version>
4242
<minio.version>6.0.11</minio.version>
4343
<log4j.version>2.17.0</log4j.version>
44-
<kubernetes-client.version>4.10.3</kubernetes-client.version>
44+
<kubernetes-client.version>5.11.1</kubernetes-client.version>
4545
</properties>
4646

4747
<build>

0 commit comments

Comments
 (0)