Skip to content

Commit

Permalink
Starting upgrade. However, version 20 is too buggy to be used.
Browse files Browse the repository at this point in the history 
See for example kubernetes-client/java#3106
  • Loading branch information
@mnlipp
mnlipp committed Mar 7, 2024
1 parent 19f463a commit f409032
Show file tree
Hide file tree
Showing 4 changed files with 189 additions and 103 deletions.
2 changes: 1 addition & 1 deletion org.jdrupes.vmoperator.common/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ plugins {

dependencies {
api project(':org.jdrupes.vmoperator.util')
api 'io.kubernetes:client-java:[18.0.0,19)'
api 'io.kubernetes:client-java:[20.0.0,21)'
}
126 changes: 124 additions & 2 deletions org.jdrupes.vmoperator.common/src/org/jdrupes/vmoperator/common/K8s.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

package org.jdrupes.vmoperator.common;

import com.google.gson.JsonObject;
import io.kubernetes.client.common.KubernetesListObject;
import io.kubernetes.client.common.KubernetesObject;
import io.kubernetes.client.custom.V1Patch;
Expand All @@ -35,12 +36,18 @@
import io.kubernetes.client.openapi.models.V1PersistentVolumeClaimList;
import io.kubernetes.client.openapi.models.V1Pod;
import io.kubernetes.client.openapi.models.V1PodList;
import io.kubernetes.client.util.PatchUtils;
import io.kubernetes.client.util.generic.GenericKubernetesApi;
import io.kubernetes.client.util.generic.KubernetesApiResponse;
import io.kubernetes.client.util.generic.dynamic.DynamicKubernetesApi;
import io.kubernetes.client.util.generic.dynamic.DynamicKubernetesListObject;
import io.kubernetes.client.util.generic.dynamic.DynamicKubernetesObject;
import io.kubernetes.client.util.generic.options.DeleteOptions;
import io.kubernetes.client.util.generic.options.PatchOptions;
import io.kubernetes.client.util.generic.options.UpdateOptions;

import java.util.Optional;
import java.util.function.Function;

/**
* Helpers for K8s API.
Expand Down Expand Up @@ -107,18 +114,19 @@ V1ConfigMapList> cmApi(ApiClient client) {
* @return the dynamic kubernetes api
* @throws ApiException the api exception
*/
@Deprecated
@SuppressWarnings("PMD.UseObjectForClearerAPI")
public static Optional<DynamicKubernetesApi> crApi(ApiClient client,
String group, String kind, String namespace, String name)
throws ApiException {
var apis = new ApisApi(client).getAPIVersions();
var apis = new ApisApi(client).getAPIVersions().execute();
var crdVersions = apis.getGroups().stream()
.filter(g -> g.getName().equals(group)).findFirst()
.map(V1APIGroup::getVersions).stream().flatMap(l -> l.stream())
.map(V1GroupVersionForDiscovery::getVersion).toList();
var coa = new CustomObjectsApi(client);
for (var crdVersion : crdVersions) {
var crdApiRes = coa.getAPIResources(group, crdVersion)
var crdApiRes = coa.getAPIResources(group, crdVersion).execute()
.getResources().stream().filter(r -> kind.equals(r.getKind()))
.findFirst();
if (crdApiRes.isEmpty()) {
Expand All @@ -135,6 +143,120 @@ public static Optional<DynamicKubernetesApi> crApi(ApiClient client,
return Optional.empty();
}

public static JsonObject status(DynamicKubernetesObject object) {
return object.getRaw().getAsJsonObject("status");
}

/**
* Describes a namespaced custom object. This class combines
* all information required to invoke one of the
* {@link CustomObjectsApi}'s methods for namespaced custom objects.
*/
public static class NamespacedCustomObject {
private final CustomObjectsApi api;
private final String group;
private final String version;
private final String namespace;
private final String plural;
private final String name;
private final GenericKubernetesApi<DynamicKubernetesObject,
DynamicKubernetesListObject> gkApi;

public NamespacedCustomObject(CustomObjectsApi api,
String group, String version, String namespace, String plural,
String name) {
this.api = api;
this.group = group;
this.version = version;
this.namespace = namespace;
this.plural = plural;
this.name = name;
gkApi = new GenericKubernetesApi<>(DynamicKubernetesObject.class,
DynamicKubernetesListObject.class, group, version, plural, api);
}

public DynamicKubernetesObject get() throws ApiException {
var call = api.getNamespacedCustomObject(group, version, namespace,
plural, name).buildCall(null);
var data = api.getApiClient().<JsonObject> execute(call,
JsonObject.class).getData();
return new DynamicKubernetesObject(data);
}

public KubernetesApiResponse<DynamicKubernetesObject>
updateStatus(DynamicKubernetesObject object,
Function<DynamicKubernetesObject, Object> status)
throws ApiException {
return null; // gkApi.updateStatus(object,
// status).throwsApiException();
}

public KubernetesApiResponse<DynamicKubernetesObject>
updateStatus(Function<DynamicKubernetesObject, Object> status)
throws ApiException {
var object = get();
return updateStatus(object, status);
}

public KubernetesApiResponse<DynamicKubernetesObject> patch(
String patchType, V1Patch patch,
PatchOptions options) throws ApiException {
Object res = PatchUtils.patch(CustomObjectsApi.class,
() -> api.patchNamespacedCustomObject(group, version, namespace,
plural, name, patch).buildCall(null),
patchType, api.getApiClient());
// Object res = api
// .patchNamespacedCustomObject(group, version, namespace, plural,
// name, patch)
// .execute();
return null;
// return gkApi.patch(namespace, name, patchType, patch, options)
// .throwsApiException();
}

public KubernetesApiResponse<DynamicKubernetesObject>
patch(String patchType, V1Patch patch) throws ApiException {
PatchOptions opts = new PatchOptions();
return patch(patchType, patch, opts);
}
}

/**
* Get a namespaced custom object.
*
* @param client the client
* @param group the group
* @param kind the kind
* @param namespace the namespace
* @param name the name
* @return the dynamic kubernetes api
* @throws ApiException the api exception
*/
@SuppressWarnings({ "PMD.AvoidBranchingStatementAsLastInLoop",
"PMD.AvoidInstantiatingObjectsInLoops", "PMD.UseObjectForClearerAPI" })
public static Optional<NamespacedCustomObject>
getCustomObject(ApiClient client, String group, String kind,
String namespace, String name) throws ApiException {
var apis = new ApisApi(client).getAPIVersions().execute();
var crdVersions = apis.getGroups().stream()
.filter(g -> g.getName().equals(group)).findFirst()
.map(V1APIGroup::getVersions).stream().flatMap(l -> l.stream())
.map(V1GroupVersionForDiscovery::getVersion).toList();
var coa = new CustomObjectsApi(client);
for (var crdVersion : crdVersions) {
var crdApiRes = coa.getAPIResources(group, crdVersion).execute()
.getResources().stream().filter(r -> kind.equals(r.getKind()))
.findFirst();
if (crdApiRes.isEmpty()) {
continue;
}
return Optional
.of(new NamespacedCustomObject(coa, group, crdVersion,
namespace, crdApiRes.get().getName(), name));
}
return Optional.empty();
}

/**
* Get an object from its metadata.
*
Expand Down
2 changes: 1 addition & 1 deletion org.jdrupes.vmoperator.runner.qemu/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ dependencies {
implementation project(':org.jdrupes.vmoperator.common')

implementation 'commons-cli:commons-cli:1.5.0'
implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:[2.15.1,3]'
implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:[2.16.1]'

runtimeOnly 'org.slf4j:slf4j-jdk14:[2.0.7,3)'
}
Expand Down

0 comments on commit f409032

Please sign in to comment.