Skip to content
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

Jump to bottom

deps: bump Kubernetes Client to 6.8.0 #2302

Merged
merged 1 commit into from Jul 25, 2023
Merged

deps: bump Kubernetes Client to 6.8.0 #2302

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Expand Up @@ -29,6 +29,7 @@ Usage:
* Fix #2219: Kind/Filename mappings include optional apiVersion configuration
* Fix #2224: Quarkus native base image read from properties (configurable)
* Fix #2228: Quarkus native base image uses UBI 8.7
* Fix #2302 Bump Kubernetes Client version to 6.8.0

### 1.13.1 (2023-06-16)
* Fix #2212: Bump Kubernetes Client version to 6.7.2 (fixes issues when trace-logging OpenShift builds -regression in 6.7.1-)
Expand Down
63 changes: 24 additions & 39 deletions ...nricher/api/src/main/java/org/eclipse/jkube/kit/enricher/api/visitor/MetadataVisitor.java
View file
Open in desktop
Expand Up @@ -30,49 +30,34 @@
import io.fabric8.kubernetes.api.model.ObjectMetaFluent;
import io.fabric8.kubernetes.api.model.PodTemplateSpecBuilder;
import io.fabric8.kubernetes.api.model.PodTemplateSpecFluent;
import io.fabric8.kubernetes.api.model.PodTemplateSpecFluentImpl;
import io.fabric8.kubernetes.api.model.ReplicationControllerBuilder;
import io.fabric8.kubernetes.api.model.ReplicationControllerFluent;
import io.fabric8.kubernetes.api.model.ReplicationControllerFluentImpl;
import io.fabric8.kubernetes.api.model.ServiceAccountBuilder;
import io.fabric8.kubernetes.api.model.ServiceAccountFluent;
import io.fabric8.kubernetes.api.model.ServiceAccountFluentImpl;
import io.fabric8.kubernetes.api.model.ServiceBuilder;
import io.fabric8.kubernetes.api.model.ServiceFluent;
import io.fabric8.kubernetes.api.model.ServiceFluentImpl;
import io.fabric8.kubernetes.api.model.apps.DaemonSetBuilder;
import io.fabric8.kubernetes.api.model.apps.DaemonSetFluent;
import io.fabric8.kubernetes.api.model.apps.DaemonSetFluentImpl;
import io.fabric8.kubernetes.api.model.apps.DeploymentBuilder;
import io.fabric8.kubernetes.api.model.apps.DeploymentFluent;
import io.fabric8.kubernetes.api.model.apps.DeploymentFluentImpl;
import io.fabric8.kubernetes.api.model.apps.ReplicaSetBuilder;
import io.fabric8.kubernetes.api.model.apps.ReplicaSetFluent;
import io.fabric8.kubernetes.api.model.apps.ReplicaSetFluentImpl;
import io.fabric8.kubernetes.api.model.apps.StatefulSetBuilder;
import io.fabric8.kubernetes.api.model.apps.StatefulSetFluent;
import io.fabric8.kubernetes.api.model.apps.StatefulSetFluentImpl;
import io.fabric8.kubernetes.api.model.batch.v1.JobBuilder;
import io.fabric8.kubernetes.api.model.batch.v1.JobFluent;
import io.fabric8.kubernetes.api.model.batch.v1.JobFluentImpl;
import io.fabric8.kubernetes.api.model.extensions.IngressBuilder;
import io.fabric8.kubernetes.api.model.extensions.IngressFluent;
import io.fabric8.kubernetes.api.model.extensions.IngressFluentImpl;
import io.fabric8.openshift.api.model.BuildBuilder;
import io.fabric8.openshift.api.model.BuildConfigBuilder;
import io.fabric8.openshift.api.model.BuildConfigFluent;
import io.fabric8.openshift.api.model.BuildConfigFluentImpl;
import io.fabric8.openshift.api.model.BuildFluent;
import io.fabric8.openshift.api.model.BuildFluentImpl;
import io.fabric8.openshift.api.model.DeploymentConfigBuilder;
import io.fabric8.openshift.api.model.DeploymentConfigFluent;
import io.fabric8.openshift.api.model.DeploymentConfigFluentImpl;
import io.fabric8.openshift.api.model.ImageStreamBuilder;
import io.fabric8.openshift.api.model.ImageStreamFluent;
import io.fabric8.openshift.api.model.ImageStreamFluentImpl;
import io.fabric8.openshift.api.model.RouteBuilder;
import io.fabric8.openshift.api.model.RouteFluent;
import io.fabric8.openshift.api.model.RouteFluentImpl;
import lombok.AllArgsConstructor;

import static org.eclipse.jkube.kit.common.util.PropertiesUtil.toMap;
Expand Down Expand Up @@ -146,132 +131,132 @@ public static MetadataVisitor<DeploymentBuilder> deployment(ResourceConfig resou
return new MetadataVisitor<>(
DeploymentBuilder.class,
getAnnotations(resourceConfig)::getDeployment, getLabels(resourceConfig)::getDeployment,
DeploymentFluentImpl::editOrNewMetadata, omf -> ((DeploymentFluent.MetadataNested<?>) omf)::endMetadata);
DeploymentFluent::editOrNewMetadata, omf -> ((DeploymentFluent<?>.MetadataNested<?>) omf)::endMetadata);
}

public static MetadataVisitor<io.fabric8.kubernetes.api.model.extensions.DeploymentBuilder> extensionsDeployment(
ResourceConfig resourceConfig) {
return new MetadataVisitor<>(
io.fabric8.kubernetes.api.model.extensions.DeploymentBuilder.class,
getAnnotations(resourceConfig)::getDeployment, getLabels(resourceConfig)::getDeployment,
io.fabric8.kubernetes.api.model.extensions.DeploymentFluentImpl::editOrNewMetadata,
omf -> ((io.fabric8.kubernetes.api.model.extensions.DeploymentFluent.MetadataNested<?>) omf)::endMetadata);
io.fabric8.kubernetes.api.model.extensions.DeploymentFluent::editOrNewMetadata,
omf -> ((io.fabric8.kubernetes.api.model.extensions.DeploymentFluent<?>.MetadataNested<?>) omf)::endMetadata);
}

public static MetadataVisitor<DeploymentConfigBuilder> deploymentConfig(ResourceConfig resourceConfig) {
return new MetadataVisitor<>(
DeploymentConfigBuilder.class,
getAnnotations(resourceConfig)::getDeployment, getLabels(resourceConfig)::getDeployment,
DeploymentConfigFluentImpl::editOrNewMetadata, omf -> ((DeploymentConfigFluent.MetadataNested<?>) omf)::endMetadata);
DeploymentConfigFluent::editOrNewMetadata, omf -> ((DeploymentConfigFluent<?>.MetadataNested<?>) omf)::endMetadata);
}

public static MetadataVisitor<ReplicaSetBuilder> replicaSet(ResourceConfig resourceConfig) {
return new MetadataVisitor<>(
ReplicaSetBuilder.class,
getAnnotations(resourceConfig)::getReplicaSet, getLabels(resourceConfig)::getReplicaSet,
ReplicaSetFluentImpl::editOrNewMetadata, omf -> ((ReplicaSetFluent.MetadataNested<?>) omf)::endMetadata);
ReplicaSetFluent::editOrNewMetadata, omf -> ((ReplicaSetFluent<?>.MetadataNested<?>) omf)::endMetadata);
}

public static MetadataVisitor<ReplicationControllerBuilder> replicationController(ResourceConfig resourceConfig) {
return new MetadataVisitor<>(
ReplicationControllerBuilder.class,
getAnnotations(resourceConfig)::getReplicaSet, getLabels(resourceConfig)::getReplicaSet,
ReplicationControllerFluentImpl::editOrNewMetadata,
omf -> ((ReplicationControllerFluent.MetadataNested<?>) omf)::endMetadata);
ReplicationControllerFluent::editOrNewMetadata,
omf -> ((ReplicationControllerFluent<?>.MetadataNested<?>) omf)::endMetadata);
}

public static MetadataVisitor<ServiceBuilder> service(ResourceConfig resourceConfig) {
return new MetadataVisitor<>(
ServiceBuilder.class,
getAnnotations(resourceConfig)::getService, getLabels(resourceConfig)::getService,
ServiceFluentImpl::editOrNewMetadata, omf -> ((ServiceFluent.MetadataNested<?>) omf)::endMetadata);
ServiceFluent::editOrNewMetadata, omf -> ((ServiceFluent<?>.MetadataNested<?>) omf)::endMetadata);
}

public static MetadataVisitor<PodTemplateSpecBuilder> podTemplateSpec(ResourceConfig resourceConfig) {
return new MetadataVisitor<>(
PodTemplateSpecBuilder.class,
getAnnotations(resourceConfig)::getPod, getLabels(resourceConfig)::getPod,
PodTemplateSpecFluentImpl::editOrNewMetadata, omf -> ((PodTemplateSpecFluent.MetadataNested<?>) omf)::endMetadata);
PodTemplateSpecFluent::editOrNewMetadata, omf -> ((PodTemplateSpecFluent<?>.MetadataNested<?>) omf)::endMetadata);
}

public static MetadataVisitor<DaemonSetBuilder> daemonSet(ResourceConfig resourceConfig) {
return new MetadataVisitor<>(
DaemonSetBuilder.class,
getAnnotations(resourceConfig)::getAll, getLabels(resourceConfig)::getAll,
DaemonSetFluentImpl::editOrNewMetadata, omf -> ((DaemonSetFluent.MetadataNested<?>) omf)::endMetadata);
DaemonSetFluent::editOrNewMetadata, omf -> ((DaemonSetFluent<?>.MetadataNested<?>) omf)::endMetadata);
}

public static MetadataVisitor<StatefulSetBuilder> statefulSet(ResourceConfig resourceConfig) {
return new MetadataVisitor<>(
StatefulSetBuilder.class,
getAnnotations(resourceConfig)::getAll, getLabels(resourceConfig)::getAll,
StatefulSetFluentImpl::editOrNewMetadata, omf -> ((StatefulSetFluent.MetadataNested<?>) omf)::endMetadata);
StatefulSetFluent::editOrNewMetadata, omf -> ((StatefulSetFluent<?>.MetadataNested<?>) omf)::endMetadata);
}

public static MetadataVisitor<JobBuilder> job(ResourceConfig resourceConfig) {
return new MetadataVisitor<>(
JobBuilder.class,
getAnnotations(resourceConfig)::getAll, getLabels(resourceConfig)::getAll,
JobFluentImpl::editOrNewMetadata, omf -> ((JobFluent.MetadataNested<?>) omf)::endMetadata);
JobFluent::editOrNewMetadata, omf -> ((JobFluent<?>.MetadataNested<?>) omf)::endMetadata);
}

public static MetadataVisitor<ImageStreamBuilder> imageStream(ResourceConfig resourceConfig) {
return new MetadataVisitor<>(
ImageStreamBuilder.class,
getAnnotations(resourceConfig)::getAll, getLabels(resourceConfig)::getAll,
ImageStreamFluentImpl::editOrNewMetadata, omf -> ((ImageStreamFluent.MetadataNested<?>) omf)::endMetadata);
ImageStreamFluent::editOrNewMetadata, omf -> ((ImageStreamFluent<?>.MetadataNested<?>) omf)::endMetadata);
}

public static MetadataVisitor<BuildConfigBuilder> buildConfig(ResourceConfig resourceConfig) {
return new MetadataVisitor<>(
BuildConfigBuilder.class,
getAnnotations(resourceConfig)::getAll, getLabels(resourceConfig)::getAll,
BuildConfigFluentImpl::editOrNewMetadata, omf -> ((BuildConfigFluent.MetadataNested<?>) omf)::endMetadata);
BuildConfigFluent::editOrNewMetadata, omf -> ((BuildConfigFluent<?>.MetadataNested<?>) omf)::endMetadata);
}

public static MetadataVisitor<BuildBuilder> build(ResourceConfig resourceConfig) {
return new MetadataVisitor<>(
BuildBuilder.class,
getAnnotations(resourceConfig)::getAll, getLabels(resourceConfig)::getAll,
BuildFluentImpl::editOrNewMetadata, omf -> ((BuildFluent.MetadataNested<?>) omf)::endMetadata);
BuildFluent::editOrNewMetadata, omf -> ((BuildFluent<?>.MetadataNested<?>) omf)::endMetadata);
}

public static MetadataVisitor<IngressBuilder> extensionsIngress(ResourceConfig resourceConfig) {
return new MetadataVisitor<>(
IngressBuilder.class,
getAnnotations(resourceConfig)::getIngress, getLabels(resourceConfig)::getIngress,
IngressFluentImpl::editOrNewMetadata, omf -> ((IngressFluent.MetadataNested<?>) omf)::endMetadata);
IngressFluent::editOrNewMetadata, omf -> ((IngressFluent<?>.MetadataNested<?>) omf)::endMetadata);
}

public static MetadataVisitor<io.fabric8.kubernetes.api.model.networking.v1beta1.IngressBuilder> ingressV1beta1(
ResourceConfig resourceConfig) {
return new MetadataVisitor<>(
io.fabric8.kubernetes.api.model.networking.v1beta1.IngressBuilder.class,
getAnnotations(resourceConfig)::getIngress, getLabels(resourceConfig)::getIngress,
io.fabric8.kubernetes.api.model.networking.v1beta1.IngressFluentImpl::editOrNewMetadata,
omf -> ((io.fabric8.kubernetes.api.model.networking.v1beta1.IngressFluent.MetadataNested<?>) omf)::endMetadata);
io.fabric8.kubernetes.api.model.networking.v1beta1.IngressFluent::editOrNewMetadata,
omf -> ((io.fabric8.kubernetes.api.model.networking.v1beta1.IngressFluent<?>.MetadataNested<?>) omf)::endMetadata);
}

public static MetadataVisitor<io.fabric8.kubernetes.api.model.networking.v1.IngressBuilder> ingressV1(
ResourceConfig resourceConfig) {
return new MetadataVisitor<>(
io.fabric8.kubernetes.api.model.networking.v1.IngressBuilder.class,
getAnnotations(resourceConfig)::getIngress, getLabels(resourceConfig)::getIngress,
io.fabric8.kubernetes.api.model.networking.v1.IngressFluentImpl::editOrNewMetadata,
omf -> ((io.fabric8.kubernetes.api.model.networking.v1.IngressFluent.MetadataNested<?>) omf)::endMetadata);
io.fabric8.kubernetes.api.model.networking.v1.IngressFluent::editOrNewMetadata,
omf -> ((io.fabric8.kubernetes.api.model.networking.v1.IngressFluent<?>.MetadataNested<?>) omf)::endMetadata);
}

public static MetadataVisitor<ServiceAccountBuilder> serviceAccount(ResourceConfig resourceConfig) {
return new MetadataVisitor<>(
ServiceAccountBuilder.class,
getAnnotations(resourceConfig)::getServiceAccount, getLabels(resourceConfig)::getServiceAccount,
ServiceAccountFluentImpl::editOrNewMetadata, omf -> ((ServiceAccountFluent.MetadataNested<?>) omf)::endMetadata);
ServiceAccountFluent::editOrNewMetadata, omf -> ((ServiceAccountFluent<?>.MetadataNested<?>) omf)::endMetadata);
}

public static MetadataVisitor<RouteBuilder> route(ResourceConfig resourceConfig) {
return new MetadataVisitor<>(RouteBuilder.class,
return new MetadataVisitor<>(RouteBuilder.class,
getAnnotations(resourceConfig)::getRoute, getLabels(resourceConfig)::getRoute,
RouteFluentImpl::editOrNewMetadata, omf -> ((RouteFluent.MetadataNested<?>) omf)::endMetadata);
RouteFluent::editOrNewMetadata, omf -> ((RouteFluent<?>.MetadataNested<?>) omf)::endMetadata);
}

}
}
2 changes: 1 addition & 1 deletion ...kit/enricher/api/src/main/java/org/eclipse/jkube/kit/enricher/handler/ServiceHandler.java
View file
Open in desktop
Expand Up @@ -47,7 +47,7 @@ public List<Service> getServices(List<ServiceConfig> services) {
.withLabels(getLabels(service))
.endMetadata();

ServiceFluent.SpecNested<ServiceBuilder> serviceSpecBuilder = serviceBuilder.withNewSpec();
ServiceFluent<?>.SpecNested<ServiceBuilder> serviceSpecBuilder = serviceBuilder.withNewSpec();

List<ServicePort> servicePorts = new ArrayList<>();

Expand Down
2 changes: 1 addition & 1 deletion .../enricher/generic/src/main/java/org/eclipse/jkube/enricher/generic/ConfigMapEnricher.java
View file
Open in desktop
Expand Up @@ -111,7 +111,7 @@ private void addConfigMapFromResourceConfigurations(KubernetesListBuilder builde

if ((configMap.getData() != null && !configMap.getData().isEmpty())
|| (configMap.getBinaryData() != null && !configMap.getBinaryData().isEmpty())) {
builder.addToConfigMapItems(configMap);
builder.addToItems(configMap);
}
} catch (IOException e) {
throw new IllegalArgumentException(e);
Expand Down
4 changes: 2 additions & 2 deletions ...ain/java/org/eclipse/jkube/enricher/generic/ControllerViaPluginConfigurationEnricher.java
View file
Open in desktop
Expand Up @@ -146,13 +146,13 @@ public void visit(PodSpecBuilder builder) {
}

private void mergeDeploymentSpec(DeploymentBuilder builder, DeploymentSpec spec) {
DeploymentFluent.SpecNested<DeploymentBuilder> specBuilder = builder.editSpec();
DeploymentFluent<?>.SpecNested<DeploymentBuilder> specBuilder = builder.editSpec();
KubernetesResourceUtil.mergeSimpleFields(specBuilder, spec);
specBuilder.endSpec();
}

private void mergeStatefulSetSpec(StatefulSetBuilder builder, StatefulSetSpec spec) {
StatefulSetFluent.SpecNested<StatefulSetBuilder> specBuilder = builder.editSpec();
StatefulSetFluent<?>.SpecNested<StatefulSetBuilder> specBuilder = builder.editSpec();
KubernetesResourceUtil.mergeSimpleFields(specBuilder, spec);
specBuilder.endSpec();
}
Expand Down
6 changes: 3 additions & 3 deletions ...cher/generic/src/main/java/org/eclipse/jkube/enricher/generic/DefaultServiceEnricher.java
View file
Open in desktop
Expand Up @@ -162,7 +162,7 @@ public void visit(ServicePortBuilder portBuilder) {
}

private void addServices(KubernetesListBuilder builder, List<ServiceConfig> services) {
builder.addToServiceItems(toArray(getContext().getHandlerHub().getServiceHandler().getServices(services)));
builder.addToItems(toArray(getContext().getHandlerHub().getServiceHandler().getServices(services)));
}

// convert list to array, never returns null.
Expand Down Expand Up @@ -220,7 +220,7 @@ private Service getDefaultService() {
.withName(serviceName)
.withLabels(extractLabels())
.endMetadata();
ServiceFluent.SpecNested<ServiceBuilder> specBuilder = builder.withNewSpec();
ServiceFluent<?>.SpecNested<ServiceBuilder> specBuilder = builder.withNewSpec();
if (!ports.isEmpty()) {
specBuilder.withPorts(ports);
} else if (Configs.asBoolean(getConfig(Config.HEADLESS))) {
Expand Down Expand Up @@ -284,7 +284,7 @@ private void addDefaultService(KubernetesListBuilder builder, Service defaultSer
log.info("Adding headless default service '%s'",
defaultService.getMetadata().getName());
}
builder.addToServiceItems(defaultService);
builder.addToItems(defaultService);
}

// ....................................................................................
Expand Down