chore(kubernetes): bump kubernetes java client for v1
MODIFY
clouddriver-kubernetes-v1/clouddriver-kubernetes-v1.gradle
clouddriver-kubernetes-v1/clouddriver-kubernetes-v1.gradle
@@ -19,7 +19,7 @@ dependencies {
implementation "com.netflix.spinnaker.kork:kork-config"
implementation "com.netflix.spinnaker.moniker:moniker"
implementation "io.fabric8:kubernetes-client:4.6.0"
- implementation "io.kubernetes:client-java:5.0.0"
+ implementation "io.kubernetes:client-java:7.0.0"
implementation "org.springframework.boot:spring-boot-actuator"
implementation "org.springframework.boot:spring-boot-starter-web"

MODIFY
clouddriver-kubernetes-v1/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v1/api/KubernetesClientApiAdapter.groovy
clouddriver-kubernetes-v1/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v1/api/KubernetesClientApiAdapter.groovy
@@ -25,23 +25,23 @@ import com.netflix.spinnaker.clouddriver.kubernetes.v1.security.KubernetesApiCli
import com.netflix.spinnaker.clouddriver.kubernetes.v1.deploy.KubernetesUtil
import com.netflix.spinnaker.clouddriver.kubernetes.v1.deploy.exception.KubernetesClientOperationException
import groovy.util.logging.Slf4j
-import io.kubernetes.client.ApiClient
-import io.kubernetes.client.ApiException
-import io.kubernetes.client.Configuration
-import io.kubernetes.client.apis.AppsV1beta1Api
-import io.kubernetes.client.apis.AutoscalingV1Api
-import io.kubernetes.client.apis.CoreV1Api
-import io.kubernetes.client.apis.ExtensionsV1beta1Api
-import io.kubernetes.client.models.V1DeleteOptions
-import io.kubernetes.client.models.V1HorizontalPodAutoscaler
-import io.kubernetes.client.models.V1NamespaceList
-import io.kubernetes.client.models.V1Pod
-import io.kubernetes.client.models.V1PodList
-import io.kubernetes.client.models.V1Status
-import io.kubernetes.client.models.V1beta1DaemonSet
-import io.kubernetes.client.models.V1beta1DaemonSetList
-import io.kubernetes.client.models.V1beta1StatefulSet
-import io.kubernetes.client.models.V1beta1StatefulSetList
+import io.kubernetes.client.openapi.ApiClient
+import io.kubernetes.client.openapi.ApiException
+import io.kubernetes.client.openapi.Configuration
+import io.kubernetes.client.openapi.apis.AppsV1beta1Api
+import io.kubernetes.client.openapi.apis.AutoscalingV1Api
+import io.kubernetes.client.openapi.apis.CoreV1Api
+import io.kubernetes.client.openapi.apis.ExtensionsV1beta1Api
+import io.kubernetes.client.openapi.models.V1DeleteOptions
+import io.kubernetes.client.openapi.models.V1HorizontalPodAutoscaler
+import io.kubernetes.client.openapi.models.V1NamespaceList
+import io.kubernetes.client.openapi.models.V1Pod
+import io.kubernetes.client.openapi.models.V1PodList
+import io.kubernetes.client.openapi.models.V1Status
+import io.kubernetes.client.openapi.models.V1beta1DaemonSet
+import io.kubernetes.client.openapi.models.V1beta1DaemonSetList
+import io.kubernetes.client.openapi.models.V1beta1StatefulSet
+import io.kubernetes.client.openapi.models.V1beta1StatefulSetList
import java.util.concurrent.TimeUnit

MODIFY
clouddriver-kubernetes-v1/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v1/api/KubernetesClientApiConverter.groovy
clouddriver-kubernetes-v1/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v1/api/KubernetesClientApiConverter.groovy
@@ -50,49 +50,49 @@ import com.netflix.spinnaker.clouddriver.kubernetes.v1.model.KubernetesControlle
import groovy.transform.CompileStatic
import groovy.util.logging.Slf4j
import io.kubernetes.client.custom.IntOrString
-import io.kubernetes.client.models.V1Capabilities
-import io.kubernetes.client.models.V1ConfigMapVolumeSource
-import io.kubernetes.client.models.V1Container
-import io.kubernetes.client.models.V1ContainerPort
-import io.kubernetes.client.models.V1CrossVersionObjectReference
-import io.kubernetes.client.models.V1EmptyDirVolumeSource
-import io.kubernetes.client.models.V1EnvVar
-import io.kubernetes.client.models.V1EnvVarSource
-import io.kubernetes.client.models.V1ExecAction
-import io.kubernetes.client.models.V1HTTPGetAction
-import io.kubernetes.client.models.V1HTTPHeader
-import io.kubernetes.client.models.V1Handler
-import io.kubernetes.client.models.V1HorizontalPodAutoscaler
-import io.kubernetes.client.models.V1HorizontalPodAutoscalerSpec
-import io.kubernetes.client.models.V1HostPathVolumeSource
-import io.kubernetes.client.models.V1KeyToPath
-import io.kubernetes.client.models.V1LabelSelector
-import io.kubernetes.client.models.V1Lifecycle
-import io.kubernetes.client.models.V1ObjectFieldSelector
-import io.kubernetes.client.models.V1ObjectMeta
-import io.kubernetes.client.models.V1ObjectReference
-import io.kubernetes.client.models.V1PersistentVolumeClaim
-import io.kubernetes.client.models.V1PersistentVolumeClaimSpec
-import io.kubernetes.client.models.V1PersistentVolumeClaimVolumeSource
-import io.kubernetes.client.models.V1PodSpec
-import io.kubernetes.client.models.V1PodTemplateSpec
-import io.kubernetes.client.models.V1Probe
-import io.kubernetes.client.models.V1ResourceFieldSelector
-import io.kubernetes.client.models.V1ResourceRequirements
-import io.kubernetes.client.models.V1SELinuxOptions
-import io.kubernetes.client.models.V1SecretVolumeSource
-import io.kubernetes.client.models.V1SecurityContext
-import io.kubernetes.client.models.V1TCPSocketAction
-import io.kubernetes.client.models.V1Volume
-import io.kubernetes.client.models.V1VolumeMount
-import io.kubernetes.client.models.V1beta1DaemonSet
-import io.kubernetes.client.models.V1beta1DaemonSetSpec
-import io.kubernetes.client.models.V1beta1DaemonSetUpdateStrategy
-import io.kubernetes.client.models.V1beta1RollingUpdateDaemonSet
-import io.kubernetes.client.models.V1beta1RollingUpdateStatefulSetStrategy
-import io.kubernetes.client.models.V1beta1StatefulSet
-import io.kubernetes.client.models.V1beta1StatefulSetSpec
-import io.kubernetes.client.models.V1beta1StatefulSetUpdateStrategy
+import io.kubernetes.client.openapi.models.V1Capabilities
+import io.kubernetes.client.openapi.models.V1ConfigMapVolumeSource
+import io.kubernetes.client.openapi.models.V1Container
+import io.kubernetes.client.openapi.models.V1ContainerPort
+import io.kubernetes.client.openapi.models.V1CrossVersionObjectReference
+import io.kubernetes.client.openapi.models.V1EmptyDirVolumeSource
+import io.kubernetes.client.openapi.models.V1EnvVar
+import io.kubernetes.client.openapi.models.V1EnvVarSource
+import io.kubernetes.client.openapi.models.V1ExecAction
+import io.kubernetes.client.openapi.models.V1HTTPGetAction
+import io.kubernetes.client.openapi.models.V1HTTPHeader
+import io.kubernetes.client.openapi.models.V1Handler
+import io.kubernetes.client.openapi.models.V1HorizontalPodAutoscaler
+import io.kubernetes.client.openapi.models.V1HorizontalPodAutoscalerSpec
+import io.kubernetes.client.openapi.models.V1HostPathVolumeSource
+import io.kubernetes.client.openapi.models.V1KeyToPath
+import io.kubernetes.client.openapi.models.V1LabelSelector
+import io.kubernetes.client.openapi.models.V1Lifecycle
+import io.kubernetes.client.openapi.models.V1ObjectFieldSelector
+import io.kubernetes.client.openapi.models.V1ObjectMeta
+import io.kubernetes.client.openapi.models.V1ObjectReference
+import io.kubernetes.client.openapi.models.V1PersistentVolumeClaim
+import io.kubernetes.client.openapi.models.V1PersistentVolumeClaimSpec
+import io.kubernetes.client.openapi.models.V1PersistentVolumeClaimVolumeSource
+import io.kubernetes.client.openapi.models.V1PodSpec
+import io.kubernetes.client.openapi.models.V1PodTemplateSpec
+import io.kubernetes.client.openapi.models.V1Probe
+import io.kubernetes.client.openapi.models.V1ResourceFieldSelector
+import io.kubernetes.client.openapi.models.V1ResourceRequirements
+import io.kubernetes.client.openapi.models.V1SELinuxOptions
+import io.kubernetes.client.openapi.models.V1SecretVolumeSource
+import io.kubernetes.client.openapi.models.V1SecurityContext
+import io.kubernetes.client.openapi.models.V1TCPSocketAction
+import io.kubernetes.client.openapi.models.V1Volume
+import io.kubernetes.client.openapi.models.V1VolumeMount
+import io.kubernetes.client.openapi.models.V1beta1DaemonSet
+import io.kubernetes.client.openapi.models.V1beta1DaemonSetSpec
+import io.kubernetes.client.openapi.models.V1beta1DaemonSetUpdateStrategy
+import io.kubernetes.client.openapi.models.V1beta1RollingUpdateDaemonSet
+import io.kubernetes.client.openapi.models.V1beta1RollingUpdateStatefulSetStrategy
+import io.kubernetes.client.openapi.models.V1beta1StatefulSet
+import io.kubernetes.client.openapi.models.V1beta1StatefulSetSpec
+import io.kubernetes.client.openapi.models.V1beta1StatefulSetUpdateStrategy
import io.kubernetes.client.util.Yaml
import org.slf4j.Logger
import org.slf4j.LoggerFactory

MODIFY
clouddriver-kubernetes-v1/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v1/deploy/exception/KubernetesClientOperationException.groovy
clouddriver-kubernetes-v1/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v1/deploy/exception/KubernetesClientOperationException.groovy
package com.netflix.spinnaker.clouddriver.kubernetes.v1.deploy.exception
import groovy.transform.InheritConstructors
-import io.kubernetes.client.ApiException
+import io.kubernetes.client.openapi.ApiException
@InheritConstructors
class KubernetesClientOperationException extends RuntimeException {

MODIFY
clouddriver-kubernetes-v1/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v1/deploy/ops/servergroup/DeployKubernetesAtomicOperation.groovy
clouddriver-kubernetes-v1/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v1/deploy/ops/servergroup/DeployKubernetesAtomicOperation.groovy
@@ -36,7 +36,7 @@ import io.fabric8.kubernetes.api.model.apps.DeploymentBuilder
import io.fabric8.kubernetes.api.model.apps.DeploymentFluentImpl
import io.fabric8.kubernetes.api.model.apps.DoneableDeployment
import io.fabric8.kubernetes.api.model.apps.ReplicaSetBuilder
-import io.kubernetes.client.models.V1Pod
+import io.kubernetes.client.openapi.models.V1Pod
class DeployKubernetesAtomicOperation implements AtomicOperation<DeploymentResult> {
private static final String BASE_PHASE = "DEPLOY"

MODIFY
clouddriver-kubernetes-v1/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v1/model/KubernetesControllerConverter.groovy
clouddriver-kubernetes-v1/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v1/model/KubernetesControllerConverter.groovy
@@ -18,7 +18,7 @@ package com.netflix.spinnaker.clouddriver.kubernetes.v1.model
import io.fabric8.kubernetes.api.model.HasMetadata
import io.fabric8.kubernetes.api.model.ObjectMeta
-import io.kubernetes.client.models.V1ObjectMeta
+import io.kubernetes.client.openapi.models.V1ObjectMeta
class KubernetesControllerConverter implements HasMetadata {
String kind

MODIFY
clouddriver-kubernetes-v1/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v1/model/KubernetesV1ServerGroup.groovy
clouddriver-kubernetes-v1/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v1/model/KubernetesV1ServerGroup.groovy
@@ -34,8 +34,8 @@ import io.fabric8.kubernetes.api.model.HorizontalPodAutoscaler
import io.fabric8.kubernetes.api.model.ReplicationController
import io.fabric8.kubernetes.api.model.apps.ReplicaSet
import io.fabric8.kubernetes.client.internal.SerializationUtils
-import io.kubernetes.client.models.V1beta1DaemonSet
-import io.kubernetes.client.models.V1beta1StatefulSet
+import io.kubernetes.client.openapi.models.V1beta1DaemonSet
+import io.kubernetes.client.openapi.models.V1beta1StatefulSet
import static com.netflix.spinnaker.clouddriver.kubernetes.v1.deploy.KubernetesUtil.ENABLE_DISABLE_ANNOTATION

MODIFY
clouddriver-kubernetes-v1/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v1/provider/agent/KubernetesControllersCachingAgent.groovy
clouddriver-kubernetes-v1/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v1/provider/agent/KubernetesControllersCachingAgent.groovy
@@ -37,9 +37,9 @@ import com.netflix.spinnaker.clouddriver.kubernetes.v1.provider.view.MutableCach
import com.netflix.spinnaker.clouddriver.kubernetes.v1.security.KubernetesV1Credentials
import groovy.util.logging.Slf4j
import io.fabric8.kubernetes.api.model.Event
-import io.kubernetes.client.models.V1PodList
-import io.kubernetes.client.models.V1beta1DaemonSet
-import io.kubernetes.client.models.V1beta1StatefulSet
+import io.kubernetes.client.openapi.models.V1PodList
+import io.kubernetes.client.openapi.models.V1beta1DaemonSet
+import io.kubernetes.client.openapi.models.V1beta1StatefulSet
import static com.netflix.spinnaker.cats.agent.AgentDataType.Authority.AUTHORITATIVE
import static com.netflix.spinnaker.cats.agent.AgentDataType.Authority.INFORMATIVE

MODIFY
clouddriver-kubernetes-v1/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v1/security/KubernetesApiClientConfig.groovy
clouddriver-kubernetes-v1/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v1/security/KubernetesApiClientConfig.groovy
package com.netflix.spinnaker.clouddriver.kubernetes.v1.security
import groovy.util.logging.Slf4j
-import io.kubernetes.client.ApiClient
+import io.kubernetes.client.openapi.ApiClient
import io.kubernetes.client.util.Config
import io.kubernetes.client.util.KubeConfig
import org.apache.commons.lang3.StringUtils

chore(kubernetes): bump kubernetes java client for v1