refactor(kubernetes): Move V1 code to clouddriver-kubernetes-v1 (#4028)

* refactor(kubernetes): Remove V1 dependence from V2 test The V2-only KubernetesAccountResolverSpec depends on the V1 credentials object KubernetesV1Credentials. It's not actually using any properties specific to the V1 credentials; this class exists only to ensure that the resolver only returns V2 credentials. Replace a mock for the V1 credentials with a mock for the interface, which equivalently exercises the test case that we don't return KubernetesCredentials that aren't KubernetesV2Credentials. * refactor(kubernetes): Split KubernetesV1Configuration into its own file In preparation for moving all V1-specific code to its own class, split out the V1-only beans into KubernetesV1Configuration. * refactor(kubernetes): Move V1 code to clouddriver-kubernetes-v1 This leaves only shared V1+V2 code in clouddriver-kubernetes, and removes the dependency of the V2 provider on the V1 provider. * refactor(kubernetes): Compile clouddriver-kubernetes with java Now that the V1 code has been moved out of clouddriver-kubernetes, only Java code is left. Rename the source directory from groovy to java, and start compiling the module with the java compiler.
spinnaker · Sep 16, 2019 · 198cd7a · 198cd7a
1 parent 515528e
commit 198cd7a
Show file tree

Hide file tree

Showing 172 changed files with 93 additions and 31 deletions.
diff --git a/clouddriver-kubernetes-v1/clouddriver-kubernetes-v1.gradle b/clouddriver-kubernetes-v1/clouddriver-kubernetes-v1.gradle
@@ -0,0 +1,31 @@
+dependencies {
+  implementation project(":clouddriver-kubernetes")
+  implementation project(":clouddriver-core")
+  implementation project(":cats:cats-core")
+  implementation project(":clouddriver-docker")
+  implementation project(":clouddriver-security")
+
+  compileOnly "org.projectlombok:lombok"
+  annotationProcessor "org.projectlombok:lombok"
+  testAnnotationProcessor "org.projectlombok:lombok"
+
+  implementation "org.codehaus.groovy:groovy-all"
+
+  implementation "com.github.fge:json-patch:1.9"
+  implementation "com.google.guava:guava"
+  implementation "com.netflix.frigga:frigga"
+  implementation "com.netflix.spectator:spectator-api"
+  implementation "com.netflix.spinnaker.fiat:fiat-core:$fiatVersion"
+  implementation "com.netflix.spinnaker.kork:kork-config"
+  implementation "com.netflix.spinnaker.moniker:moniker"
+  implementation "io.fabric8:kubernetes-client:4.1.1"
+  implementation "io.kubernetes:client-java:5.0.0"
+  implementation "org.springframework.boot:spring-boot-actuator"
+  implementation "org.springframework.boot:spring-boot-starter-web"
+
+  testImplementation "cglib:cglib-nodep"
+  testImplementation "org.objenesis:objenesis"
+  testImplementation "org.spockframework:spock-core"
+  testImplementation "org.spockframework:spock-spring"
+  testImplementation "org.springframework:spring-test"
+}
diff --git a/...rnetes/v1/api/KubernetesApiAdaptor.groovy → ...rnetes/v1/api/KubernetesApiAdaptor.groovy b/...rnetes/v1/api/KubernetesApiAdaptor.groovy → ...rnetes/v1/api/KubernetesApiAdaptor.groovy
diff --git a/...etes/v1/api/KubernetesApiConverter.groovy → ...etes/v1/api/KubernetesApiConverter.groovy b/...etes/v1/api/KubernetesApiConverter.groovy → ...etes/v1/api/KubernetesApiConverter.groovy
diff --git a/.../v1/api/KubernetesClientApiAdapter.groovy → .../v1/api/KubernetesClientApiAdapter.groovy b/.../v1/api/KubernetesClientApiAdapter.groovy → .../v1/api/KubernetesClientApiAdapter.groovy
diff --git a/...1/api/KubernetesClientApiConverter.groovy → ...1/api/KubernetesClientApiConverter.groovy b/...1/api/KubernetesClientApiConverter.groovy → ...1/api/KubernetesClientApiConverter.groovy
diff --git a/...iver/kubernetes/v1/api/SharedMutex.groovy → ...iver/kubernetes/v1/api/SharedMutex.groovy b/...iver/kubernetes/v1/api/SharedMutex.groovy → ...iver/kubernetes/v1/api/SharedMutex.groovy
diff --git a/...ddriver/kubernetes/v1/caching/Keys.groovy → ...ddriver/kubernetes/v1/caching/Keys.groovy b/...ddriver/kubernetes/v1/caching/Keys.groovy → ...ddriver/kubernetes/v1/caching/Keys.groovy
diff --git a/...1/deploy/KubernetesJobNameResolver.groovy → ...1/deploy/KubernetesJobNameResolver.groovy b/...1/deploy/KubernetesJobNameResolver.groovy → ...1/deploy/KubernetesJobNameResolver.groovy
diff --git a/.../KubernetesServerGroupNameResolver.groovy → .../KubernetesServerGroupNameResolver.groovy b/.../KubernetesServerGroupNameResolver.groovy → .../KubernetesServerGroupNameResolver.groovy
diff --git a/...ubernetes/v1/deploy/KubernetesUtil.groovy → ...ubernetes/v1/deploy/KubernetesUtil.groovy b/...ubernetes/v1/deploy/KubernetesUtil.groovy → ...ubernetes/v1/deploy/KubernetesUtil.groovy
diff --git a/...AutoscalerAtomicOperationConverter.groovy → ...AutoscalerAtomicOperationConverter.groovy b/...AutoscalerAtomicOperationConverter.groovy → ...AutoscalerAtomicOperationConverter.groovy
diff --git a/...KubernetesAtomicOperationConverter.groovy → ...KubernetesAtomicOperationConverter.groovy b/...KubernetesAtomicOperationConverter.groovy → ...KubernetesAtomicOperationConverter.groovy
diff --git a/...KubernetesAtomicOperationConverter.groovy → ...KubernetesAtomicOperationConverter.groovy b/...KubernetesAtomicOperationConverter.groovy → ...KubernetesAtomicOperationConverter.groovy
diff --git a/...sInstancesAtomicOperationConverter.groovy → ...sInstancesAtomicOperationConverter.groovy b/...sInstancesAtomicOperationConverter.groovy → ...sInstancesAtomicOperationConverter.groovy
diff --git a/...ernetesJobAtomicOperationConverter.groovy → ...ernetesJobAtomicOperationConverter.groovy b/...ernetesJobAtomicOperationConverter.groovy → ...ernetesJobAtomicOperationConverter.groovy
diff --git a/...ernetesJobAtomicOperationConverter.groovy → ...ernetesJobAtomicOperationConverter.groovy b/...ernetesJobAtomicOperationConverter.groovy → ...ernetesJobAtomicOperationConverter.groovy
diff --git a/...ernetesJobAtomicOperationConverter.groovy → ...ernetesJobAtomicOperationConverter.groovy b/...ernetesJobAtomicOperationConverter.groovy → ...ernetesJobAtomicOperationConverter.groovy
diff --git a/...adBalancerAtomicOperationConverter.groovy → ...adBalancerAtomicOperationConverter.groovy b/...adBalancerAtomicOperationConverter.groovy → ...adBalancerAtomicOperationConverter.groovy
diff --git a/...adBalancerAtomicOperationConverter.groovy → ...adBalancerAtomicOperationConverter.groovy b/...adBalancerAtomicOperationConverter.groovy → ...adBalancerAtomicOperationConverter.groovy
diff --git a/...urityGroupAtomicOperationConverter.groovy → ...urityGroupAtomicOperationConverter.groovy b/...urityGroupAtomicOperationConverter.groovy → ...urityGroupAtomicOperationConverter.groovy
diff --git a/...rtKubernetesSecurityGroupConverter.groovy → ...rtKubernetesSecurityGroupConverter.groovy b/...rtKubernetesSecurityGroupConverter.groovy → ...rtKubernetesSecurityGroupConverter.groovy
diff --git a/...KubernetesAtomicOperationConverter.groovy → ...KubernetesAtomicOperationConverter.groovy b/...KubernetesAtomicOperationConverter.groovy → ...KubernetesAtomicOperationConverter.groovy
diff --git a/...KubernetesAtomicOperationConverter.groovy → ...KubernetesAtomicOperationConverter.groovy b/...KubernetesAtomicOperationConverter.groovy → ...KubernetesAtomicOperationConverter.groovy
diff --git a/...KubernetesAtomicOperationConverter.groovy → ...KubernetesAtomicOperationConverter.groovy b/...KubernetesAtomicOperationConverter.groovy → ...KubernetesAtomicOperationConverter.groovy
diff --git a/...KubernetesAtomicOperationConverter.groovy → ...KubernetesAtomicOperationConverter.groovy b/...KubernetesAtomicOperationConverter.groovy → ...KubernetesAtomicOperationConverter.groovy
diff --git a/...KubernetesAtomicOperationConverter.groovy → ...KubernetesAtomicOperationConverter.groovy b/...KubernetesAtomicOperationConverter.groovy → ...KubernetesAtomicOperationConverter.groovy
diff --git a/...KubernetesAtomicOperationConverter.groovy → ...KubernetesAtomicOperationConverter.groovy b/...KubernetesAtomicOperationConverter.groovy → ...KubernetesAtomicOperationConverter.groovy
diff --git a/...etesKindAtomicOperationDescription.groovy → ...etesKindAtomicOperationDescription.groovy b/...etesKindAtomicOperationDescription.groovy → ...etesKindAtomicOperationDescription.groovy
diff --git a/...er/KubernetesAutoscalerDescription.groovy → ...er/KubernetesAutoscalerDescription.groovy b/...er/KubernetesAutoscalerDescription.groovy → ...er/KubernetesAutoscalerDescription.groovy
diff --git a/...bernetesAtomicOperationDescription.groovy → ...bernetesAtomicOperationDescription.groovy b/...bernetesAtomicOperationDescription.groovy → ...bernetesAtomicOperationDescription.groovy
diff --git a/...ance/KubernetesInstanceDescription.groovy → ...ance/KubernetesInstanceDescription.groovy b/...ance/KubernetesInstanceDescription.groovy → ...ance/KubernetesInstanceDescription.groovy
diff --git a/...netesJobAtomicOperationDescription.groovy → ...netesJobAtomicOperationDescription.groovy b/...netesJobAtomicOperationDescription.groovy → ...netesJobAtomicOperationDescription.groovy
diff --git a/...ption/job/KubernetesJobDescription.groovy → ...ption/job/KubernetesJobDescription.groovy b/...ption/job/KubernetesJobDescription.groovy → ...ption/job/KubernetesJobDescription.groovy
diff --git a/...on/job/RunKubernetesJobDescription.groovy → ...on/job/RunKubernetesJobDescription.groovy b/...on/job/RunKubernetesJobDescription.groovy → ...on/job/RunKubernetesJobDescription.groovy
diff --git a/...BalancerAtomicOperationDescription.groovy → ...BalancerAtomicOperationDescription.groovy b/...BalancerAtomicOperationDescription.groovy → ...BalancerAtomicOperationDescription.groovy
diff --git a/.../KubernetesLoadBalancerDescription.groovy → .../KubernetesLoadBalancerDescription.groovy b/.../KubernetesLoadBalancerDescription.groovy → .../KubernetesLoadBalancerDescription.groovy
diff --git a/...KubernetesSecurityGroupDescription.groovy → ...KubernetesSecurityGroupDescription.groovy b/...KubernetesSecurityGroupDescription.groovy → ...KubernetesSecurityGroupDescription.groovy
diff --git a/...KubernetesSecurityGroupDescription.groovy → ...KubernetesSecurityGroupDescription.groovy b/...KubernetesSecurityGroupDescription.groovy → ...KubernetesSecurityGroupDescription.groovy
diff --git a/...bernetesAtomicOperationDescription.groovy → ...bernetesAtomicOperationDescription.groovy b/...bernetesAtomicOperationDescription.groovy → ...bernetesAtomicOperationDescription.groovy
diff --git a/...bernetesAtomicOperationDescription.groovy → ...bernetesAtomicOperationDescription.groovy b/...bernetesAtomicOperationDescription.groovy → ...bernetesAtomicOperationDescription.groovy
diff --git a/...bernetesAtomicOperationDescription.groovy → ...bernetesAtomicOperationDescription.groovy b/...bernetesAtomicOperationDescription.groovy → ...bernetesAtomicOperationDescription.groovy
diff --git a/...p/KubernetesServerGroupDescription.groovy → ...p/KubernetesServerGroupDescription.groovy b/...p/KubernetesServerGroupDescription.groovy → ...p/KubernetesServerGroupDescription.groovy
diff --git a/...bernetesAtomicOperationDescription.groovy → ...bernetesAtomicOperationDescription.groovy b/...bernetesAtomicOperationDescription.groovy → ...bernetesAtomicOperationDescription.groovy
diff --git a/...KubernetesClientOperationException.groovy → ...KubernetesClientOperationException.groovy b/...KubernetesClientOperationException.groovy → ...KubernetesClientOperationException.groovy
diff --git a/...KubernetesIllegalArgumentException.groovy → ...KubernetesIllegalArgumentException.groovy b/...KubernetesIllegalArgumentException.groovy → ...KubernetesIllegalArgumentException.groovy
diff --git a/...ption/KubernetesOperationException.groovy → ...ption/KubernetesOperationException.groovy b/...ption/KubernetesOperationException.groovy → ...ption/KubernetesOperationException.groovy
diff --git a/...ubernetesResourceNotFoundException.groovy → ...ubernetesResourceNotFoundException.groovy b/...ubernetesResourceNotFoundException.groovy → ...ubernetesResourceNotFoundException.groovy
diff --git a/...ubernetesAutoscalerAtomicOperation.groovy → ...ubernetesAutoscalerAtomicOperation.groovy b/...ubernetesAutoscalerAtomicOperation.groovy → ...ubernetesAutoscalerAtomicOperation.groovy
diff --git a/...istrationKubernetesAtomicOperation.groovy → ...istrationKubernetesAtomicOperation.groovy b/...istrationKubernetesAtomicOperation.groovy → ...istrationKubernetesAtomicOperation.groovy
diff --git a/...eregisterKubernetesAtomicOperation.groovy → ...eregisterKubernetesAtomicOperation.groovy b/...eregisterKubernetesAtomicOperation.groovy → ...eregisterKubernetesAtomicOperation.groovy
diff --git a/.../RegisterKubernetesAtomicOperation.groovy → .../RegisterKubernetesAtomicOperation.groovy b/.../RegisterKubernetesAtomicOperation.groovy → .../RegisterKubernetesAtomicOperation.groovy
diff --git a/...KubernetesInstancesAtomicOperation.groovy → ...KubernetesInstancesAtomicOperation.groovy b/...KubernetesInstancesAtomicOperation.groovy → ...KubernetesInstancesAtomicOperation.groovy
diff --git a/.../CloneKubernetesJobAtomicOperation.groovy → .../CloneKubernetesJobAtomicOperation.groovy b/.../CloneKubernetesJobAtomicOperation.groovy → .../CloneKubernetesJobAtomicOperation.groovy
diff --git a/...estroyKubernetesJobAtomicOperation.groovy → ...estroyKubernetesJobAtomicOperation.groovy b/...estroyKubernetesJobAtomicOperation.groovy → ...estroyKubernetesJobAtomicOperation.groovy
diff --git a/...ob/RunKubernetesJobAtomicOperation.groovy → ...ob/RunKubernetesJobAtomicOperation.groovy b/...ob/RunKubernetesJobAtomicOperation.groovy → ...ob/RunKubernetesJobAtomicOperation.groovy
diff --git a/...ernetesLoadBalancerAtomicOperation.groovy → ...ernetesLoadBalancerAtomicOperation.groovy b/...ernetesLoadBalancerAtomicOperation.groovy → ...ernetesLoadBalancerAtomicOperation.groovy
diff --git a/...ernetesLoadBalancerAtomicOperation.groovy → ...ernetesLoadBalancerAtomicOperation.groovy b/...ernetesLoadBalancerAtomicOperation.groovy → ...ernetesLoadBalancerAtomicOperation.groovy
diff --git a/...rnetesSecurityGroupAtomicOperation.groovy → ...rnetesSecurityGroupAtomicOperation.groovy b/...rnetesSecurityGroupAtomicOperation.groovy → ...rnetesSecurityGroupAtomicOperation.groovy
diff --git a/...rnetesSecurityGroupAtomicOperation.groovy → ...rnetesSecurityGroupAtomicOperation.groovy b/...rnetesSecurityGroupAtomicOperation.groovy → ...rnetesSecurityGroupAtomicOperation.groovy
diff --git a/...leDisableKubernetesAtomicOperation.groovy → ...leDisableKubernetesAtomicOperation.groovy b/...leDisableKubernetesAtomicOperation.groovy → ...leDisableKubernetesAtomicOperation.groovy
diff --git a/...oup/CloneKubernetesAtomicOperation.groovy → ...oup/CloneKubernetesAtomicOperation.groovy b/...oup/CloneKubernetesAtomicOperation.groovy → ...oup/CloneKubernetesAtomicOperation.groovy
diff --git a/...up/DeployKubernetesAtomicOperation.groovy → ...up/DeployKubernetesAtomicOperation.groovy b/...up/DeployKubernetesAtomicOperation.groovy → ...up/DeployKubernetesAtomicOperation.groovy
diff --git a/...p/DestroyKubernetesAtomicOperation.groovy → ...p/DestroyKubernetesAtomicOperation.groovy b/...p/DestroyKubernetesAtomicOperation.groovy → ...p/DestroyKubernetesAtomicOperation.groovy
diff --git a/...p/DisableKubernetesAtomicOperation.groovy → ...p/DisableKubernetesAtomicOperation.groovy b/...p/DisableKubernetesAtomicOperation.groovy → ...p/DisableKubernetesAtomicOperation.groovy
diff --git a/...up/EnableKubernetesAtomicOperation.groovy → ...up/EnableKubernetesAtomicOperation.groovy b/...up/EnableKubernetesAtomicOperation.groovy → ...up/EnableKubernetesAtomicOperation.groovy
diff --git a/...up/ResizeKubernetesAtomicOperation.groovy → ...up/ResizeKubernetesAtomicOperation.groovy b/...up/ResizeKubernetesAtomicOperation.groovy → ...up/ResizeKubernetesAtomicOperation.groovy
diff --git a/...ators/KubernetesContainerValidator.groovy → ...ators/KubernetesContainerValidator.groovy b/...ators/KubernetesContainerValidator.groovy → ...ators/KubernetesContainerValidator.groovy
diff --git a/...rs/KubernetesVolumeSourceValidator.groovy → ...rs/KubernetesVolumeSourceValidator.groovy b/...rs/KubernetesVolumeSourceValidator.groovy → ...rs/KubernetesVolumeSourceValidator.groovy
diff --git a/...andardKubernetesAttributeValidator.groovy → ...andardKubernetesAttributeValidator.groovy b/...andardKubernetesAttributeValidator.groovy → ...andardKubernetesAttributeValidator.groovy
diff --git a/...etesAutoscalerDescriptionValidator.groovy → ...etesAutoscalerDescriptionValidator.groovy b/...etesAutoscalerDescriptionValidator.groovy → ...etesAutoscalerDescriptionValidator.groovy
diff --git a/...sInstancesAtomicOperationValidator.groovy → ...sInstancesAtomicOperationValidator.groovy b/...sInstancesAtomicOperationValidator.groovy → ...sInstancesAtomicOperationValidator.groovy
diff --git a/...KubernetesAtomicOperationValidator.groovy → ...KubernetesAtomicOperationValidator.groovy b/...KubernetesAtomicOperationValidator.groovy → ...KubernetesAtomicOperationValidator.groovy
diff --git a/...KubernetesAtomicOperationValidator.groovy → ...KubernetesAtomicOperationValidator.groovy b/...KubernetesAtomicOperationValidator.groovy → ...KubernetesAtomicOperationValidator.groovy
diff --git a/...KubernetesAtomicOperationValidator.groovy → ...KubernetesAtomicOperationValidator.groovy b/...KubernetesAtomicOperationValidator.groovy → ...KubernetesAtomicOperationValidator.groovy
diff --git a/...sInstancesAtomicOperationValidator.groovy → ...sInstancesAtomicOperationValidator.groovy b/...sInstancesAtomicOperationValidator.groovy → ...sInstancesAtomicOperationValidator.groovy
diff --git a/...ernetesJobAtomicOperationValidator.groovy → ...ernetesJobAtomicOperationValidator.groovy b/...ernetesJobAtomicOperationValidator.groovy → ...ernetesJobAtomicOperationValidator.groovy
diff --git a/...ernetesJobAtomicOperationValidator.groovy → ...ernetesJobAtomicOperationValidator.groovy b/...ernetesJobAtomicOperationValidator.groovy → ...ernetesJobAtomicOperationValidator.groovy
diff --git a/.../KubernetesJobDescriptionValidator.groovy → .../KubernetesJobDescriptionValidator.groovy b/.../KubernetesJobDescriptionValidator.groovy → .../KubernetesJobDescriptionValidator.groovy
diff --git a/...ernetesJobAtomicOperationValidator.groovy → ...ernetesJobAtomicOperationValidator.groovy b/...ernetesJobAtomicOperationValidator.groovy → ...ernetesJobAtomicOperationValidator.groovy
diff --git a/...adBalancerAtomicOperationValidator.groovy → ...adBalancerAtomicOperationValidator.groovy b/...adBalancerAtomicOperationValidator.groovy → ...adBalancerAtomicOperationValidator.groovy
diff --git a/...adBalancerAtomicOperationValidator.groovy → ...adBalancerAtomicOperationValidator.groovy b/...adBalancerAtomicOperationValidator.groovy → ...adBalancerAtomicOperationValidator.groovy
diff --git a/...urityGroupAtomicOperationValidator.groovy → ...urityGroupAtomicOperationValidator.groovy b/...urityGroupAtomicOperationValidator.groovy → ...urityGroupAtomicOperationValidator.groovy
diff --git a/...rtKubernetesSecurityGroupValidator.groovy → ...rtKubernetesSecurityGroupValidator.groovy b/...rtKubernetesSecurityGroupValidator.groovy → ...rtKubernetesSecurityGroupValidator.groovy
diff --git a/...KubernetesAtomicOperationValidator.groovy → ...KubernetesAtomicOperationValidator.groovy b/...KubernetesAtomicOperationValidator.groovy → ...KubernetesAtomicOperationValidator.groovy
diff --git a/...KubernetesAtomicOperationValidator.groovy → ...KubernetesAtomicOperationValidator.groovy b/...KubernetesAtomicOperationValidator.groovy → ...KubernetesAtomicOperationValidator.groovy
diff --git a/...KubernetesAtomicOperationValidator.groovy → ...KubernetesAtomicOperationValidator.groovy b/...KubernetesAtomicOperationValidator.groovy → ...KubernetesAtomicOperationValidator.groovy
diff --git a/...KubernetesAtomicOperationValidator.groovy → ...KubernetesAtomicOperationValidator.groovy b/...KubernetesAtomicOperationValidator.groovy → ...KubernetesAtomicOperationValidator.groovy
diff --git a/...KubernetesAtomicOperationValidator.groovy → ...KubernetesAtomicOperationValidator.groovy b/...KubernetesAtomicOperationValidator.groovy → ...KubernetesAtomicOperationValidator.groovy
diff --git a/...KubernetesAtomicOperationValidator.groovy → ...KubernetesAtomicOperationValidator.groovy b/...KubernetesAtomicOperationValidator.groovy → ...KubernetesAtomicOperationValidator.groovy
diff --git a/...tesServerGroupDescriptionValidator.groovy → ...tesServerGroupDescriptionValidator.groovy b/...tesServerGroupDescriptionValidator.groovy → ...tesServerGroupDescriptionValidator.groovy
diff --git a/...KubernetesAtomicOperationValidator.groovy → ...KubernetesAtomicOperationValidator.groovy b/...KubernetesAtomicOperationValidator.groovy → ...KubernetesAtomicOperationValidator.groovy
diff --git a/...1/model/KubernetesAutoscalerStatus.groovy → ...1/model/KubernetesAutoscalerStatus.groovy b/...1/model/KubernetesAutoscalerStatus.groovy → ...1/model/KubernetesAutoscalerStatus.groovy
diff --git a/...odel/KubernetesControllerConverter.groovy → ...odel/KubernetesControllerConverter.groovy b/...odel/KubernetesControllerConverter.groovy → ...odel/KubernetesControllerConverter.groovy
diff --git a/...1/model/KubernetesDeploymentStatus.groovy → ...1/model/KubernetesDeploymentStatus.groovy b/...1/model/KubernetesDeploymentStatus.groovy → ...1/model/KubernetesDeploymentStatus.groovy
diff --git a/...ubernetes/v1/model/KubernetesEvent.groovy → ...ubernetes/v1/model/KubernetesEvent.groovy b/...ubernetes/v1/model/KubernetesEvent.groovy → ...ubernetes/v1/model/KubernetesEvent.groovy
diff --git a/...es/v1/model/KubernetesImageSummary.groovy → ...es/v1/model/KubernetesImageSummary.groovy b/...es/v1/model/KubernetesImageSummary.groovy → ...es/v1/model/KubernetesImageSummary.groovy
diff --git a/...netes/v1/model/KubernetesJobStatus.groovy → ...netes/v1/model/KubernetesJobStatus.groovy b/...netes/v1/model/KubernetesJobStatus.groovy → ...netes/v1/model/KubernetesJobStatus.groovy
diff --git a/...s/v1/model/KubernetesV1Application.groovy → ...s/v1/model/KubernetesV1Application.groovy b/...s/v1/model/KubernetesV1Application.groovy → ...s/v1/model/KubernetesV1Application.groovy
diff --git a/...netes/v1/model/KubernetesV1Cluster.groovy → ...netes/v1/model/KubernetesV1Cluster.groovy b/...netes/v1/model/KubernetesV1Cluster.groovy → ...netes/v1/model/KubernetesV1Cluster.groovy
diff --git a/...rnetes/v1/model/KubernetesV1Health.groovy → ...rnetes/v1/model/KubernetesV1Health.groovy b/...rnetes/v1/model/KubernetesV1Health.groovy → ...rnetes/v1/model/KubernetesV1Health.groovy
diff --git a/...etes/v1/model/KubernetesV1Instance.groovy → ...etes/v1/model/KubernetesV1Instance.groovy b/...etes/v1/model/KubernetesV1Instance.groovy → ...etes/v1/model/KubernetesV1Instance.groovy
diff --git a/.../v1/model/KubernetesV1LoadBalancer.groovy → .../v1/model/KubernetesV1LoadBalancer.groovy b/.../v1/model/KubernetesV1LoadBalancer.groovy → .../v1/model/KubernetesV1LoadBalancer.groovy
diff --git a/...v1/model/KubernetesV1SecurityGroup.groovy → ...v1/model/KubernetesV1SecurityGroup.groovy b/...v1/model/KubernetesV1SecurityGroup.groovy → ...v1/model/KubernetesV1SecurityGroup.groovy
diff --git a/...l/KubernetesV1SecurityGroupSummary.groovy → ...l/KubernetesV1SecurityGroupSummary.groovy b/...l/KubernetesV1SecurityGroupSummary.groovy → ...l/KubernetesV1SecurityGroupSummary.groovy
diff --git a/...s/v1/model/KubernetesV1ServerGroup.groovy → ...s/v1/model/KubernetesV1ServerGroup.groovy b/...s/v1/model/KubernetesV1ServerGroup.groovy → ...s/v1/model/KubernetesV1ServerGroup.groovy
diff --git a/...s/v1/provider/KubernetesV1Provider.groovy → ...s/v1/provider/KubernetesV1Provider.groovy b/...s/v1/provider/KubernetesV1Provider.groovy → ...s/v1/provider/KubernetesV1Provider.groovy
diff --git a/...r/KubernetesV1ProviderSynchronizable.java → ...r/KubernetesV1ProviderSynchronizable.java b/...r/KubernetesV1ProviderSynchronizable.java → ...r/KubernetesV1ProviderSynchronizable.java
diff --git a/...nt/KubernetesConfigMapCachingAgent.groovy → ...nt/KubernetesConfigMapCachingAgent.groovy b/...nt/KubernetesConfigMapCachingAgent.groovy → ...nt/KubernetesConfigMapCachingAgent.groovy
diff --git a/.../KubernetesControllersCachingAgent.groovy → .../KubernetesControllersCachingAgent.groovy b/.../KubernetesControllersCachingAgent.groovy → .../KubernetesControllersCachingAgent.groovy
diff --git a/...t/KubernetesDeploymentCachingAgent.groovy → ...t/KubernetesDeploymentCachingAgent.groovy b/...t/KubernetesDeploymentCachingAgent.groovy → ...t/KubernetesDeploymentCachingAgent.groovy
diff --git a/...ent/KubernetesInstanceCachingAgent.groovy → ...ent/KubernetesInstanceCachingAgent.groovy b/...ent/KubernetesInstanceCachingAgent.groovy → ...ent/KubernetesInstanceCachingAgent.groovy
diff --git a/...KubernetesLoadBalancerCachingAgent.groovy → ...KubernetesLoadBalancerCachingAgent.groovy b/...KubernetesLoadBalancerCachingAgent.groovy → ...KubernetesLoadBalancerCachingAgent.groovy
diff --git a/...agent/KubernetesSecretCachingAgent.groovy → ...agent/KubernetesSecretCachingAgent.groovy b/...agent/KubernetesSecretCachingAgent.groovy → ...agent/KubernetesSecretCachingAgent.groovy
diff --git a/...ubernetesSecurityGroupCachingAgent.groovy → ...ubernetesSecurityGroupCachingAgent.groovy b/...ubernetesSecurityGroupCachingAgent.groovy → ...ubernetesSecurityGroupCachingAgent.groovy
diff --git a/.../KubernetesServerGroupCachingAgent.groovy → .../KubernetesServerGroupCachingAgent.groovy b/.../KubernetesServerGroupCachingAgent.groovy → .../KubernetesServerGroupCachingAgent.groovy
diff --git a/...bernetesServiceAccountCachingAgent.groovy → ...bernetesServiceAccountCachingAgent.groovy b/...bernetesServiceAccountCachingAgent.groovy → ...bernetesServiceAccountCachingAgent.groovy
diff --git a/...vider/agent/KubernetesV1CachingAgent.java → ...vider/agent/KubernetesV1CachingAgent.java b/...vider/agent/KubernetesV1CachingAgent.java → ...vider/agent/KubernetesV1CachingAgent.java
diff --git a/...KubernetesV1CachingAgentDispatcher.groovy → ...KubernetesV1CachingAgentDispatcher.groovy b/...KubernetesV1CachingAgentDispatcher.groovy → ...KubernetesV1CachingAgentDispatcher.groovy
diff --git a/...rovider/view/KubernetesJobProvider.groovy → ...rovider/view/KubernetesJobProvider.groovy b/...rovider/view/KubernetesJobProvider.groovy → ...rovider/view/KubernetesJobProvider.groovy
diff --git a/...vider/view/KubernetesProviderUtils.groovy → ...vider/view/KubernetesProviderUtils.groovy b/...vider/view/KubernetesProviderUtils.groovy → ...vider/view/KubernetesProviderUtils.groovy
diff --git a/...ew/KubernetesV1ApplicationProvider.groovy → ...ew/KubernetesV1ApplicationProvider.groovy b/...ew/KubernetesV1ApplicationProvider.groovy → ...ew/KubernetesV1ApplicationProvider.groovy
diff --git a/...r/view/KubernetesV1ClusterProvider.groovy → ...r/view/KubernetesV1ClusterProvider.groovy b/...r/view/KubernetesV1ClusterProvider.groovy → ...r/view/KubernetesV1ClusterProvider.groovy
diff --git a/.../view/KubernetesV1InstanceProvider.groovy → .../view/KubernetesV1InstanceProvider.groovy b/.../view/KubernetesV1InstanceProvider.groovy → .../view/KubernetesV1InstanceProvider.groovy
diff --git a/...w/KubernetesV1LoadBalancerProvider.groovy → ...w/KubernetesV1LoadBalancerProvider.groovy b/...w/KubernetesV1LoadBalancerProvider.groovy → ...w/KubernetesV1LoadBalancerProvider.groovy
diff --git a/.../KubernetesV1SecurityGroupProvider.groovy → .../KubernetesV1SecurityGroupProvider.groovy b/.../KubernetesV1SecurityGroupProvider.groovy → .../KubernetesV1SecurityGroupProvider.groovy
diff --git a/.../v1/provider/view/MutableCacheData.groovy → .../v1/provider/view/MutableCacheData.groovy b/.../v1/provider/view/MutableCacheData.groovy → .../v1/provider/view/MutableCacheData.groovy
diff --git a/...security/KubernetesApiClientConfig.groovy → ...security/KubernetesApiClientConfig.groovy b/...security/KubernetesApiClientConfig.groovy → ...security/KubernetesApiClientConfig.groovy
diff --git a/...v1/security/KubernetesConfigParser.groovy → ...v1/security/KubernetesConfigParser.groovy b/...v1/security/KubernetesConfigParser.groovy → ...v1/security/KubernetesConfigParser.groovy
diff --git a/.../v1/security/KubernetesV1Credentials.java → .../v1/security/KubernetesV1Credentials.java b/.../v1/security/KubernetesV1Credentials.java → .../v1/security/KubernetesV1Credentials.java
diff --git a/...naker/config/KubernetesConfiguration.java → ...ker/config/KubernetesV1Configuration.java b/...naker/config/KubernetesConfiguration.java → ...ker/config/KubernetesV1Configuration.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Google, Inc.
+ * Copyright 2019 Google, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License")
  * you may not use this file except in compliance with the License.
@@ -18,18 +18,15 @@
 import com.netflix.spinnaker.cats.module.CatsModule;
 import com.netflix.spinnaker.clouddriver.kubernetes.KubernetesCloudProvider;
 import com.netflix.spinnaker.clouddriver.kubernetes.config.KubernetesConfigurationProperties;
-import com.netflix.spinnaker.clouddriver.kubernetes.health.KubernetesHealthIndicator;
 import com.netflix.spinnaker.clouddriver.kubernetes.v1.deploy.KubernetesUtil;
 import com.netflix.spinnaker.clouddriver.kubernetes.v1.provider.KubernetesV1Provider;
 import com.netflix.spinnaker.clouddriver.kubernetes.v1.provider.KubernetesV1ProviderSynchronizable;
 import com.netflix.spinnaker.clouddriver.kubernetes.v1.provider.agent.KubernetesV1CachingAgentDispatcher;
 import com.netflix.spinnaker.clouddriver.kubernetes.v1.security.KubernetesV1Credentials;
-import com.netflix.spinnaker.clouddriver.security.AccountCredentialsProvider;
 import com.netflix.spinnaker.clouddriver.security.AccountCredentialsRepository;
 import java.util.Collections;
 import java.util.concurrent.ConcurrentHashMap;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
@@ -41,19 +38,7 @@
 @EnableScheduling
 @ConditionalOnProperty("kubernetes.enabled")
 @ComponentScan({"com.netflix.spinnaker.clouddriver.kubernetes"})
-public class KubernetesConfiguration {
-  @Bean
-  @ConfigurationProperties("kubernetes")
-  public KubernetesConfigurationProperties kubernetesConfigurationProperties() {
-    return new KubernetesConfigurationProperties();
-  }
-
-  @Bean
-  public KubernetesHealthIndicator kubernetesHealthIndicator(
-      AccountCredentialsProvider accountCredentialsProvider) {
-    return new KubernetesHealthIndicator(accountCredentialsProvider);
-  }
-
+public class KubernetesV1Configuration {
   @Bean
   public KubernetesUtil kubernetesUtil() {
     return new KubernetesUtil();

diff --git a/...lancerAtomicOperationConverterSpec.groovy → ...lancerAtomicOperationConverterSpec.groovy b/...lancerAtomicOperationConverterSpec.groovy → ...lancerAtomicOperationConverterSpec.groovy
diff --git a/...rnetesAtomicOperationConverterSpec.groovy → ...rnetesAtomicOperationConverterSpec.groovy b/...rnetesAtomicOperationConverterSpec.groovy → ...rnetesAtomicOperationConverterSpec.groovy
diff --git a/...rnetesAtomicOperationConverterSpec.groovy → ...rnetesAtomicOperationConverterSpec.groovy b/...rnetesAtomicOperationConverterSpec.groovy → ...rnetesAtomicOperationConverterSpec.groovy
diff --git a/...s/v1/deploy/ops/KubernetesUtilSpec.groovy → ...s/v1/deploy/ops/KubernetesUtilSpec.groovy b/...s/v1/deploy/ops/KubernetesUtilSpec.groovy → ...s/v1/deploy/ops/KubernetesUtilSpec.groovy
diff --git a/...tesLoadBalancerAtomicOperationSpec.groovy → ...tesLoadBalancerAtomicOperationSpec.groovy b/...tesLoadBalancerAtomicOperationSpec.groovy → ...tesLoadBalancerAtomicOperationSpec.groovy
diff --git a/...V1SecurityGroupAtomicOperationSpec.groovy → ...V1SecurityGroupAtomicOperationSpec.groovy b/...V1SecurityGroupAtomicOperationSpec.groovy → ...V1SecurityGroupAtomicOperationSpec.groovy
diff --git a/...CloneKubernetesAtomicOperationSpec.groovy → ...CloneKubernetesAtomicOperationSpec.groovy b/...CloneKubernetesAtomicOperationSpec.groovy → ...CloneKubernetesAtomicOperationSpec.groovy
diff --git a/...eployKubernetesAtomicOperationSpec.groovy → ...eployKubernetesAtomicOperationSpec.groovy b/...eployKubernetesAtomicOperationSpec.groovy → ...eployKubernetesAtomicOperationSpec.groovy
diff --git a/...rdKubernetesAttributeValidatorSpec.groovy → ...rdKubernetesAttributeValidatorSpec.groovy b/...rdKubernetesAttributeValidatorSpec.groovy → ...rdKubernetesAttributeValidatorSpec.groovy
diff --git a/...lancerAtomicOperationValidatorSpec.groovy → ...lancerAtomicOperationValidatorSpec.groovy b/...lancerAtomicOperationValidatorSpec.groovy → ...lancerAtomicOperationValidatorSpec.groovy
diff --git a/...rnetesAtomicOperationValidatorSpec.groovy → ...rnetesAtomicOperationValidatorSpec.groovy b/...rnetesAtomicOperationValidatorSpec.groovy → ...rnetesAtomicOperationValidatorSpec.groovy
diff --git a/...rnetesAtomicOperationValidatorSpec.groovy → ...rnetesAtomicOperationValidatorSpec.groovy b/...rnetesAtomicOperationValidatorSpec.groovy → ...rnetesAtomicOperationValidatorSpec.groovy
diff --git a/...es/v1/model/KubernetesInstanceSpec.groovy → ...es/v1/model/KubernetesInstanceSpec.groovy b/...es/v1/model/KubernetesInstanceSpec.groovy → ...es/v1/model/KubernetesInstanceSpec.groovy
diff --git a/...v1/model/KubernetesServerGroupSpec.groovy → ...v1/model/KubernetesServerGroupSpec.groovy b/...v1/model/KubernetesServerGroupSpec.groovy → ...v1/model/KubernetesServerGroupSpec.groovy
diff --git a/...rnetesV1ProviderSynchronizableSpec.groovy → ...rnetesV1ProviderSynchronizableSpec.groovy b/...rnetesV1ProviderSynchronizableSpec.groovy → ...rnetesV1ProviderSynchronizableSpec.groovy
diff --git a/...KubernetesInstanceCachingAgentSpec.groovy → ...KubernetesInstanceCachingAgentSpec.groovy b/...KubernetesInstanceCachingAgentSpec.groovy → ...KubernetesInstanceCachingAgentSpec.groovy
diff --git a/...rnetesLoadBalancerCachingAgentSpec.groovy → ...rnetesLoadBalancerCachingAgentSpec.groovy b/...rnetesLoadBalancerCachingAgentSpec.groovy → ...rnetesLoadBalancerCachingAgentSpec.groovy
diff --git a/...ernetesServerGroupCachingAgentSpec.groovy → ...ernetesServerGroupCachingAgentSpec.groovy b/...ernetesServerGroupCachingAgentSpec.groovy → ...ernetesServerGroupCachingAgentSpec.groovy
diff --git a/...tesV1SecurityGroupCachingAgentSpec.groovy → ...tesV1SecurityGroupCachingAgentSpec.groovy b/...tesV1SecurityGroupCachingAgentSpec.groovy → ...tesV1SecurityGroupCachingAgentSpec.groovy
diff --git a/...ecurity/KubernetesConfigParserSpec.groovy → ...ecurity/KubernetesConfigParserSpec.groovy b/...ecurity/KubernetesConfigParserSpec.groovy → ...ecurity/KubernetesConfigParserSpec.groovy
diff --git a/...curity/KubernetesV1CredentialsSpec.groovy → ...curity/KubernetesV1CredentialsSpec.groovy b/...curity/KubernetesV1CredentialsSpec.groovy → ...curity/KubernetesV1CredentialsSpec.groovy
diff --git a/...flix/spinnaker/clouddriver/kubernetes/v2/description/KubernetesAccountResolverSpec.groovy b/...flix/spinnaker/clouddriver/kubernetes/v2/description/KubernetesAccountResolverSpec.groovy
@@ -16,8 +16,8 @@
 
 package com.netflix.spinnaker.clouddriver.kubernetes.v2.description
 
+import com.netflix.spinnaker.clouddriver.kubernetes.security.KubernetesCredentials
 import com.netflix.spinnaker.clouddriver.kubernetes.security.KubernetesNamedAccountCredentials
-import com.netflix.spinnaker.clouddriver.kubernetes.v1.security.KubernetesV1Credentials
 import com.netflix.spinnaker.clouddriver.kubernetes.v2.description.manifest.KubernetesKindRegistry
 import com.netflix.spinnaker.clouddriver.kubernetes.v2.security.KubernetesV2Credentials
 import com.netflix.spinnaker.clouddriver.security.AccountCredentials
@@ -51,7 +51,7 @@ class KubernetesAccountResolverSpec extends Specification {
 
     then:
     1 * credentialsRepository.getOne(ACCOUNT_NAME) >> Mock(KubernetesNamedAccountCredentials) {
-      getCredentials() >> Mock(KubernetesV1Credentials)
+      getCredentials() >> Mock(KubernetesCredentials)
     }
     !credentials.isPresent()
 
@@ -92,7 +92,7 @@ class KubernetesAccountResolverSpec extends Specification {
 
     then:
     1 * credentialsRepository.getOne(ACCOUNT_NAME) >> Mock(KubernetesNamedAccountCredentials) {
-      getCredentials() >> Mock(KubernetesV1Credentials)
+      getCredentials() >> Mock(KubernetesCredentials)
     }
     registry == globalResourcePropertyRegistry
 
@@ -101,7 +101,7 @@ class KubernetesAccountResolverSpec extends Specification {
 
     then:
     1 * credentialsRepository.getOne(ACCOUNT_NAME) >> Mock(AccountCredentials) {
-      getCredentials() >> Mock(KubernetesV1Credentials)
+      getCredentials() >> Mock(KubernetesCredentials)
     }
     registry == globalResourcePropertyRegistry
 
@@ -136,7 +136,7 @@ class KubernetesAccountResolverSpec extends Specification {
 
     then:
     1 * credentialsRepository.getOne(ACCOUNT_NAME) >> Mock(KubernetesNamedAccountCredentials) {
-      getCredentials() >> Mock(KubernetesV1Credentials)
+      getCredentials() >> Mock(KubernetesCredentials)
     }
     1 * kindRegistryFactory.create() >> v2KindRegistry
     registry == v2KindRegistry
@@ -146,7 +146,7 @@ class KubernetesAccountResolverSpec extends Specification {
 
     then:
     1 * credentialsRepository.getOne(ACCOUNT_NAME) >> Mock(AccountCredentials) {
-      getCredentials() >> Mock(KubernetesV1Credentials)
+      getCredentials() >> Mock(KubernetesCredentials)
     }
     1 * kindRegistryFactory.create() >> v2KindRegistry
     registry == v2KindRegistry

diff --git a/clouddriver-kubernetes/clouddriver-kubernetes.gradle b/clouddriver-kubernetes/clouddriver-kubernetes.gradle
@@ -1,7 +1,9 @@
+tasks.compileGroovy.enabled = false
+sourceSets.main.java.srcDirs = ['src/main/java']
+
 dependencies {
   implementation project(":clouddriver-core")
   implementation project(":cats:cats-core")
-  implementation project(":clouddriver-docker")
   implementation project(":clouddriver-security")
 
   compileOnly "org.projectlombok:lombok"
@@ -10,14 +12,12 @@ dependencies {
 
   implementation "org.codehaus.groovy:groovy-all"
 
-  implementation "com.github.fge:json-patch:1.9"
-  implementation "com.netflix.frigga:frigga"
-  implementation "com.netflix.spinnaker.fiat:fiat-api:$fiatVersion"
+  implementation "com.google.code.findbugs:jsr305"
+  implementation "com.google.guava:guava"
+  implementation "com.netflix.spectator:spectator-api"
   implementation "com.netflix.spinnaker.fiat:fiat-core:$fiatVersion"
   implementation "com.netflix.spinnaker.kork:kork-config"
-  implementation "com.netflix.spinnaker.moniker:moniker"
-  implementation "io.fabric8:kubernetes-client:4.1.1"
-  implementation "io.kubernetes:client-java:5.0.0"
+  implementation "org.apache.commons:commons-lang3"
   implementation "org.springframework.boot:spring-boot-actuator"
   implementation "org.springframework.boot:spring-boot-starter-web"
 

diff --git a/...r/kubernetes/KubernetesCloudProvider.java → ...r/kubernetes/KubernetesCloudProvider.java b/...r/kubernetes/KubernetesCloudProvider.java → ...r/kubernetes/KubernetesCloudProvider.java
diff --git a/...river/kubernetes/KubernetesOperation.java → ...river/kubernetes/KubernetesOperation.java b/...river/kubernetes/KubernetesOperation.java → ...river/kubernetes/KubernetesOperation.java
diff --git a/...netes/caching/KubernetesCachingAgent.java → ...netes/caching/KubernetesCachingAgent.java b/...netes/caching/KubernetesCachingAgent.java → ...netes/caching/KubernetesCachingAgent.java
diff --git a/...ing/KubernetesCachingAgentDispatcher.java → ...ing/KubernetesCachingAgentDispatcher.java b/...ing/KubernetesCachingAgentDispatcher.java → ...ing/KubernetesCachingAgentDispatcher.java
diff --git a/...etes/config/CustomKubernetesResource.java → ...etes/config/CustomKubernetesResource.java b/...etes/config/CustomKubernetesResource.java → ...etes/config/CustomKubernetesResource.java
diff --git a/...netes/config/KubernetesCachingPolicy.java → ...netes/config/KubernetesCachingPolicy.java b/...netes/config/KubernetesCachingPolicy.java → ...netes/config/KubernetesCachingPolicy.java
diff --git a/...ig/KubernetesConfigurationProperties.java → ...ig/KubernetesConfigurationProperties.java b/...ig/KubernetesConfigurationProperties.java → ...ig/KubernetesConfigurationProperties.java
diff --git a/...ig/LinkedDockerRegistryConfiguration.java → ...ig/LinkedDockerRegistryConfiguration.java b/...ig/LinkedDockerRegistryConfiguration.java → ...ig/LinkedDockerRegistryConfiguration.java
diff --git a/...rnetesAtomicOperationConverterHelper.java → ...rnetesAtomicOperationConverterHelper.java b/...rnetesAtomicOperationConverterHelper.java → ...rnetesAtomicOperationConverterHelper.java
diff --git a/...KubernetesAtomicOperationDescription.java → ...KubernetesAtomicOperationDescription.java b/...KubernetesAtomicOperationDescription.java → ...KubernetesAtomicOperationDescription.java
diff --git a/...kubernetes/description/SpinnakerKind.java → ...kubernetes/description/SpinnakerKind.java b/...kubernetes/description/SpinnakerKind.java → ...kubernetes/description/SpinnakerKind.java
diff --git a/...tes/health/KubernetesHealthIndicator.java → ...tes/health/KubernetesHealthIndicator.java b/...tes/health/KubernetesHealthIndicator.java → ...tes/health/KubernetesHealthIndicator.java
diff --git a/...ernetes/provider/KubernetesModelUtil.java → ...ernetes/provider/KubernetesModelUtil.java b/...ernetes/provider/KubernetesModelUtil.java → ...ernetes/provider/KubernetesModelUtil.java
diff --git a/...rnetes/security/KubeconfigFileHasher.java → ...rnetes/security/KubeconfigFileHasher.java b/...rnetes/security/KubeconfigFileHasher.java → ...rnetes/security/KubeconfigFileHasher.java
diff --git a/...security/KubernetesCredentialFactory.java → ...security/KubernetesCredentialFactory.java b/...security/KubernetesCredentialFactory.java → ...security/KubernetesCredentialFactory.java
diff --git a/...netes/security/KubernetesCredentials.java → ...netes/security/KubernetesCredentials.java b/...netes/security/KubernetesCredentials.java → ...netes/security/KubernetesCredentials.java
diff --git a/...ty/KubernetesNamedAccountCredentials.java → ...ty/KubernetesNamedAccountCredentials.java b/...ty/KubernetesNamedAccountCredentials.java → ...ty/KubernetesNamedAccountCredentials.java
diff --git a/...driver-kubernetes/src/main/java/com/netflix/spinnaker/config/KubernetesConfiguration.java b/...driver-kubernetes/src/main/java/com/netflix/spinnaker/config/KubernetesConfiguration.java
@@ -0,0 +1,46 @@
+/*
+ * Copyright 2015 Google, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License")
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.netflix.spinnaker.config;
+
+import com.netflix.spinnaker.clouddriver.kubernetes.config.KubernetesConfigurationProperties;
+import com.netflix.spinnaker.clouddriver.kubernetes.health.KubernetesHealthIndicator;
+import com.netflix.spinnaker.clouddriver.security.AccountCredentialsProvider;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.scheduling.annotation.EnableScheduling;
+
+@Configuration
+@EnableConfigurationProperties
+@EnableScheduling
+@ConditionalOnProperty("kubernetes.enabled")
+@ComponentScan({"com.netflix.spinnaker.clouddriver.kubernetes"})
+public class KubernetesConfiguration {
+  @Bean
+  @ConfigurationProperties("kubernetes")
+  public KubernetesConfigurationProperties kubernetesConfigurationProperties() {
+    return new KubernetesConfigurationProperties();
+  }
+
+  @Bean
+  public KubernetesHealthIndicator kubernetesHealthIndicator(
+      AccountCredentialsProvider accountCredentialsProvider) {
+    return new KubernetesHealthIndicator(accountCredentialsProvider);
+  }
+}
diff --git a/settings.gradle b/settings.gradle
@@ -24,7 +24,7 @@ def cloudProviderProjects = [
   'cloudfoundry': [':clouddriver-cloudfoundry'],
   'dcos': [':clouddriver-dcos'],
   'gce': [':clouddriver-consul', ':clouddriver-google', ':clouddriver-google-common'],
-  'kubernetes': [':clouddriver-kubernetes', ':clouddriver-kubernetes-v2', ':clouddriver-docker'],
+  'kubernetes': [':clouddriver-kubernetes', ':clouddriver-kubernetes-v1', ':clouddriver-kubernetes-v2', ':clouddriver-docker'],
   'oracle': [':clouddriver-oracle']
 ]
 cloudProviderProjects.put('gcp', cloudProviderProjects['appengine'] + cloudProviderProjects['gce'] + cloudProviderProjects['kubernetes'])