update kubernetes client to 6.8.1

xtf-cz · Sep 7, 2023 · 71ea7a3 · 71ea7a3
1 parent 2c2ecdd
commit 71ea7a3
Show file tree

Hide file tree

Showing 15 changed files with 103 additions and 96 deletions.
diff --git a/builder/src/main/java/cz/xtf/builder/builders/BuildConfigBuilder.java b/builder/src/main/java/cz/xtf/builder/builders/BuildConfigBuilder.java
@@ -19,13 +19,14 @@
 import io.fabric8.kubernetes.api.model.Quantity;
 import io.fabric8.openshift.api.model.BinaryBuildSource;
 import io.fabric8.openshift.api.model.BuildConfig;
-import io.fabric8.openshift.api.model.BuildConfigFluent.SpecNested;
+import io.fabric8.openshift.api.model.BuildConfigFluent;
+import io.fabric8.openshift.api.model.BuildConfigSpecFluent;
 import io.fabric8.openshift.api.model.BuildSourceBuilder;
 import io.fabric8.openshift.api.model.BuildTriggerPolicy;
 import io.fabric8.openshift.api.model.BuildTriggerPolicyBuilder;
 import io.fabric8.openshift.api.model.GitBuildSourceBuilder;
 import io.fabric8.openshift.api.model.ImageSourceBuilder;
-import io.fabric8.openshift.api.model.ImageSourceFluent.FromNested;
+import io.fabric8.openshift.api.model.ImageSourceFluent;
 import io.fabric8.openshift.api.model.SecretBuildSourceBuilder;
 
 public class BuildConfigBuilder extends AbstractBuilder<BuildConfig, BuildConfigBuilder> implements ResourceLimitBuilder {
@@ -183,7 +184,7 @@ public BuildConfig build() {
 
         if (imageSource != null) {
             final ImageSourceBuilder isb = new ImageSourceBuilder();
-            FromNested<ImageSourceBuilder> from = isb.withNewFrom()
+            ImageSourceFluent<ImageSourceBuilder>.FromNested<ImageSourceBuilder> from = isb.withNewFrom()
                     .withName(imageSource.getName())
                     .withKind(imageSource.getKind());
             if (imageSource.getNamespace() != null) {
@@ -200,15 +201,16 @@ public BuildConfig build() {
                 .withMetadata(metadataBuilder().build());
 
         // spec
-        final SpecNested<io.fabric8.openshift.api.model.BuildConfigBuilder> spec = builder.withNewSpec();
+        final BuildConfigFluent<io.fabric8.openshift.api.model.BuildConfigBuilder>.SpecNested<io.fabric8.openshift.api.model.BuildConfigBuilder> spec = builder
+                .withNewSpec();
 
         // limits
         final List<ComputingResource> requests = computingResources.values().stream().filter(x -> x.getRequests() != null)
                 .collect(Collectors.toList());
         final List<ComputingResource> limits = computingResources.values().stream().filter(x -> x.getLimits() != null)
                 .collect(Collectors.toList());
         if (!requests.isEmpty() || !limits.isEmpty()) {
-            io.fabric8.openshift.api.model.BuildConfigSpecFluent.ResourcesNested<SpecNested<io.fabric8.openshift.api.model.BuildConfigBuilder>> resources = spec
+            BuildConfigSpecFluent<BuildConfigFluent<io.fabric8.openshift.api.model.BuildConfigBuilder>.SpecNested<io.fabric8.openshift.api.model.BuildConfigBuilder>>.ResourcesNested<BuildConfigFluent<io.fabric8.openshift.api.model.BuildConfigBuilder>.SpecNested<io.fabric8.openshift.api.model.BuildConfigBuilder>> resources = spec
                     .withNewResources();
             if (!requests.isEmpty()) {
                 resources.withRequests(

diff --git a/builder/src/main/java/cz/xtf/builder/builders/ImageStreamBuilder.java b/builder/src/main/java/cz/xtf/builder/builders/ImageStreamBuilder.java
@@ -107,7 +107,7 @@ public ImageStreamBuilder addTag(String tag, String sourceUrl, boolean insecure,
                 .withName(tag);
 
         if (StringUtils.isNotBlank(sourceUrl)) {
-            trb.withImportPolicy(new TagImportPolicy(insecure, SCHEDULED));
+            trb.withImportPolicy(new TagImportPolicy("Legacy", insecure, SCHEDULED));
 
             trb.withNewFrom()
                     .withKind("DockerImage")

diff --git a/builder/src/main/java/cz/xtf/builder/builders/RoleBindingBuilder.java b/builder/src/main/java/cz/xtf/builder/builders/RoleBindingBuilder.java
@@ -94,7 +94,7 @@ public RoleBindingBuilder roleRefNamespace(String roleRefNamespace) {
 
     @Override
     public RoleBinding build() {
-        RoleBindingFluent.SubjectsNested<io.fabric8.kubernetes.api.model.rbac.RoleBindingBuilder> subject = new io.fabric8.kubernetes.api.model.rbac.RoleBindingBuilder()
+        RoleBindingFluent<io.fabric8.kubernetes.api.model.rbac.RoleBindingBuilder>.SubjectsNested<io.fabric8.kubernetes.api.model.rbac.RoleBindingBuilder> subject = new io.fabric8.kubernetes.api.model.rbac.RoleBindingBuilder()
                 .withNewMetadata()
                 .withName(this.getName())
                 .endMetadata()
@@ -105,7 +105,7 @@ public RoleBinding build() {
         if (subjectNamespace != null && !subjectNamespace.isEmpty())
             subject.withNamespace(subjectNamespace);
 
-        RoleBindingFluent.RoleRefNested<io.fabric8.kubernetes.api.model.rbac.RoleBindingBuilder> roleRef = subject
+        RoleBindingFluent<io.fabric8.kubernetes.api.model.rbac.RoleBindingBuilder>.RoleRefNested<io.fabric8.kubernetes.api.model.rbac.RoleBindingBuilder> roleRef = subject
                 .endSubject()
                 .withNewRoleRef()
                 .withKind(roleRefKind)

diff --git a/builder/src/main/java/cz/xtf/builder/builders/buildconfig/SourceBuildStrategy.java b/builder/src/main/java/cz/xtf/builder/builders/buildconfig/SourceBuildStrategy.java
@@ -85,7 +85,7 @@ protected void buildStrategy(BuildStrategyBuilder builder) {
                         .endFrom();
             }
             if (StringUtils.isNotBlank(imageStreamNamespace)) {
-                strategyBuilder.getFrom().setNamespace(imageStreamNamespace);
+                strategyBuilder.buildFrom().setNamespace(imageStreamNamespace);
             }
         } else if (StringUtils.isNotBlank(dockerImageUrl)) {
             strategyBuilder.withNewFrom()

diff --git a/builder/src/main/java/cz/xtf/builder/builders/deployment/AbstractProbe.java b/builder/src/main/java/cz/xtf/builder/builders/deployment/AbstractProbe.java
@@ -60,9 +60,9 @@ public Probe build() {
     private IntOrString getPort() {
         IntOrStringBuilder builder = new IntOrStringBuilder();
         if (StringUtils.isNumeric(port)) {
-            builder.withIntVal(Integer.valueOf(port));
+            builder.withValue(Integer.valueOf(port));
         } else {
-            builder.withStrVal(port);
+            builder.withValue(port);
         }
         return builder.build();
     }

diff --git a/builder/src/main/java/cz/xtf/builder/builders/pod/ConfigMapVolume.java b/builder/src/main/java/cz/xtf/builder/builders/pod/ConfigMapVolume.java
@@ -24,7 +24,7 @@ public ConfigMapVolume(String name, String configMapName, String defaultMode) {
 
     @Override
     protected void addVolumeParameters(VolumeBuilder builder) {
-        VolumeFluent.ConfigMapNested<VolumeBuilder> cfm = builder.withNewConfigMap();
+        VolumeFluent<VolumeBuilder>.ConfigMapNested<VolumeBuilder> cfm = builder.withNewConfigMap();
         cfm.withName(configMapName);
         if (defaultMode != null) {
             int defaultModeIntVal = 0;

diff --git a/builder/src/main/java/cz/xtf/builder/builders/pod/ContainerBuilder.java b/builder/src/main/java/cz/xtf/builder/builders/pod/ContainerBuilder.java
@@ -28,7 +28,7 @@
 import cz.xtf.builder.builders.route.TransportProtocol;
 import io.fabric8.kubernetes.api.model.ConfigMapKeySelectorBuilder;
 import io.fabric8.kubernetes.api.model.Container;
-import io.fabric8.kubernetes.api.model.ContainerFluent.ResourcesNested;
+import io.fabric8.kubernetes.api.model.ContainerFluent;
 import io.fabric8.kubernetes.api.model.ContainerPortBuilder;
 import io.fabric8.kubernetes.api.model.EnvVar;
 import io.fabric8.kubernetes.api.model.EnvVarSource;
@@ -251,7 +251,8 @@ public Container build() {
         final List<ComputingResource> limits = computingResources.values().stream().filter(x -> x.getLimits() != null)
                 .collect(Collectors.toList());
         if (!requests.isEmpty() || !limits.isEmpty()) {
-            ResourcesNested<io.fabric8.kubernetes.api.model.ContainerBuilder> resources = builder.withNewResources();
+            ContainerFluent<io.fabric8.kubernetes.api.model.ContainerBuilder>.ResourcesNested<io.fabric8.kubernetes.api.model.ContainerBuilder> resources = builder
+                    .withNewResources();
             if (!requests.isEmpty()) {
                 resources.withRequests(
                         requests.stream().collect(Collectors.toMap(

diff --git a/builder/src/main/java/cz/xtf/builder/builders/pod/SecretVolume.java b/builder/src/main/java/cz/xtf/builder/builders/pod/SecretVolume.java
@@ -28,7 +28,7 @@ public String getSecretName() {
     @Override
     protected void addVolumeParameters(VolumeBuilder builder) {
 
-        final VolumeFluent.SecretNested<VolumeBuilder> volumeBuilderSecretNested = builder.withNewSecret()
+        final VolumeFluent<VolumeBuilder>.SecretNested<VolumeBuilder> volumeBuilderSecretNested = builder.withNewSecret()
                 .withSecretName(getSecretName());
 
         if (items != null) {

diff --git a/core/src/main/java/cz/xtf/core/openshift/ClusterVersionInfo.java b/core/src/main/java/cz/xtf/core/openshift/ClusterVersionInfo.java
@@ -12,11 +12,6 @@
 import cz.xtf.core.http.Https;
 import cz.xtf.core.http.HttpsException;
 import io.fabric8.kubernetes.client.KubernetesClientException;
-import io.fabric8.kubernetes.client.dsl.NonNamespaceOperation;
-import io.fabric8.kubernetes.client.dsl.Resource;
-import io.fabric8.openshift.api.model.ClusterVersion;
-import io.fabric8.openshift.api.model.ClusterVersionList;
-import io.fabric8.openshift.client.OpenShiftHandlers;
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
@@ -136,9 +131,7 @@ private String detectClusterVersionFromCluster() {
             // it is OpenShift 4+
             // admin is required for operation
             try {
-                NonNamespaceOperation<ClusterVersion, ClusterVersionList, Resource<ClusterVersion>> op = OpenShiftHandlers
-                        .getOperation(ClusterVersion.class, ClusterVersionList.class, OpenShifts.admin());
-                openshiftVersion = op.withName("version").get().getStatus().getDesired().getVersion();
+                openshiftVersion = OpenShifts.admin().getOpenShiftV4Version();
             } catch (KubernetesClientException kce) {
                 log.warn("xtf.openshift.version isn't configured and automatic version detection failed.", kce);
             }