refactor(kubernetes): Move V2-only code to clouddriver-kubernetes-v2 (#…

…4024) * refactor(kubernetes): A few minor fixes Remove a few unused variables/imports, and use parametrized types in a few places. * refactor(kubernetes): Remove SpinnakerKindMap from V1 While we've exposed the general SpinnakerKindMap in the shared KubernetesNamedAccountCredentials class, this map is only ever used for the V2 provider. Constructing the map depends on a number of classes that are V2-only, so to better factor the code, we'll just return an empty map for V1 accounts. * refactor(kubernetes): Split some shared and V2-only code KubernetesSpinnakerKindMap is only used by the V2 provider, but SpinnakerKind is needed by both. In order to support having the V1 provider use SpinnakerKind but not the KubernetesSpinnakerKindMap, move SpinnakerKind to the top level. Instead of building all the Kubernetes beans in KubernetesConfiguration, move the construction of V2-only beans to KubernetesV2Configuration. * refactor(kubernetes): Move V2-only code to clouddriver-kubernetes-v2 In order to better control the code sharing between the V1 and V2 kubernetes providers, pull all the (Java-only) code from the V2 provider into its own module. We'll also use the Java compiler instead of the Groovy compiler to compile it. In a follow-up PR, I'll move all V1-only code into clouddriver-kubernetes-v1, leaving only shared code in clouddriver-kubernetes. This will make it easier to edit code in the V2 provider without accidentally affecting the V1 provider (and vice versa).
spinnaker · Sep 13, 2019 · b03a28a · b03a28a
1 parent 843ddbe
commit b03a28a
Show file tree

Hide file tree

Showing 251 changed files with 280 additions and 243 deletions.
diff --git a/clouddriver-kubernetes-v2/clouddriver-kubernetes-v2.gradle b/clouddriver-kubernetes-v2/clouddriver-kubernetes-v2.gradle
@@ -0,0 +1,33 @@
+tasks.compileGroovy.enabled = false
+sourceSets.main.java.srcDirs = ['src/main/java']
+
+dependencies {
+  implementation project(":clouddriver-kubernetes")
+  implementation project(":clouddriver-artifacts")
+  implementation project(":clouddriver-core")
+  implementation project(":cats:cats-core")
+  implementation project(":clouddriver-security")
+
+  compileOnly "org.projectlombok:lombok"
+  annotationProcessor "org.projectlombok:lombok"
+  testAnnotationProcessor "org.projectlombok:lombok"
+
+  implementation "org.codehaus.groovy:groovy-all"
+
+  implementation "com.netflix.frigga:frigga"
+  implementation "com.netflix.spinnaker.kork:kork-artifacts"
+  implementation "com.netflix.spinnaker.kork:kork-config"
+  implementation "com.netflix.spinnaker.moniker:moniker"
+  implementation "io.kubernetes:client-java:5.0.0"
+  implementation "org.springframework.boot:spring-boot-actuator"
+  implementation "org.springframework.boot:spring-boot-starter-web"
+  implementation 'com.jayway.jsonpath:json-path:2.3.0'
+  implementation "com.github.ben-manes.caffeine:guava"
+
+  testImplementation "cglib:cglib-nodep"
+  testImplementation "org.objenesis:objenesis"
+  testImplementation "org.spockframework:spock-core"
+  testImplementation "org.spockframework:spock-spring"
+  testImplementation "org.springframework:spring-test"
+  testImplementation "com.netflix.spinnaker.fiat:fiat-core:$fiatVersion"
+}
diff --git a/...naker/clouddriver/kubernetes/v2/README.md → ...naker/clouddriver/kubernetes/v2/README.md b/...naker/clouddriver/kubernetes/v2/README.md → ...naker/clouddriver/kubernetes/v2/README.md
diff --git a/...ernetes/v2/artifact/ArtifactReplacer.java → ...ernetes/v2/artifact/ArtifactReplacer.java b/...ernetes/v2/artifact/ArtifactReplacer.java → ...ernetes/v2/artifact/ArtifactReplacer.java
diff --git a/...artifact/KubernetesArtifactConverter.java → ...artifact/KubernetesArtifactConverter.java b/...artifact/KubernetesArtifactConverter.java → ...artifact/KubernetesArtifactConverter.java
diff --git a/...bernetesUnversionedArtifactConverter.java → ...bernetesUnversionedArtifactConverter.java b/...bernetesUnversionedArtifactConverter.java → ...bernetesUnversionedArtifactConverter.java
diff --git a/...KubernetesVersionedArtifactConverter.java → ...KubernetesVersionedArtifactConverter.java b/...KubernetesVersionedArtifactConverter.java → ...KubernetesVersionedArtifactConverter.java
diff --git a/...iver/kubernetes/v2/artifact/Replacer.java → ...iver/kubernetes/v2/artifact/Replacer.java b/...iver/kubernetes/v2/artifact/Replacer.java → ...iver/kubernetes/v2/artifact/Replacer.java
diff --git a/...ouddriver/kubernetes/v2/caching/Keys.java → ...ouddriver/kubernetes/v2/caching/Keys.java b/...ouddriver/kubernetes/v2/caching/Keys.java → ...ouddriver/kubernetes/v2/caching/Keys.java
diff --git a/...etes/v2/caching/KubernetesV2Provider.java → ...etes/v2/caching/KubernetesV2Provider.java b/...etes/v2/caching/KubernetesV2Provider.java → ...etes/v2/caching/KubernetesV2Provider.java
diff --git a/...g/KubernetesV2ProviderSynchronizable.java → ...g/KubernetesV2ProviderSynchronizable.java b/...g/KubernetesV2ProviderSynchronizable.java → ...g/KubernetesV2ProviderSynchronizable.java
@@ -24,7 +24,6 @@
 import com.netflix.spinnaker.clouddriver.kubernetes.config.KubernetesConfigurationProperties;
 import com.netflix.spinnaker.clouddriver.kubernetes.security.KubernetesNamedAccountCredentials;
 import com.netflix.spinnaker.clouddriver.kubernetes.v2.caching.agent.KubernetesV2CachingAgentDispatcher;
-import com.netflix.spinnaker.clouddriver.kubernetes.v2.description.KubernetesSpinnakerKindMap;
 import com.netflix.spinnaker.clouddriver.kubernetes.v2.security.KubernetesV2Credentials;
 import com.netflix.spinnaker.clouddriver.security.*;
 import java.util.ArrayList;
@@ -45,7 +44,6 @@ public class KubernetesV2ProviderSynchronizable implements CredentialsInitialize
   private final KubernetesV2CachingAgentDispatcher kubernetesV2CachingAgentDispatcher;
   private final KubernetesConfigurationProperties kubernetesConfigurationProperties;
   private final KubernetesV2Credentials.Factory credentialFactory;
-  private final KubernetesSpinnakerKindMap kubernetesSpinnakerKindMap;
   private final CatsModule catsModule;
 
   public KubernetesV2ProviderSynchronizable(
@@ -54,14 +52,12 @@ public KubernetesV2ProviderSynchronizable(
       KubernetesV2CachingAgentDispatcher kubernetesV2CachingAgentDispatcher,
       KubernetesConfigurationProperties kubernetesConfigurationProperties,
       KubernetesV2Credentials.Factory credentialFactory,
-      KubernetesSpinnakerKindMap kubernetesSpinnakerKindMap,
       CatsModule catsModule) {
     this.kubernetesV2Provider = kubernetesV2Provider;
     this.accountCredentialsRepository = accountCredentialsRepository;
     this.kubernetesV2CachingAgentDispatcher = kubernetesV2CachingAgentDispatcher;
     this.kubernetesConfigurationProperties = kubernetesConfigurationProperties;
     this.credentialFactory = credentialFactory;
-    this.kubernetesSpinnakerKindMap = kubernetesSpinnakerKindMap;
     this.catsModule = catsModule;
 
     ScheduledExecutorService poller =

diff --git a/...2/caching/KubernetesV2SearchProvider.java → ...2/caching/KubernetesV2SearchProvider.java b/...2/caching/KubernetesV2SearchProvider.java → ...2/caching/KubernetesV2SearchProvider.java
@@ -21,6 +21,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.netflix.spinnaker.cats.cache.CacheData;
 import com.netflix.spinnaker.clouddriver.kubernetes.KubernetesCloudProvider;
+import com.netflix.spinnaker.clouddriver.kubernetes.description.SpinnakerKind;
 import com.netflix.spinnaker.clouddriver.kubernetes.v2.caching.Keys.LogicalKey;
 import com.netflix.spinnaker.clouddriver.kubernetes.v2.caching.Keys.LogicalKind;
 import com.netflix.spinnaker.clouddriver.kubernetes.v2.caching.view.provider.KubernetesCacheUtils;
@@ -206,12 +207,12 @@ private List<Map<String, Object>> getMatches(
             .map(
                 t -> {
                   try {
-                    return KubernetesSpinnakerKindMap.SpinnakerKind.fromString(t);
+                    return SpinnakerKind.fromString(t);
                   } catch (IllegalArgumentException e) {
                     return null;
                   }
                 })
-            .filter(k -> k != null && k != KubernetesSpinnakerKindMap.SpinnakerKind.UNCLASSIFIED)
+            .filter(k -> k != null && k != SpinnakerKind.UNCLASSIFIED)
             .map(kindMap::translateSpinnakerKind)
             .flatMap(Collection::stream)
             .map(KubernetesKind::toString)

diff --git a/.../CustomKubernetesCachingAgentFactory.java → .../CustomKubernetesCachingAgentFactory.java b/.../CustomKubernetesCachingAgentFactory.java → .../CustomKubernetesCachingAgentFactory.java
diff --git a/...v2/caching/agent/KubernetesCacheData.java → ...v2/caching/agent/KubernetesCacheData.java b/...v2/caching/agent/KubernetesCacheData.java → ...v2/caching/agent/KubernetesCacheData.java
diff --git a/...g/agent/KubernetesCacheDataConverter.java → ...g/agent/KubernetesCacheDataConverter.java b/...g/agent/KubernetesCacheDataConverter.java → ...g/agent/KubernetesCacheDataConverter.java
diff --git a/...ing/agent/KubernetesCoreCachingAgent.java → ...ing/agent/KubernetesCoreCachingAgent.java b/...ing/agent/KubernetesCoreCachingAgent.java → ...ing/agent/KubernetesCoreCachingAgent.java
diff --git a/...g/agent/KubernetesMetricCachingAgent.java → ...g/agent/KubernetesMetricCachingAgent.java b/...g/agent/KubernetesMetricCachingAgent.java → ...g/agent/KubernetesMetricCachingAgent.java
diff --git a/...gent/KubernetesNamespaceCachingAgent.java → ...gent/KubernetesNamespaceCachingAgent.java b/...gent/KubernetesNamespaceCachingAgent.java → ...gent/KubernetesNamespaceCachingAgent.java
diff --git a/...registeredCustomResourceCachingAgent.java → ...registeredCustomResourceCachingAgent.java b/...registeredCustomResourceCachingAgent.java → ...registeredCustomResourceCachingAgent.java
diff --git a/...ching/agent/KubernetesV2CachingAgent.java → ...ching/agent/KubernetesV2CachingAgent.java b/...ching/agent/KubernetesV2CachingAgent.java → ...ching/agent/KubernetesV2CachingAgent.java
diff --git a/...t/KubernetesV2CachingAgentDispatcher.java → ...t/KubernetesV2CachingAgentDispatcher.java b/...t/KubernetesV2CachingAgentDispatcher.java → ...t/KubernetesV2CachingAgentDispatcher.java
diff --git a/...gent/KubernetesV2CachingAgentFactory.java → ...gent/KubernetesV2CachingAgentFactory.java b/...gent/KubernetesV2CachingAgentFactory.java → ...gent/KubernetesV2CachingAgentFactory.java
diff --git a/...ent/KubernetesV2OnDemandCachingAgent.java → ...ent/KubernetesV2OnDemandCachingAgent.java b/...ent/KubernetesV2OnDemandCachingAgent.java → ...ent/KubernetesV2OnDemandCachingAgent.java
diff --git a/...g/view/model/KubernetesV2Application.java → ...g/view/model/KubernetesV2Application.java b/...g/view/model/KubernetesV2Application.java → ...g/view/model/KubernetesV2Application.java
diff --git a/...ching/view/model/KubernetesV2Cluster.java → ...ching/view/model/KubernetesV2Cluster.java b/...ching/view/model/KubernetesV2Cluster.java → ...ching/view/model/KubernetesV2Cluster.java
diff --git a/...aching/view/model/KubernetesV2Health.java → ...aching/view/model/KubernetesV2Health.java b/...aching/view/model/KubernetesV2Health.java → ...aching/view/model/KubernetesV2Health.java
diff --git a/...hing/view/model/KubernetesV2Instance.java → ...hing/view/model/KubernetesV2Instance.java b/...hing/view/model/KubernetesV2Instance.java → ...hing/view/model/KubernetesV2Instance.java
diff --git a/.../view/model/KubernetesV2LoadBalancer.java → .../view/model/KubernetesV2LoadBalancer.java b/.../view/model/KubernetesV2LoadBalancer.java → .../view/model/KubernetesV2LoadBalancer.java
diff --git a/...hing/view/model/KubernetesV2Manifest.java → ...hing/view/model/KubernetesV2Manifest.java b/...hing/view/model/KubernetesV2Manifest.java → ...hing/view/model/KubernetesV2Manifest.java
diff --git a/...view/model/KubernetesV2SecurityGroup.java → ...view/model/KubernetesV2SecurityGroup.java b/...view/model/KubernetesV2SecurityGroup.java → ...view/model/KubernetesV2SecurityGroup.java
diff --git a/...g/view/model/KubernetesV2ServerGroup.java → ...g/view/model/KubernetesV2ServerGroup.java b/...g/view/model/KubernetesV2ServerGroup.java → ...g/view/model/KubernetesV2ServerGroup.java
diff --git a/...model/KubernetesV2ServerGroupManager.java → ...model/KubernetesV2ServerGroupManager.java b/...model/KubernetesV2ServerGroupManager.java → ...model/KubernetesV2ServerGroupManager.java
diff --git a/...model/KubernetesV2ServerGroupSummary.java → ...model/KubernetesV2ServerGroupSummary.java b/...model/KubernetesV2ServerGroupSummary.java → ...model/KubernetesV2ServerGroupSummary.java
diff --git a/...aching/view/model/ManifestBasedModel.java → ...aching/view/model/ManifestBasedModel.java b/...aching/view/model/ManifestBasedModel.java → ...aching/view/model/ManifestBasedModel.java
diff --git a/...g/view/provider/KubernetesCacheUtils.java → ...g/view/provider/KubernetesCacheUtils.java b/...g/view/provider/KubernetesCacheUtils.java → ...g/view/provider/KubernetesCacheUtils.java
@@ -20,14 +20,14 @@
 import com.netflix.spinnaker.cats.cache.Cache;
 import com.netflix.spinnaker.cats.cache.CacheData;
 import com.netflix.spinnaker.cats.cache.RelationshipCacheFilter;
+import com.netflix.spinnaker.clouddriver.kubernetes.description.SpinnakerKind;
 import com.netflix.spinnaker.clouddriver.kubernetes.v2.caching.Keys;
 import com.netflix.spinnaker.clouddriver.kubernetes.v2.caching.agent.KubernetesCacheDataConverter;
 import com.netflix.spinnaker.clouddriver.kubernetes.v2.caching.view.model.ManifestBasedModel;
 import com.netflix.spinnaker.clouddriver.kubernetes.v2.caching.view.provider.data.KubernetesV2CacheData;
 import com.netflix.spinnaker.clouddriver.kubernetes.v2.description.KubernetesAccountResolver;
 import com.netflix.spinnaker.clouddriver.kubernetes.v2.description.KubernetesResourceProperties;
 import com.netflix.spinnaker.clouddriver.kubernetes.v2.description.KubernetesSpinnakerKindMap;
-import com.netflix.spinnaker.clouddriver.kubernetes.v2.description.KubernetesSpinnakerKindMap.SpinnakerKind;
 import com.netflix.spinnaker.clouddriver.kubernetes.v2.description.manifest.KubernetesManifest;
 import com.netflix.spinnaker.clouddriver.kubernetes.v2.op.handler.KubernetesHandler;
 import com.netflix.spinnaker.clouddriver.kubernetes.v2.op.handler.ModelHandler;

diff --git a/...KubernetesV2AbstractManifestProvider.java → ...KubernetesV2AbstractManifestProvider.java b/...KubernetesV2AbstractManifestProvider.java → ...KubernetesV2AbstractManifestProvider.java
diff --git a/...ider/KubernetesV2ApplicationProvider.java → ...ider/KubernetesV2ApplicationProvider.java b/...ider/KubernetesV2ApplicationProvider.java → ...ider/KubernetesV2ApplicationProvider.java
diff --git a/...rovider/KubernetesV2ArtifactProvider.java → ...rovider/KubernetesV2ArtifactProvider.java b/...rovider/KubernetesV2ArtifactProvider.java → ...rovider/KubernetesV2ArtifactProvider.java
diff --git a/...provider/KubernetesV2ClusterProvider.java → ...provider/KubernetesV2ClusterProvider.java b/...provider/KubernetesV2ClusterProvider.java → ...provider/KubernetesV2ClusterProvider.java
@@ -17,12 +17,12 @@
 
 package com.netflix.spinnaker.clouddriver.kubernetes.v2.caching.view.provider;
 
+import static com.netflix.spinnaker.clouddriver.kubernetes.description.SpinnakerKind.INSTANCES;
+import static com.netflix.spinnaker.clouddriver.kubernetes.description.SpinnakerKind.LOAD_BALANCERS;
+import static com.netflix.spinnaker.clouddriver.kubernetes.description.SpinnakerKind.SERVER_GROUPS;
+import static com.netflix.spinnaker.clouddriver.kubernetes.description.SpinnakerKind.SERVER_GROUP_MANAGERS;
 import static com.netflix.spinnaker.clouddriver.kubernetes.v2.caching.Keys.LogicalKind.APPLICATIONS;
 import static com.netflix.spinnaker.clouddriver.kubernetes.v2.caching.Keys.LogicalKind.CLUSTERS;
-import static com.netflix.spinnaker.clouddriver.kubernetes.v2.description.KubernetesSpinnakerKindMap.SpinnakerKind.INSTANCES;
-import static com.netflix.spinnaker.clouddriver.kubernetes.v2.description.KubernetesSpinnakerKindMap.SpinnakerKind.LOAD_BALANCERS;
-import static com.netflix.spinnaker.clouddriver.kubernetes.v2.description.KubernetesSpinnakerKindMap.SpinnakerKind.SERVER_GROUPS;
-import static com.netflix.spinnaker.clouddriver.kubernetes.v2.description.KubernetesSpinnakerKindMap.SpinnakerKind.SERVER_GROUP_MANAGERS;
 
 import com.netflix.spinnaker.cats.cache.CacheData;
 import com.netflix.spinnaker.clouddriver.kubernetes.KubernetesCloudProvider;

diff --git a/...rovider/KubernetesV2InstanceProvider.java → ...rovider/KubernetesV2InstanceProvider.java b/...rovider/KubernetesV2InstanceProvider.java → ...rovider/KubernetesV2InstanceProvider.java
diff --git a/...der/KubernetesV2LiveManifestProvider.java → ...der/KubernetesV2LiveManifestProvider.java b/...der/KubernetesV2LiveManifestProvider.java → ...der/KubernetesV2LiveManifestProvider.java
diff --git a/...der/KubernetesV2LoadBalancerProvider.java → ...der/KubernetesV2LoadBalancerProvider.java b/...der/KubernetesV2LoadBalancerProvider.java → ...der/KubernetesV2LoadBalancerProvider.java
@@ -17,10 +17,10 @@
 
 package com.netflix.spinnaker.clouddriver.kubernetes.v2.caching.view.provider;
 
+import static com.netflix.spinnaker.clouddriver.kubernetes.description.SpinnakerKind.INSTANCES;
+import static com.netflix.spinnaker.clouddriver.kubernetes.description.SpinnakerKind.LOAD_BALANCERS;
+import static com.netflix.spinnaker.clouddriver.kubernetes.description.SpinnakerKind.SERVER_GROUPS;
 import static com.netflix.spinnaker.clouddriver.kubernetes.v2.caching.Keys.LogicalKind.APPLICATIONS;
-import static com.netflix.spinnaker.clouddriver.kubernetes.v2.description.KubernetesSpinnakerKindMap.SpinnakerKind.INSTANCES;
-import static com.netflix.spinnaker.clouddriver.kubernetes.v2.description.KubernetesSpinnakerKindMap.SpinnakerKind.LOAD_BALANCERS;
-import static com.netflix.spinnaker.clouddriver.kubernetes.v2.description.KubernetesSpinnakerKindMap.SpinnakerKind.SERVER_GROUPS;
 
 import com.netflix.spinnaker.cats.cache.CacheData;
 import com.netflix.spinnaker.clouddriver.kubernetes.KubernetesCloudProvider;

diff --git a/...rovider/KubernetesV2ManifestProvider.java → ...rovider/KubernetesV2ManifestProvider.java b/...rovider/KubernetesV2ManifestProvider.java → ...rovider/KubernetesV2ManifestProvider.java
diff --git a/...er/KubernetesV2SecurityGroupProvider.java → ...er/KubernetesV2SecurityGroupProvider.java b/...er/KubernetesV2SecurityGroupProvider.java → ...er/KubernetesV2SecurityGroupProvider.java
@@ -18,6 +18,7 @@
 package com.netflix.spinnaker.clouddriver.kubernetes.v2.caching.view.provider;
 
 import com.netflix.spinnaker.clouddriver.kubernetes.KubernetesCloudProvider;
+import com.netflix.spinnaker.clouddriver.kubernetes.description.SpinnakerKind;
 import com.netflix.spinnaker.clouddriver.kubernetes.v2.caching.Keys;
 import com.netflix.spinnaker.clouddriver.kubernetes.v2.caching.view.model.KubernetesV2SecurityGroup;
 import com.netflix.spinnaker.clouddriver.kubernetes.v2.description.KubernetesSpinnakerKindMap;
@@ -53,8 +54,7 @@ public String getCloudProvider() {
 
   @Override
   public Set<KubernetesV2SecurityGroup> getAll(boolean includeRules) {
-    return kindMap.translateSpinnakerKind(KubernetesSpinnakerKindMap.SpinnakerKind.SECURITY_GROUPS)
-        .stream()
+    return kindMap.translateSpinnakerKind(SpinnakerKind.SECURITY_GROUPS).stream()
         .map(KubernetesKind::toString)
         .map(cacheUtils::getAllKeys)
         .flatMap(Collection::stream)
@@ -64,8 +64,7 @@ public Set<KubernetesV2SecurityGroup> getAll(boolean includeRules) {
 
   @Override
   public Set<KubernetesV2SecurityGroup> getAllByRegion(boolean includeRules, String namespace) {
-    return kindMap.translateSpinnakerKind(KubernetesSpinnakerKindMap.SpinnakerKind.SECURITY_GROUPS)
-        .stream()
+    return kindMap.translateSpinnakerKind(SpinnakerKind.SECURITY_GROUPS).stream()
         .map(
             k -> {
               String key = Keys.InfrastructureCacheKey.createKey(k, "*", namespace, "*");
@@ -78,8 +77,7 @@ public Set<KubernetesV2SecurityGroup> getAllByRegion(boolean includeRules, Strin
 
   @Override
   public Set<KubernetesV2SecurityGroup> getAllByAccount(boolean includeRules, String account) {
-    return kindMap.translateSpinnakerKind(KubernetesSpinnakerKindMap.SpinnakerKind.SECURITY_GROUPS)
-        .stream()
+    return kindMap.translateSpinnakerKind(SpinnakerKind.SECURITY_GROUPS).stream()
         .map(
             k -> {
               String key = Keys.InfrastructureCacheKey.createKey(k, account, "*", "*");
@@ -100,8 +98,7 @@ public Set<KubernetesV2SecurityGroup> getAllByAccountAndName(
       return null;
     }
 
-    return kindMap.translateSpinnakerKind(KubernetesSpinnakerKindMap.SpinnakerKind.SECURITY_GROUPS)
-        .stream()
+    return kindMap.translateSpinnakerKind(SpinnakerKind.SECURITY_GROUPS).stream()
         .map(
             k -> {
               String key = Keys.InfrastructureCacheKey.createKey(k, account, "*", name);
@@ -115,8 +112,7 @@ public Set<KubernetesV2SecurityGroup> getAllByAccountAndName(
   @Override
   public Set<KubernetesV2SecurityGroup> getAllByAccountAndRegion(
       boolean includeRule, String account, String namespace) {
-    return kindMap.translateSpinnakerKind(KubernetesSpinnakerKindMap.SpinnakerKind.SECURITY_GROUPS)
-        .stream()
+    return kindMap.translateSpinnakerKind(SpinnakerKind.SECURITY_GROUPS).stream()
         .map(
             k -> {
               String key = Keys.InfrastructureCacheKey.createKey(k, account, namespace, "*");
@@ -137,8 +133,7 @@ public KubernetesV2SecurityGroup get(
       return null;
     }
 
-    return kindMap.translateSpinnakerKind(KubernetesSpinnakerKindMap.SpinnakerKind.SECURITY_GROUPS)
-        .stream()
+    return kindMap.translateSpinnakerKind(SpinnakerKind.SECURITY_GROUPS).stream()
         .map(
             k -> {
               String key = Keys.InfrastructureCacheKey.createKey(k, account, namespace, name);

diff --git a/...bernetesV2ServerGroupManagerProvider.java → ...bernetesV2ServerGroupManagerProvider.java b/...bernetesV2ServerGroupManagerProvider.java → ...bernetesV2ServerGroupManagerProvider.java
@@ -17,9 +17,9 @@
 
 package com.netflix.spinnaker.clouddriver.kubernetes.v2.caching.view.provider;
 
+import static com.netflix.spinnaker.clouddriver.kubernetes.description.SpinnakerKind.SERVER_GROUPS;
+import static com.netflix.spinnaker.clouddriver.kubernetes.description.SpinnakerKind.SERVER_GROUP_MANAGERS;
 import static com.netflix.spinnaker.clouddriver.kubernetes.v2.caching.Keys.LogicalKind.APPLICATIONS;
-import static com.netflix.spinnaker.clouddriver.kubernetes.v2.description.KubernetesSpinnakerKindMap.SpinnakerKind.SERVER_GROUPS;
-import static com.netflix.spinnaker.clouddriver.kubernetes.v2.description.KubernetesSpinnakerKindMap.SpinnakerKind.SERVER_GROUP_MANAGERS;
 
 import com.netflix.spinnaker.cats.cache.CacheData;
 import com.netflix.spinnaker.clouddriver.kubernetes.v2.caching.Keys;

diff --git a/.../provider/data/KubernetesV2CacheData.java → .../provider/data/KubernetesV2CacheData.java b/.../provider/data/KubernetesV2CacheData.java → .../provider/data/KubernetesV2CacheData.java
diff --git a/...ata/KubernetesV2ServerGroupCacheData.java → ...ata/KubernetesV2ServerGroupCacheData.java b/...ata/KubernetesV2ServerGroupCacheData.java → ...ata/KubernetesV2ServerGroupCacheData.java
diff --git a/...ernetesV2ServerGroupManagerCacheData.java → ...ernetesV2ServerGroupManagerCacheData.java b/...ernetesV2ServerGroupManagerCacheData.java → ...ernetesV2ServerGroupManagerCacheData.java
diff --git a/.../KubernetesCleanupArtifactsConverter.java → .../KubernetesCleanupArtifactsConverter.java b/.../KubernetesCleanupArtifactsConverter.java → .../KubernetesCleanupArtifactsConverter.java
diff --git a/...b/KubernetesRunJobOperationConverter.java → ...b/KubernetesRunJobOperationConverter.java b/...b/KubernetesRunJobOperationConverter.java → ...b/KubernetesRunJobOperationConverter.java
diff --git a/...st/KubernetesDeleteManifestConverter.java → ...st/KubernetesDeleteManifestConverter.java b/...st/KubernetesDeleteManifestConverter.java → ...st/KubernetesDeleteManifestConverter.java
diff --git a/...st/KubernetesDeployManifestConverter.java → ...st/KubernetesDeployManifestConverter.java b/...st/KubernetesDeployManifestConverter.java → ...st/KubernetesDeployManifestConverter.java
diff --git a/...t/KubernetesDisableManifestConverter.java → ...t/KubernetesDisableManifestConverter.java b/...t/KubernetesDisableManifestConverter.java → ...t/KubernetesDisableManifestConverter.java
diff --git a/...st/KubernetesEnableManifestConverter.java → ...st/KubernetesEnableManifestConverter.java b/...st/KubernetesEnableManifestConverter.java → ...st/KubernetesEnableManifestConverter.java
diff --git a/...est/KubernetesPatchManifestConverter.java → ...est/KubernetesPatchManifestConverter.java b/...est/KubernetesPatchManifestConverter.java → ...est/KubernetesPatchManifestConverter.java
diff --git a/...ernetesPauseRolloutManifestConverter.java → ...ernetesPauseRolloutManifestConverter.java b/...ernetesPauseRolloutManifestConverter.java → ...ernetesPauseRolloutManifestConverter.java
diff --git a/...rnetesResumeRolloutManifestConverter.java → ...rnetesResumeRolloutManifestConverter.java b/...rnetesResumeRolloutManifestConverter.java → ...rnetesResumeRolloutManifestConverter.java
diff --git a/...est/KubernetesScaleManifestConverter.java → ...est/KubernetesScaleManifestConverter.java b/...est/KubernetesScaleManifestConverter.java → ...est/KubernetesScaleManifestConverter.java
diff --git a/...bernetesUndoRolloutManifestConverter.java → ...bernetesUndoRolloutManifestConverter.java b/...bernetesUndoRolloutManifestConverter.java → ...bernetesUndoRolloutManifestConverter.java
diff --git a/...KubernetesResizeServerGroupConverter.java → ...KubernetesResizeServerGroupConverter.java b/...KubernetesResizeServerGroupConverter.java → ...KubernetesResizeServerGroupConverter.java
diff --git a/...tion/AccountResourcePropertyRegistry.java → ...tion/AccountResourcePropertyRegistry.java b/...tion/AccountResourcePropertyRegistry.java → ...tion/AccountResourcePropertyRegistry.java
diff --git a/...ption/GlobalResourcePropertyRegistry.java → ...ption/GlobalResourcePropertyRegistry.java b/...ption/GlobalResourcePropertyRegistry.java → ...ption/GlobalResourcePropertyRegistry.java
diff --git a/.../kubernetes/v2/description/JsonPatch.java → .../kubernetes/v2/description/JsonPatch.java b/.../kubernetes/v2/description/JsonPatch.java → .../kubernetes/v2/description/JsonPatch.java
diff --git a/...escription/KubernetesAccountResolver.java → ...escription/KubernetesAccountResolver.java b/...escription/KubernetesAccountResolver.java → ...escription/KubernetesAccountResolver.java
diff --git a/...v2/description/KubernetesCoordinates.java → ...v2/description/KubernetesCoordinates.java b/...v2/description/KubernetesCoordinates.java → ...v2/description/KubernetesCoordinates.java
diff --git a/...2/description/KubernetesPatchOptions.java → ...2/description/KubernetesPatchOptions.java b/...2/description/KubernetesPatchOptions.java → ...2/description/KubernetesPatchOptions.java
diff --git a/...s/v2/description/KubernetesPodMetric.java → ...s/v2/description/KubernetesPodMetric.java b/...s/v2/description/KubernetesPodMetric.java → ...s/v2/description/KubernetesPodMetric.java
diff --git a/...ription/KubernetesResourceProperties.java → ...ription/KubernetesResourceProperties.java b/...ription/KubernetesResourceProperties.java → ...ription/KubernetesResourceProperties.java
@@ -20,6 +20,7 @@
 import static com.netflix.spinnaker.clouddriver.kubernetes.v2.op.handler.KubernetesHandler.DeployPriority.WORKLOAD_CONTROLLER_PRIORITY;
 
 import com.netflix.spinnaker.clouddriver.kubernetes.config.CustomKubernetesResource;
+import com.netflix.spinnaker.clouddriver.kubernetes.description.SpinnakerKind;
 import com.netflix.spinnaker.clouddriver.kubernetes.v2.artifact.KubernetesUnversionedArtifactConverter;
 import com.netflix.spinnaker.clouddriver.kubernetes.v2.artifact.KubernetesVersionedArtifactConverter;
 import com.netflix.spinnaker.clouddriver.kubernetes.v2.description.manifest.KubernetesKind;
@@ -76,7 +77,7 @@ public static KubernetesResourceProperties fromCustomResource(
     KubernetesHandler handler =
         CustomKubernetesHandlerFactory.create(
             kubernetesKind,
-            KubernetesSpinnakerKindMap.SpinnakerKind.fromString(customResource.getSpinnakerKind()),
+            SpinnakerKind.fromString(customResource.getSpinnakerKind()),
             customResource.isVersioned(),
             deployPriorityValue);
 

diff --git a/...scription/KubernetesSpinnakerKindMap.java → ...scription/KubernetesSpinnakerKindMap.java b/...scription/KubernetesSpinnakerKindMap.java → ...scription/KubernetesSpinnakerKindMap.java
@@ -17,48 +17,19 @@
 
 package com.netflix.spinnaker.clouddriver.kubernetes.v2.description;
 
-import com.fasterxml.jackson.annotation.JsonCreator;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.ImmutableSetMultimap;
+import com.netflix.spinnaker.clouddriver.kubernetes.description.SpinnakerKind;
 import com.netflix.spinnaker.clouddriver.kubernetes.v2.description.manifest.KubernetesKind;
 import com.netflix.spinnaker.clouddriver.kubernetes.v2.op.handler.KubernetesHandler;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 import org.springframework.stereotype.Component;
 
 @Component
 public class KubernetesSpinnakerKindMap {
-  public enum SpinnakerKind {
-    INSTANCES("instances"),
-    CONFIGS("configs"),
-    SERVER_GROUPS("serverGroups"),
-    LOAD_BALANCERS("loadBalancers"),
-    SECURITY_GROUPS("securityGroups"),
-    SERVER_GROUP_MANAGERS("serverGroupManagers"),
-    UNCLASSIFIED("unclassified");
-
-    private final String id;
-
-    SpinnakerKind(String id) {
-      this.id = id;
-    }
-
-    @Override
-    public String toString() {
-      return id;
-    }
-
-    @JsonCreator
-    public static SpinnakerKind fromString(String name) {
-      return Arrays.stream(values())
-          .filter(k -> k.toString().equalsIgnoreCase(name))
-          .findFirst()
-          .orElse(UNCLASSIFIED);
-    }
-  }
 
   private final ImmutableMap<KubernetesKind, SpinnakerKind> kubernetesToSpinnaker;
   private final ImmutableSetMultimap<SpinnakerKind, KubernetesKind> spinnakerToKubernetes;

diff --git a/...ernetes/v2/description/RegistryUtils.java → ...ernetes/v2/description/RegistryUtils.java b/...ernetes/v2/description/RegistryUtils.java → ...ernetes/v2/description/RegistryUtils.java
diff --git a/...description/ResourcePropertyRegistry.java → ...description/ResourcePropertyRegistry.java b/...description/ResourcePropertyRegistry.java → ...description/ResourcePropertyRegistry.java
diff --git a/...ubernetesCleanupArtifactsDescription.java → ...ubernetesCleanupArtifactsDescription.java b/...ubernetesCleanupArtifactsDescription.java → ...ubernetesCleanupArtifactsDescription.java
diff --git a/...KubernetesRunJobOperationDescription.java → ...KubernetesRunJobOperationDescription.java b/...KubernetesRunJobOperationDescription.java → ...KubernetesRunJobOperationDescription.java
diff --git a/...anifest/GlobalKubernetesKindRegistry.java → ...anifest/GlobalKubernetesKindRegistry.java b/...anifest/GlobalKubernetesKindRegistry.java → ...anifest/GlobalKubernetesKindRegistry.java
diff --git a/...cription/manifest/KubernetesApiGroup.java → ...cription/manifest/KubernetesApiGroup.java b/...cription/manifest/KubernetesApiGroup.java → ...cription/manifest/KubernetesApiGroup.java
diff --git a/...iption/manifest/KubernetesApiVersion.java → ...iption/manifest/KubernetesApiVersion.java b/...iption/manifest/KubernetesApiVersion.java → ...iption/manifest/KubernetesApiVersion.java
diff --git a/...fest/KubernetesApplicationProperties.java → ...fest/KubernetesApplicationProperties.java b/...fest/KubernetesApplicationProperties.java → ...fest/KubernetesApplicationProperties.java
diff --git a/...manifest/KubernetesCachingProperties.java → ...manifest/KubernetesCachingProperties.java b/...manifest/KubernetesCachingProperties.java → ...manifest/KubernetesCachingProperties.java
diff --git a/.../KubernetesDeleteManifestDescription.java → .../KubernetesDeleteManifestDescription.java b/.../KubernetesDeleteManifestDescription.java → .../KubernetesDeleteManifestDescription.java
diff --git a/.../KubernetesDeployManifestDescription.java → .../KubernetesDeployManifestDescription.java b/.../KubernetesDeployManifestDescription.java → .../KubernetesDeployManifestDescription.java
diff --git a/...etesEnableDisableManifestDescription.java → ...etesEnableDisableManifestDescription.java b/...etesEnableDisableManifestDescription.java → ...etesEnableDisableManifestDescription.java
diff --git a/.../description/manifest/KubernetesKind.java → .../description/manifest/KubernetesKind.java b/.../description/manifest/KubernetesKind.java → .../description/manifest/KubernetesKind.java
diff --git a/...on/manifest/KubernetesKindProperties.java → ...on/manifest/KubernetesKindProperties.java b/...on/manifest/KubernetesKindProperties.java → ...on/manifest/KubernetesKindProperties.java
diff --git a/...tion/manifest/KubernetesKindRegistry.java → ...tion/manifest/KubernetesKindRegistry.java b/...tion/manifest/KubernetesKindRegistry.java → ...tion/manifest/KubernetesKindRegistry.java
diff --git a/...cription/manifest/KubernetesManifest.java → ...cription/manifest/KubernetesManifest.java b/...cription/manifest/KubernetesManifest.java → ...cription/manifest/KubernetesManifest.java
diff --git a/...manifest/KubernetesManifestAnnotater.java → ...manifest/KubernetesManifestAnnotater.java b/...manifest/KubernetesManifestAnnotater.java → ...manifest/KubernetesManifestAnnotater.java
diff --git a/...n/manifest/KubernetesManifestLabeler.java → ...n/manifest/KubernetesManifestLabeler.java b/...n/manifest/KubernetesManifestLabeler.java → ...n/manifest/KubernetesManifestLabeler.java
diff --git a/...tion/manifest/KubernetesManifestList.java → ...tion/manifest/KubernetesManifestList.java b/...tion/manifest/KubernetesManifestList.java → ...tion/manifest/KubernetesManifestList.java
diff --git a/...bernetesManifestOperationDescription.java → ...bernetesManifestOperationDescription.java b/...bernetesManifestOperationDescription.java → ...bernetesManifestOperationDescription.java
diff --git a/.../manifest/KubernetesManifestSelector.java → .../manifest/KubernetesManifestSelector.java b/.../manifest/KubernetesManifestSelector.java → .../manifest/KubernetesManifestSelector.java
diff --git a/.../manifest/KubernetesManifestStrategy.java → .../manifest/KubernetesManifestStrategy.java b/.../manifest/KubernetesManifestStrategy.java → .../manifest/KubernetesManifestStrategy.java
diff --git a/...n/manifest/KubernetesManifestTraffic.java → ...n/manifest/KubernetesManifestTraffic.java b/...n/manifest/KubernetesManifestTraffic.java → ...n/manifest/KubernetesManifestTraffic.java
diff --git a/...tesMultiManifestOperationDescription.java → ...tesMultiManifestOperationDescription.java b/...tesMultiManifestOperationDescription.java → ...tesMultiManifestOperationDescription.java
diff --git a/...t/KubernetesPatchManifestDescription.java → ...t/KubernetesPatchManifestDescription.java b/...t/KubernetesPatchManifestDescription.java → ...t/KubernetesPatchManifestDescription.java
diff --git a/...netesPauseRolloutManifestDescription.java → ...netesPauseRolloutManifestDescription.java b/...netesPauseRolloutManifestDescription.java → ...netesPauseRolloutManifestDescription.java
diff --git a/...etesResumeRolloutManifestDescription.java → ...etesResumeRolloutManifestDescription.java b/...etesResumeRolloutManifestDescription.java → ...etesResumeRolloutManifestDescription.java
diff --git a/...t/KubernetesScaleManifestDescription.java → ...t/KubernetesScaleManifestDescription.java b/...t/KubernetesScaleManifestDescription.java → ...t/KubernetesScaleManifestDescription.java
diff --git a/...on/manifest/KubernetesSourceCapacity.java → ...on/manifest/KubernetesSourceCapacity.java b/...on/manifest/KubernetesSourceCapacity.java → ...on/manifest/KubernetesSourceCapacity.java
diff --git a/...rnetesUndoRolloutManifestDescription.java → ...rnetesUndoRolloutManifestDescription.java b/...rnetesUndoRolloutManifestDescription.java → ...rnetesUndoRolloutManifestDescription.java
diff --git a/.../manifest/MalformedManifestException.java → .../manifest/MalformedManifestException.java b/.../manifest/MalformedManifestException.java → .../manifest/MalformedManifestException.java
diff --git a/...bernetesResizeServerGroupDescription.java → ...bernetesResizeServerGroupDescription.java b/...bernetesResizeServerGroupDescription.java → ...bernetesResizeServerGroupDescription.java
diff --git a/...netesServerGroupOperationDescription.java → ...netesServerGroupOperationDescription.java b/...netesServerGroupOperationDescription.java → ...netesServerGroupOperationDescription.java
diff --git a/...netes/v2/model/KubernetesV2JobStatus.java → ...netes/v2/model/KubernetesV2JobStatus.java b/...netes/v2/model/KubernetesV2JobStatus.java → ...netes/v2/model/KubernetesV2JobStatus.java
diff --git a/...tes/v2/names/KubernetesManifestNamer.java → ...tes/v2/names/KubernetesManifestNamer.java b/...tes/v2/names/KubernetesManifestNamer.java → ...tes/v2/names/KubernetesManifestNamer.java
diff --git a/...ver/kubernetes/v2/op/OperationResult.java → ...ver/kubernetes/v2/op/OperationResult.java b/...ver/kubernetes/v2/op/OperationResult.java → ...ver/kubernetes/v2/op/OperationResult.java
diff --git a/.../KubernetesCleanupArtifactsOperation.java → .../KubernetesCleanupArtifactsOperation.java b/.../KubernetesCleanupArtifactsOperation.java → .../KubernetesCleanupArtifactsOperation.java
diff --git a/...r/kubernetes/v2/op/handler/CanDelete.java → ...r/kubernetes/v2/op/handler/CanDelete.java b/...r/kubernetes/v2/op/handler/CanDelete.java → ...r/kubernetes/v2/op/handler/CanDelete.java
diff --git a/...r/kubernetes/v2/op/handler/CanDeploy.java → ...r/kubernetes/v2/op/handler/CanDeploy.java b/...r/kubernetes/v2/op/handler/CanDeploy.java → ...r/kubernetes/v2/op/handler/CanDeploy.java
diff --git a/...ernetes/v2/op/handler/CanLoadBalance.java → ...ernetes/v2/op/handler/CanLoadBalance.java b/...ernetes/v2/op/handler/CanLoadBalance.java → ...ernetes/v2/op/handler/CanLoadBalance.java
diff --git a/...er/kubernetes/v2/op/handler/CanPatch.java → ...er/kubernetes/v2/op/handler/CanPatch.java b/...er/kubernetes/v2/op/handler/CanPatch.java → ...er/kubernetes/v2/op/handler/CanPatch.java
diff --git a/...rnetes/v2/op/handler/CanPauseRollout.java → ...rnetes/v2/op/handler/CanPauseRollout.java b/...rnetes/v2/op/handler/CanPauseRollout.java → ...rnetes/v2/op/handler/CanPauseRollout.java
diff --git a/...r/kubernetes/v2/op/handler/CanResize.java → ...r/kubernetes/v2/op/handler/CanResize.java b/...r/kubernetes/v2/op/handler/CanResize.java → ...r/kubernetes/v2/op/handler/CanResize.java
diff --git a/...netes/v2/op/handler/CanResumeRollout.java → ...netes/v2/op/handler/CanResumeRollout.java b/...netes/v2/op/handler/CanResumeRollout.java → ...netes/v2/op/handler/CanResumeRollout.java
diff --git a/.../kubernetes/v2/op/handler/CanRollout.java → .../kubernetes/v2/op/handler/CanRollout.java b/.../kubernetes/v2/op/handler/CanRollout.java → .../kubernetes/v2/op/handler/CanRollout.java
diff --git a/...er/kubernetes/v2/op/handler/CanScale.java → ...er/kubernetes/v2/op/handler/CanScale.java b/...er/kubernetes/v2/op/handler/CanScale.java → ...er/kubernetes/v2/op/handler/CanScale.java
diff --git a/...ernetes/v2/op/handler/CanUndoRollout.java → ...ernetes/v2/op/handler/CanUndoRollout.java b/...ernetes/v2/op/handler/CanUndoRollout.java → ...ernetes/v2/op/handler/CanUndoRollout.java
diff --git a/...ndler/CustomKubernetesHandlerFactory.java → ...ndler/CustomKubernetesHandlerFactory.java b/...ndler/CustomKubernetesHandlerFactory.java → ...ndler/CustomKubernetesHandlerFactory.java
@@ -19,6 +19,7 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.netflix.spectator.api.Registry;
+import com.netflix.spinnaker.clouddriver.kubernetes.description.SpinnakerKind;
 import com.netflix.spinnaker.clouddriver.kubernetes.security.KubernetesNamedAccountCredentials;
 import com.netflix.spinnaker.clouddriver.kubernetes.v2.caching.agent.CustomKubernetesCachingAgentFactory;
 import com.netflix.spinnaker.clouddriver.kubernetes.v2.caching.agent.KubernetesV2CachingAgent;
@@ -29,7 +30,6 @@
 import com.netflix.spinnaker.clouddriver.kubernetes.v2.caching.view.provider.data.KubernetesV2CacheData;
 import com.netflix.spinnaker.clouddriver.kubernetes.v2.caching.view.provider.data.KubernetesV2ServerGroupCacheData;
 import com.netflix.spinnaker.clouddriver.kubernetes.v2.caching.view.provider.data.KubernetesV2ServerGroupManagerCacheData;
-import com.netflix.spinnaker.clouddriver.kubernetes.v2.description.KubernetesSpinnakerKindMap.SpinnakerKind;
 import com.netflix.spinnaker.clouddriver.kubernetes.v2.description.manifest.KubernetesKind;
 import com.netflix.spinnaker.clouddriver.kubernetes.v2.description.manifest.KubernetesManifest;
 import com.netflix.spinnaker.clouddriver.kubernetes.v2.security.KubernetesV2Credentials;

diff --git a/...ver/kubernetes/v2/op/handler/HasPods.java → ...ver/kubernetes/v2/op/handler/HasPods.java b/...ver/kubernetes/v2/op/handler/HasPods.java → ...ver/kubernetes/v2/op/handler/HasPods.java
diff --git a/.../handler/KubernetesAPIServiceHandler.java → .../handler/KubernetesAPIServiceHandler.java b/.../handler/KubernetesAPIServiceHandler.java → .../handler/KubernetesAPIServiceHandler.java
@@ -18,9 +18,9 @@
 
 import static com.netflix.spinnaker.clouddriver.kubernetes.v2.op.handler.KubernetesHandler.DeployPriority.API_SERVICE_PRIORITY;
 
+import com.netflix.spinnaker.clouddriver.kubernetes.description.SpinnakerKind;
 import com.netflix.spinnaker.clouddriver.kubernetes.v2.caching.agent.KubernetesCoreCachingAgent;
 import com.netflix.spinnaker.clouddriver.kubernetes.v2.caching.agent.KubernetesV2CachingAgentFactory;
-import com.netflix.spinnaker.clouddriver.kubernetes.v2.description.KubernetesSpinnakerKindMap;
 import com.netflix.spinnaker.clouddriver.kubernetes.v2.description.manifest.KubernetesKind;
 import com.netflix.spinnaker.clouddriver.kubernetes.v2.description.manifest.KubernetesManifest;
 import com.netflix.spinnaker.clouddriver.model.Manifest.Status;
@@ -47,8 +47,8 @@ public boolean versioned() {
 
   @Nonnull
   @Override
-  public KubernetesSpinnakerKindMap.SpinnakerKind spinnakerKind() {
-    return KubernetesSpinnakerKindMap.SpinnakerKind.UNCLASSIFIED;
+  public SpinnakerKind spinnakerKind() {
+    return SpinnakerKind.UNCLASSIFIED;
   }
 
   @Override

diff --git a/.../KubernetesClusterRoleBindingHandler.java → .../KubernetesClusterRoleBindingHandler.java b/.../KubernetesClusterRoleBindingHandler.java → .../KubernetesClusterRoleBindingHandler.java
@@ -19,9 +19,9 @@
 
 import static com.netflix.spinnaker.clouddriver.kubernetes.v2.op.handler.KubernetesHandler.DeployPriority.ROLE_BINDING_PRIORITY;
 
+import com.netflix.spinnaker.clouddriver.kubernetes.description.SpinnakerKind;
 import com.netflix.spinnaker.clouddriver.kubernetes.v2.caching.agent.KubernetesCoreCachingAgent;
 import com.netflix.spinnaker.clouddriver.kubernetes.v2.caching.agent.KubernetesV2CachingAgentFactory;
-import com.netflix.spinnaker.clouddriver.kubernetes.v2.description.KubernetesSpinnakerKindMap;
 import com.netflix.spinnaker.clouddriver.kubernetes.v2.description.manifest.KubernetesKind;
 import com.netflix.spinnaker.clouddriver.kubernetes.v2.description.manifest.KubernetesManifest;
 import com.netflix.spinnaker.clouddriver.model.Manifest.Status;
@@ -48,8 +48,8 @@ public boolean versioned() {
 
   @Nonnull
   @Override
-  public KubernetesSpinnakerKindMap.SpinnakerKind spinnakerKind() {
-    return KubernetesSpinnakerKindMap.SpinnakerKind.UNCLASSIFIED;
+  public SpinnakerKind spinnakerKind() {
+    return SpinnakerKind.UNCLASSIFIED;
   }
 
   @Override

diff --git a/...handler/KubernetesClusterRoleHandler.java → ...handler/KubernetesClusterRoleHandler.java b/...handler/KubernetesClusterRoleHandler.java → ...handler/KubernetesClusterRoleHandler.java
@@ -19,9 +19,9 @@
 
 import static com.netflix.spinnaker.clouddriver.kubernetes.v2.op.handler.KubernetesHandler.DeployPriority.ROLE_PRIORITY;
 
+import com.netflix.spinnaker.clouddriver.kubernetes.description.SpinnakerKind;
 import com.netflix.spinnaker.clouddriver.kubernetes.v2.caching.agent.KubernetesCoreCachingAgent;
 import com.netflix.spinnaker.clouddriver.kubernetes.v2.caching.agent.KubernetesV2CachingAgentFactory;
-import com.netflix.spinnaker.clouddriver.kubernetes.v2.description.KubernetesSpinnakerKindMap;
 import com.netflix.spinnaker.clouddriver.kubernetes.v2.description.manifest.KubernetesKind;
 import com.netflix.spinnaker.clouddriver.kubernetes.v2.description.manifest.KubernetesManifest;
 import com.netflix.spinnaker.clouddriver.model.Manifest.Status;
@@ -48,8 +48,8 @@ public boolean versioned() {
 
   @Nonnull
   @Override
-  public KubernetesSpinnakerKindMap.SpinnakerKind spinnakerKind() {
-    return KubernetesSpinnakerKindMap.SpinnakerKind.UNCLASSIFIED;
+  public SpinnakerKind spinnakerKind() {
+    return SpinnakerKind.UNCLASSIFIED;
   }
 
   @Override