From b03a28a4837d64ea41d86b0266f252f59c78bc08 Mon Sep 17 00:00:00 2001 From: Eric Zimanyi Date: Fri, 13 Sep 2019 17:40:24 -0400 Subject: [PATCH] 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). --- .../clouddriver-kubernetes-v2.gradle | 33 +++++++++ .../clouddriver/kubernetes/v2/README.md | 0 .../v2/artifact/ArtifactReplacer.java | 0 .../artifact/KubernetesArtifactConverter.java | 0 ...ubernetesUnversionedArtifactConverter.java | 0 .../KubernetesVersionedArtifactConverter.java | 0 .../kubernetes/v2/artifact/Replacer.java | 0 .../kubernetes/v2/caching/Keys.java | 0 .../v2/caching/KubernetesV2Provider.java | 0 .../KubernetesV2ProviderSynchronizable.java | 4 -- .../caching/KubernetesV2SearchProvider.java | 5 +- .../CustomKubernetesCachingAgentFactory.java | 0 .../v2/caching/agent/KubernetesCacheData.java | 0 .../agent/KubernetesCacheDataConverter.java | 0 .../agent/KubernetesCoreCachingAgent.java | 0 .../agent/KubernetesMetricCachingAgent.java | 0 .../KubernetesNamespaceCachingAgent.java | 0 ...nregisteredCustomResourceCachingAgent.java | 0 .../agent/KubernetesV2CachingAgent.java | 0 .../KubernetesV2CachingAgentDispatcher.java | 0 .../KubernetesV2CachingAgentFactory.java | 0 .../KubernetesV2OnDemandCachingAgent.java | 0 .../view/model/KubernetesV2Application.java | 0 .../view/model/KubernetesV2Cluster.java | 0 .../view/model/KubernetesV2Health.java | 0 .../view/model/KubernetesV2Instance.java | 0 .../view/model/KubernetesV2LoadBalancer.java | 0 .../view/model/KubernetesV2Manifest.java | 0 .../view/model/KubernetesV2SecurityGroup.java | 0 .../view/model/KubernetesV2ServerGroup.java | 0 .../model/KubernetesV2ServerGroupManager.java | 0 .../model/KubernetesV2ServerGroupSummary.java | 0 .../view/model/ManifestBasedModel.java | 0 .../view/provider/KubernetesCacheUtils.java | 2 +- .../KubernetesV2AbstractManifestProvider.java | 0 .../KubernetesV2ApplicationProvider.java | 0 .../KubernetesV2ArtifactProvider.java | 0 .../provider/KubernetesV2ClusterProvider.java | 8 +-- .../KubernetesV2InstanceProvider.java | 0 .../KubernetesV2LiveManifestProvider.java | 0 .../KubernetesV2LoadBalancerProvider.java | 6 +- .../KubernetesV2ManifestProvider.java | 0 .../KubernetesV2SecurityGroupProvider.java | 19 ++---- ...ubernetesV2ServerGroupManagerProvider.java | 4 +- .../provider/data/KubernetesV2CacheData.java | 0 .../KubernetesV2ServerGroupCacheData.java | 0 ...bernetesV2ServerGroupManagerCacheData.java | 0 .../KubernetesCleanupArtifactsConverter.java | 0 .../KubernetesRunJobOperationConverter.java | 0 .../KubernetesDeleteManifestConverter.java | 0 .../KubernetesDeployManifestConverter.java | 0 .../KubernetesDisableManifestConverter.java | 0 .../KubernetesEnableManifestConverter.java | 0 .../KubernetesPatchManifestConverter.java | 0 ...bernetesPauseRolloutManifestConverter.java | 0 ...ernetesResumeRolloutManifestConverter.java | 0 .../KubernetesScaleManifestConverter.java | 0 ...ubernetesUndoRolloutManifestConverter.java | 0 .../KubernetesResizeServerGroupConverter.java | 0 .../AccountResourcePropertyRegistry.java | 0 .../GlobalResourcePropertyRegistry.java | 0 .../kubernetes/v2/description/JsonPatch.java | 0 .../KubernetesAccountResolver.java | 0 .../v2/description/KubernetesCoordinates.java | 0 .../description/KubernetesPatchOptions.java | 0 .../v2/description/KubernetesPodMetric.java | 0 .../KubernetesResourceProperties.java | 3 +- .../KubernetesSpinnakerKindMap.java | 31 +-------- .../v2/description/RegistryUtils.java | 0 .../description/ResourcePropertyRegistry.java | 0 ...KubernetesCleanupArtifactsDescription.java | 0 .../KubernetesRunJobOperationDescription.java | 0 .../GlobalKubernetesKindRegistry.java | 0 .../manifest/KubernetesApiGroup.java | 0 .../manifest/KubernetesApiVersion.java | 0 .../KubernetesApplicationProperties.java | 0 .../manifest/KubernetesCachingProperties.java | 0 .../KubernetesDeleteManifestDescription.java | 0 .../KubernetesDeployManifestDescription.java | 0 ...netesEnableDisableManifestDescription.java | 0 .../description/manifest/KubernetesKind.java | 0 .../manifest/KubernetesKindProperties.java | 0 .../manifest/KubernetesKindRegistry.java | 0 .../manifest/KubernetesManifest.java | 0 .../manifest/KubernetesManifestAnnotater.java | 0 .../manifest/KubernetesManifestLabeler.java | 0 .../manifest/KubernetesManifestList.java | 0 ...ubernetesManifestOperationDescription.java | 0 .../manifest/KubernetesManifestSelector.java | 0 .../manifest/KubernetesManifestStrategy.java | 0 .../manifest/KubernetesManifestTraffic.java | 0 ...etesMultiManifestOperationDescription.java | 0 .../KubernetesPatchManifestDescription.java | 0 ...rnetesPauseRolloutManifestDescription.java | 0 ...netesResumeRolloutManifestDescription.java | 0 .../KubernetesScaleManifestDescription.java | 0 .../manifest/KubernetesSourceCapacity.java | 0 ...ernetesUndoRolloutManifestDescription.java | 0 .../manifest/MalformedManifestException.java | 0 ...ubernetesResizeServerGroupDescription.java | 0 ...rnetesServerGroupOperationDescription.java | 0 .../v2/model/KubernetesV2JobStatus.java | 0 .../v2/names/KubernetesManifestNamer.java | 0 .../kubernetes/v2/op/OperationResult.java | 0 .../KubernetesCleanupArtifactsOperation.java | 0 .../kubernetes/v2/op/handler/CanDelete.java | 0 .../kubernetes/v2/op/handler/CanDeploy.java | 0 .../v2/op/handler/CanLoadBalance.java | 0 .../kubernetes/v2/op/handler/CanPatch.java | 0 .../v2/op/handler/CanPauseRollout.java | 0 .../kubernetes/v2/op/handler/CanResize.java | 0 .../v2/op/handler/CanResumeRollout.java | 0 .../kubernetes/v2/op/handler/CanRollout.java | 0 .../kubernetes/v2/op/handler/CanScale.java | 0 .../v2/op/handler/CanUndoRollout.java | 0 .../CustomKubernetesHandlerFactory.java | 2 +- .../kubernetes/v2/op/handler/HasPods.java | 0 .../handler/KubernetesAPIServiceHandler.java | 6 +- .../KubernetesClusterRoleBindingHandler.java | 6 +- .../handler/KubernetesClusterRoleHandler.java | 6 +- .../handler/KubernetesConfigMapHandler.java | 2 +- .../KubernetesControllerRevisionHandler.java | 2 +- .../op/handler/KubernetesCronJobHandler.java | 6 +- ...rnetesCustomResourceDefinitionHandler.java | 2 +- .../handler/KubernetesDaemonSetHandler.java | 2 +- .../handler/KubernetesDeploymentHandler.java | 6 +- .../v2/op/handler/KubernetesEventHandler.java | 6 +- .../v2/op/handler/KubernetesHandler.java | 2 +- ...ernetesHorizontalPodAutoscalerHandler.java | 2 +- .../op/handler/KubernetesIngressHandler.java | 2 +- .../v2/op/handler/KubernetesJobHandler.java | 6 +- ...esMutatingWebhookConfigurationHandler.java | 6 +- .../handler/KubernetesNamespaceHandler.java | 2 +- .../KubernetesNetworkPolicyHandler.java | 2 +- ...ubernetesPersistentVolumeClaimHandler.java | 2 +- .../KubernetesPersistentVolumeHandler.java | 2 +- .../KubernetesPodDisruptionBudgetHandler.java | 6 +- .../v2/op/handler/KubernetesPodHandler.java | 2 +- .../handler/KubernetesPodPresetHandler.java | 6 +- .../KubernetesPodSecurityPolicyHandler.java | 6 +- .../handler/KubernetesReplicaSetHandler.java | 2 +- .../handler/KubernetesRoleBindingHandler.java | 6 +- .../v2/op/handler/KubernetesRoleHandler.java | 6 +- .../op/handler/KubernetesSecretHandler.java | 2 +- .../KubernetesServiceAccountHandler.java | 6 +- .../op/handler/KubernetesServiceHandler.java | 2 +- .../handler/KubernetesStatefulSetHandler.java | 2 +- .../KubernetesStorageClassHandler.java | 6 +- ...etesUnregisteredCustomResourceHandler.java | 2 +- ...ValidatingWebhookConfigurationHandler.java | 6 +- .../v2/op/handler/ModelHandler.java | 0 .../v2/op/handler/ServerGroupHandler.java | 0 .../op/handler/ServerGroupManagerHandler.java | 0 .../handler/UnsupportedVersionException.java | 0 .../v2/op/job/KubectlJobExecutor.java | 0 .../job/KubernetesRunJobDeploymentResult.java | 0 .../v2/op/job/KubernetesRunJobOperation.java | 0 ...ernetesEnableDisableManifestOperation.java | 0 .../KubernetesDeleteManifestOperation.java | 0 .../KubernetesDeployManifestOperation.java | 2 +- .../KubernetesDisableManifestOperation.java | 0 .../KubernetesEnableManifestOperation.java | 0 .../KubernetesPatchManifestOperation.java | 0 ...bernetesPauseRolloutManifestOperation.java | 0 ...ernetesResumeRolloutManifestOperation.java | 0 .../KubernetesScaleManifestOperation.java | 0 ...ubernetesUndoRolloutManifestOperation.java | 0 .../KubernetesResizeServerGroupOperation.java | 0 .../view/KubernetesV2JobProvider.java | 2 +- .../v2/provider/view/PropertyParser.java | 0 .../security/KubernetesApiResourceParser.java | 0 .../v2/security/KubernetesSelector.java | 0 .../v2/security/KubernetesSelectorList.java | 0 .../v2/security/KubernetesV2Credentials.java | 0 .../v2/security/MatchExpression.java | 0 .../validator/KubernetesValidationUtil.java | 0 .../KubernetesArtifactCleanupValidator.java | 0 .../KubernetesDeleteManifestValidator.java | 0 .../KubernetesDeployManifestValidator.java | 0 .../KubernetesDisableManifestValidator.java | 0 .../KubernetesEnableManifestValidator.java | 0 .../KubernetesPatchManifestValidator.java | 0 ...bernetesPauseRolloutManifestValidator.java | 0 ...ernetesResumeRolloutManifestValidator.java | 0 .../KubernetesScaleManifestValidator.java | 0 ...ubernetesUndoRolloutManifestValidator.java | 0 .../KubernetesResizeServerGroupValidator.java | 0 .../config/KubernetesV2Configuration.java | 67 +++++++++++++++++++ ...bernetesNamedAccountCredentialsSpec.groovy | 0 .../v2/artifact/ArtifactReplacerSpec.groovy | 0 ...tesUnversionedArtifactConverterSpec.groovy | 0 ...netesVersionedArtifactConverterSpec.groovy | 0 .../kubernetes/v2/caching/KeysSpec.groovy | 0 ...ernetesV2ProviderSynchronizableSpec.groovy | 2 - .../KubernetesCacheDataConvertSpec.groovy | 0 .../agent/KubernetesCacheDataSpec.groovy | 0 ...ubernetesReplicaSetCachingAgentSpec.groovy | 0 ...bernetesDeployManifestConverterTest.groovy | 0 ...AccountResourcePropertyRegistrySpec.groovy | 0 .../GlobalKubernetesKindRegistrySpec.groovy | 0 .../GlobalResourcePropertyRegistrySpec.groovy | 0 .../KubernetesAccountResolverSpec.groovy | 0 .../description/KubernetesApiGroupSpec.groovy | 0 .../KubernetesApiVersionSpec.groovy | 0 .../KubernetesKindPropertiesSpec.groovy | 0 .../KubernetesKindRegistrySpec.groovy | 0 .../v2/description/KubernetesKindSpec.groovy | 0 .../KubernetesManifestAnnotatorSpec.groovy | 0 .../description/KubernetesManifestSpec.groovy | 0 .../KubernetesSpinnakerKindMapSpec.groovy | 23 ++++--- .../KubernetesManifestLabelerSpec.groovy | 0 ...bernetesDeployManifestOperationSpec.groovy | 0 .../v2/op/handler/HandlerPrioritySpec.groovy | 0 .../KubernetesDeploymentHandlerSpec.groovy | 0 ...sHorizontalPodAutoscalerHandlerSpec.groovy | 0 .../KubernetesStatefulSetHandlerSpec.groovy | 0 .../view/KubernetesV2JobProviderSpec.groovy | 0 .../provider/view/PropertyParserSpec.groovy | 0 .../KubernetesApiResourceParserSpec.groovy | 0 .../KubernetesSelectorListSpec.groovy | 0 .../v2/security/KubernetesSelectorSpec.groovy | 0 .../KubernetesV2CredentialsSpec.groovy | 0 .../KubernetesValidationUtilSpec.groovy | 0 .../v2/description/manifest/crd-manifest.json | 0 .../manifest/deployment-manifest.json | 0 .../description/manifest/list-manifest.json | 0 .../v2/description/manifest/manifest.json | 0 .../manifest/service-manifest.json | 0 .../v2/op/handler/statefulsetbase.json | 0 .../op/handler/statefulsetpartitionbase.json | 0 .../clouddriver-kubernetes.gradle | 5 -- .../config/CustomKubernetesResource.java | 4 +- .../kubernetes/description/SpinnakerKind.java | 49 ++++++++++++++ .../provider/KubernetesModelUtil.java | 2 +- .../KubernetesV1ProviderSynchronizable.java | 4 -- .../v1/security/KubernetesV1Credentials.java | 17 ++--- .../config/KubernetesConfiguration.java | 38 ----------- ...etesLoadBalancerAtomicOperationSpec.groovy | 3 +- ...sV1SecurityGroupAtomicOperationSpec.groovy | 3 +- .../CloneKubernetesAtomicOperationSpec.groovy | 3 +- ...DeployKubernetesAtomicOperationSpec.groovy | 3 +- ...ardKubernetesAttributeValidatorSpec.groovy | 3 +- ...alancerAtomicOperationValidatorSpec.groovy | 3 +- ...ernetesAtomicOperationValidatorSpec.groovy | 3 +- ...ernetesAtomicOperationValidatorSpec.groovy | 3 +- ...ernetesV1ProviderSynchronizableSpec.groovy | 15 ++--- ...ernetesLoadBalancerCachingAgentSpec.groovy | 3 +- ...bernetesServerGroupCachingAgentSpec.groovy | 3 +- ...etesV1SecurityGroupCachingAgentSpec.groovy | 3 +- .../KubernetesV1CredentialsSpec.groovy | 11 ++- settings.gradle | 2 +- 251 files changed, 280 insertions(+), 243 deletions(-) create mode 100644 clouddriver-kubernetes-v2/clouddriver-kubernetes-v2.gradle rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/README.md (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/artifact/ArtifactReplacer.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/artifact/KubernetesArtifactConverter.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/artifact/KubernetesUnversionedArtifactConverter.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/artifact/KubernetesVersionedArtifactConverter.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/artifact/Replacer.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/Keys.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/KubernetesV2Provider.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/KubernetesV2ProviderSynchronizable.java (96%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/KubernetesV2SearchProvider.java (97%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/agent/CustomKubernetesCachingAgentFactory.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/agent/KubernetesCacheData.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/agent/KubernetesCacheDataConverter.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/agent/KubernetesCoreCachingAgent.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/agent/KubernetesMetricCachingAgent.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/agent/KubernetesNamespaceCachingAgent.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/agent/KubernetesUnregisteredCustomResourceCachingAgent.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/agent/KubernetesV2CachingAgent.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/agent/KubernetesV2CachingAgentDispatcher.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/agent/KubernetesV2CachingAgentFactory.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/agent/KubernetesV2OnDemandCachingAgent.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/model/KubernetesV2Application.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/model/KubernetesV2Cluster.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/model/KubernetesV2Health.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/model/KubernetesV2Instance.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/model/KubernetesV2LoadBalancer.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/model/KubernetesV2Manifest.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/model/KubernetesV2SecurityGroup.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/model/KubernetesV2ServerGroup.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/model/KubernetesV2ServerGroupManager.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/model/KubernetesV2ServerGroupSummary.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/model/ManifestBasedModel.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/provider/KubernetesCacheUtils.java (98%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/provider/KubernetesV2AbstractManifestProvider.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/provider/KubernetesV2ApplicationProvider.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/provider/KubernetesV2ArtifactProvider.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/provider/KubernetesV2ClusterProvider.java (96%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/provider/KubernetesV2InstanceProvider.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/provider/KubernetesV2LiveManifestProvider.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/provider/KubernetesV2LoadBalancerProvider.java (93%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/provider/KubernetesV2ManifestProvider.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/provider/KubernetesV2SecurityGroupProvider.java (87%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/provider/KubernetesV2ServerGroupManagerProvider.java (92%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/provider/data/KubernetesV2CacheData.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/provider/data/KubernetesV2ServerGroupCacheData.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/provider/data/KubernetesV2ServerGroupManagerCacheData.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/converter/artifact/KubernetesCleanupArtifactsConverter.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/converter/job/KubernetesRunJobOperationConverter.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/converter/manifest/KubernetesDeleteManifestConverter.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/converter/manifest/KubernetesDeployManifestConverter.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/converter/manifest/KubernetesDisableManifestConverter.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/converter/manifest/KubernetesEnableManifestConverter.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/converter/manifest/KubernetesPatchManifestConverter.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/converter/manifest/KubernetesPauseRolloutManifestConverter.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/converter/manifest/KubernetesResumeRolloutManifestConverter.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/converter/manifest/KubernetesScaleManifestConverter.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/converter/manifest/KubernetesUndoRolloutManifestConverter.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/converter/servergroup/KubernetesResizeServerGroupConverter.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/AccountResourcePropertyRegistry.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/GlobalResourcePropertyRegistry.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/JsonPatch.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/KubernetesAccountResolver.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/KubernetesCoordinates.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/KubernetesPatchOptions.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/KubernetesPodMetric.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/KubernetesResourceProperties.java (95%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/KubernetesSpinnakerKindMap.java (79%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/RegistryUtils.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/ResourcePropertyRegistry.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/artifact/KubernetesCleanupArtifactsDescription.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/job/KubernetesRunJobOperationDescription.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/GlobalKubernetesKindRegistry.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesApiGroup.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesApiVersion.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesApplicationProperties.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesCachingProperties.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesDeleteManifestDescription.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesDeployManifestDescription.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesEnableDisableManifestDescription.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesKind.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesKindProperties.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesKindRegistry.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesManifest.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesManifestAnnotater.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesManifestLabeler.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesManifestList.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesManifestOperationDescription.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesManifestSelector.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesManifestStrategy.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesManifestTraffic.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesMultiManifestOperationDescription.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesPatchManifestDescription.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesPauseRolloutManifestDescription.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesResumeRolloutManifestDescription.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesScaleManifestDescription.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesSourceCapacity.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesUndoRolloutManifestDescription.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/MalformedManifestException.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/servergroup/KubernetesResizeServerGroupDescription.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/servergroup/KubernetesServerGroupOperationDescription.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/model/KubernetesV2JobStatus.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/names/KubernetesManifestNamer.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/OperationResult.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/artifact/KubernetesCleanupArtifactsOperation.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/CanDelete.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/CanDeploy.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/CanLoadBalance.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/CanPatch.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/CanPauseRollout.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/CanResize.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/CanResumeRollout.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/CanRollout.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/CanScale.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/CanUndoRollout.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/CustomKubernetesHandlerFactory.java (97%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/HasPods.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesAPIServiceHandler.java (89%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesClusterRoleBindingHandler.java (89%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesClusterRoleHandler.java (89%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesConfigMapHandler.java (94%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesControllerRevisionHandler.java (94%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesCronJobHandler.java (93%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesCustomResourceDefinitionHandler.java (94%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesDaemonSetHandler.java (97%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesDeploymentHandler.java (96%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesEventHandler.java (94%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesHandler.java (98%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesHorizontalPodAutoscalerHandler.java (95%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesIngressHandler.java (98%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesJobHandler.java (94%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesMutatingWebhookConfigurationHandler.java (88%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesNamespaceHandler.java (94%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesNetworkPolicyHandler.java (95%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesPersistentVolumeClaimHandler.java (94%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesPersistentVolumeHandler.java (94%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesPodDisruptionBudgetHandler.java (89%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesPodHandler.java (97%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesPodPresetHandler.java (88%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesPodSecurityPolicyHandler.java (88%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesReplicaSetHandler.java (98%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesRoleBindingHandler.java (89%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesRoleHandler.java (89%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesSecretHandler.java (95%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesServiceAccountHandler.java (89%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesServiceHandler.java (98%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesStatefulSetHandler.java (98%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesStorageClassHandler.java (89%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesUnregisteredCustomResourceHandler.java (95%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesValidatingWebhookConfigurationHandler.java (89%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/ModelHandler.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/ServerGroupHandler.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/ServerGroupManagerHandler.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/UnsupportedVersionException.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/job/KubectlJobExecutor.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/job/KubernetesRunJobDeploymentResult.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/job/KubernetesRunJobOperation.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/manifest/AbstractKubernetesEnableDisableManifestOperation.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/manifest/KubernetesDeleteManifestOperation.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/manifest/KubernetesDeployManifestOperation.java (99%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/manifest/KubernetesDisableManifestOperation.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/manifest/KubernetesEnableManifestOperation.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/manifest/KubernetesPatchManifestOperation.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/manifest/KubernetesPauseRolloutManifestOperation.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/manifest/KubernetesResumeRolloutManifestOperation.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/manifest/KubernetesScaleManifestOperation.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/manifest/KubernetesUndoRolloutManifestOperation.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/servergroup/KubernetesResizeServerGroupOperation.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/provider/view/KubernetesV2JobProvider.java (99%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/provider/view/PropertyParser.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/security/KubernetesApiResourceParser.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/security/KubernetesSelector.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/security/KubernetesSelectorList.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/security/KubernetesV2Credentials.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/security/MatchExpression.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/validator/KubernetesValidationUtil.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/validator/artifact/KubernetesArtifactCleanupValidator.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/validator/manifest/KubernetesDeleteManifestValidator.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/validator/manifest/KubernetesDeployManifestValidator.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/validator/manifest/KubernetesDisableManifestValidator.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/validator/manifest/KubernetesEnableManifestValidator.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/validator/manifest/KubernetesPatchManifestValidator.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/validator/manifest/KubernetesPauseRolloutManifestValidator.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/validator/manifest/KubernetesResumeRolloutManifestValidator.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/validator/manifest/KubernetesScaleManifestValidator.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/validator/manifest/KubernetesUndoRolloutManifestValidator.java (100%) rename {clouddriver-kubernetes/src/main/groovy => clouddriver-kubernetes-v2/src/main/java}/com/netflix/spinnaker/clouddriver/kubernetes/v2/validator/servergroup/KubernetesResizeServerGroupValidator.java (100%) create mode 100644 clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/config/KubernetesV2Configuration.java rename {clouddriver-kubernetes => clouddriver-kubernetes-v2}/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/security/KubernetesNamedAccountCredentialsSpec.groovy (100%) rename {clouddriver-kubernetes => clouddriver-kubernetes-v2}/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/artifact/ArtifactReplacerSpec.groovy (100%) rename {clouddriver-kubernetes => clouddriver-kubernetes-v2}/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/artifact/KubernetesUnversionedArtifactConverterSpec.groovy (100%) rename {clouddriver-kubernetes => clouddriver-kubernetes-v2}/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/artifact/KubernetesVersionedArtifactConverterSpec.groovy (100%) rename {clouddriver-kubernetes => clouddriver-kubernetes-v2}/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/KeysSpec.groovy (100%) rename {clouddriver-kubernetes => clouddriver-kubernetes-v2}/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/KubernetesV2ProviderSynchronizableSpec.groovy (98%) rename {clouddriver-kubernetes => clouddriver-kubernetes-v2}/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/agent/KubernetesCacheDataConvertSpec.groovy (100%) rename {clouddriver-kubernetes => clouddriver-kubernetes-v2}/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/agent/KubernetesCacheDataSpec.groovy (100%) rename {clouddriver-kubernetes => clouddriver-kubernetes-v2}/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/agent/KubernetesReplicaSetCachingAgentSpec.groovy (100%) rename {clouddriver-kubernetes => clouddriver-kubernetes-v2}/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/converter/manifest/KubernetesDeployManifestConverterTest.groovy (100%) rename {clouddriver-kubernetes => clouddriver-kubernetes-v2}/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/AccountResourcePropertyRegistrySpec.groovy (100%) rename {clouddriver-kubernetes => clouddriver-kubernetes-v2}/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/GlobalKubernetesKindRegistrySpec.groovy (100%) rename {clouddriver-kubernetes => clouddriver-kubernetes-v2}/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/GlobalResourcePropertyRegistrySpec.groovy (100%) rename {clouddriver-kubernetes => clouddriver-kubernetes-v2}/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/KubernetesAccountResolverSpec.groovy (100%) rename {clouddriver-kubernetes => clouddriver-kubernetes-v2}/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/KubernetesApiGroupSpec.groovy (100%) rename {clouddriver-kubernetes => clouddriver-kubernetes-v2}/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/KubernetesApiVersionSpec.groovy (100%) rename {clouddriver-kubernetes => clouddriver-kubernetes-v2}/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/KubernetesKindPropertiesSpec.groovy (100%) rename {clouddriver-kubernetes => clouddriver-kubernetes-v2}/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/KubernetesKindRegistrySpec.groovy (100%) rename {clouddriver-kubernetes => clouddriver-kubernetes-v2}/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/KubernetesKindSpec.groovy (100%) rename {clouddriver-kubernetes => clouddriver-kubernetes-v2}/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/KubernetesManifestAnnotatorSpec.groovy (100%) rename {clouddriver-kubernetes => clouddriver-kubernetes-v2}/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/KubernetesManifestSpec.groovy (100%) rename {clouddriver-kubernetes => clouddriver-kubernetes-v2}/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/KubernetesSpinnakerKindMapSpec.groovy (63%) rename {clouddriver-kubernetes => clouddriver-kubernetes-v2}/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesManifestLabelerSpec.groovy (100%) rename {clouddriver-kubernetes => clouddriver-kubernetes-v2}/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/KubernetesDeployManifestOperationSpec.groovy (100%) rename {clouddriver-kubernetes => clouddriver-kubernetes-v2}/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/HandlerPrioritySpec.groovy (100%) rename {clouddriver-kubernetes => clouddriver-kubernetes-v2}/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesDeploymentHandlerSpec.groovy (100%) rename {clouddriver-kubernetes => clouddriver-kubernetes-v2}/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesHorizontalPodAutoscalerHandlerSpec.groovy (100%) rename {clouddriver-kubernetes => clouddriver-kubernetes-v2}/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesStatefulSetHandlerSpec.groovy (100%) rename {clouddriver-kubernetes => clouddriver-kubernetes-v2}/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/provider/view/KubernetesV2JobProviderSpec.groovy (100%) rename {clouddriver-kubernetes => clouddriver-kubernetes-v2}/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/provider/view/PropertyParserSpec.groovy (100%) rename {clouddriver-kubernetes => clouddriver-kubernetes-v2}/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/security/KubernetesApiResourceParserSpec.groovy (100%) rename {clouddriver-kubernetes => clouddriver-kubernetes-v2}/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/security/KubernetesSelectorListSpec.groovy (100%) rename {clouddriver-kubernetes => clouddriver-kubernetes-v2}/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/security/KubernetesSelectorSpec.groovy (100%) rename {clouddriver-kubernetes => clouddriver-kubernetes-v2}/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/security/KubernetesV2CredentialsSpec.groovy (100%) rename {clouddriver-kubernetes => clouddriver-kubernetes-v2}/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/validator/KubernetesValidationUtilSpec.groovy (100%) rename {clouddriver-kubernetes => clouddriver-kubernetes-v2}/src/test/resources/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/crd-manifest.json (100%) rename {clouddriver-kubernetes => clouddriver-kubernetes-v2}/src/test/resources/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/deployment-manifest.json (100%) rename {clouddriver-kubernetes => clouddriver-kubernetes-v2}/src/test/resources/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/list-manifest.json (100%) rename {clouddriver-kubernetes => clouddriver-kubernetes-v2}/src/test/resources/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/manifest.json (100%) rename {clouddriver-kubernetes => clouddriver-kubernetes-v2}/src/test/resources/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/service-manifest.json (100%) rename {clouddriver-kubernetes => clouddriver-kubernetes-v2}/src/test/resources/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/statefulsetbase.json (100%) rename {clouddriver-kubernetes => clouddriver-kubernetes-v2}/src/test/resources/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/statefulsetpartitionbase.json (100%) create mode 100644 clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/description/SpinnakerKind.java diff --git a/clouddriver-kubernetes-v2/clouddriver-kubernetes-v2.gradle b/clouddriver-kubernetes-v2/clouddriver-kubernetes-v2.gradle new file mode 100644 index 00000000000..f6e533f470f --- /dev/null +++ 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/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/README.md b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/README.md similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/README.md rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/README.md diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/artifact/ArtifactReplacer.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/artifact/ArtifactReplacer.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/artifact/ArtifactReplacer.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/artifact/ArtifactReplacer.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/artifact/KubernetesArtifactConverter.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/artifact/KubernetesArtifactConverter.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/artifact/KubernetesArtifactConverter.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/artifact/KubernetesArtifactConverter.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/artifact/KubernetesUnversionedArtifactConverter.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/artifact/KubernetesUnversionedArtifactConverter.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/artifact/KubernetesUnversionedArtifactConverter.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/artifact/KubernetesUnversionedArtifactConverter.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/artifact/KubernetesVersionedArtifactConverter.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/artifact/KubernetesVersionedArtifactConverter.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/artifact/KubernetesVersionedArtifactConverter.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/artifact/KubernetesVersionedArtifactConverter.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/artifact/Replacer.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/artifact/Replacer.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/artifact/Replacer.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/artifact/Replacer.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/Keys.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/Keys.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/Keys.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/Keys.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/KubernetesV2Provider.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/KubernetesV2Provider.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/KubernetesV2Provider.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/KubernetesV2Provider.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/KubernetesV2ProviderSynchronizable.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/KubernetesV2ProviderSynchronizable.java similarity index 96% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/KubernetesV2ProviderSynchronizable.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/KubernetesV2ProviderSynchronizable.java index 194ea60277d..17d6743490e 100644 --- a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/KubernetesV2ProviderSynchronizable.java +++ b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/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/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/KubernetesV2SearchProvider.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/KubernetesV2SearchProvider.java similarity index 97% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/KubernetesV2SearchProvider.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/KubernetesV2SearchProvider.java index 461c347575d..d139ba20c78 100644 --- a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/KubernetesV2SearchProvider.java +++ b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/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> 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/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/agent/CustomKubernetesCachingAgentFactory.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/agent/CustomKubernetesCachingAgentFactory.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/agent/CustomKubernetesCachingAgentFactory.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/agent/CustomKubernetesCachingAgentFactory.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/agent/KubernetesCacheData.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/agent/KubernetesCacheData.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/agent/KubernetesCacheData.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/agent/KubernetesCacheData.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/agent/KubernetesCacheDataConverter.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/agent/KubernetesCacheDataConverter.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/agent/KubernetesCacheDataConverter.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/agent/KubernetesCacheDataConverter.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/agent/KubernetesCoreCachingAgent.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/agent/KubernetesCoreCachingAgent.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/agent/KubernetesCoreCachingAgent.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/agent/KubernetesCoreCachingAgent.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/agent/KubernetesMetricCachingAgent.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/agent/KubernetesMetricCachingAgent.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/agent/KubernetesMetricCachingAgent.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/agent/KubernetesMetricCachingAgent.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/agent/KubernetesNamespaceCachingAgent.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/agent/KubernetesNamespaceCachingAgent.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/agent/KubernetesNamespaceCachingAgent.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/agent/KubernetesNamespaceCachingAgent.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/agent/KubernetesUnregisteredCustomResourceCachingAgent.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/agent/KubernetesUnregisteredCustomResourceCachingAgent.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/agent/KubernetesUnregisteredCustomResourceCachingAgent.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/agent/KubernetesUnregisteredCustomResourceCachingAgent.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/agent/KubernetesV2CachingAgent.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/agent/KubernetesV2CachingAgent.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/agent/KubernetesV2CachingAgent.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/agent/KubernetesV2CachingAgent.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/agent/KubernetesV2CachingAgentDispatcher.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/agent/KubernetesV2CachingAgentDispatcher.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/agent/KubernetesV2CachingAgentDispatcher.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/agent/KubernetesV2CachingAgentDispatcher.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/agent/KubernetesV2CachingAgentFactory.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/agent/KubernetesV2CachingAgentFactory.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/agent/KubernetesV2CachingAgentFactory.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/agent/KubernetesV2CachingAgentFactory.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/agent/KubernetesV2OnDemandCachingAgent.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/agent/KubernetesV2OnDemandCachingAgent.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/agent/KubernetesV2OnDemandCachingAgent.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/agent/KubernetesV2OnDemandCachingAgent.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/model/KubernetesV2Application.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/model/KubernetesV2Application.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/model/KubernetesV2Application.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/model/KubernetesV2Application.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/model/KubernetesV2Cluster.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/model/KubernetesV2Cluster.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/model/KubernetesV2Cluster.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/model/KubernetesV2Cluster.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/model/KubernetesV2Health.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/model/KubernetesV2Health.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/model/KubernetesV2Health.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/model/KubernetesV2Health.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/model/KubernetesV2Instance.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/model/KubernetesV2Instance.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/model/KubernetesV2Instance.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/model/KubernetesV2Instance.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/model/KubernetesV2LoadBalancer.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/model/KubernetesV2LoadBalancer.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/model/KubernetesV2LoadBalancer.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/model/KubernetesV2LoadBalancer.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/model/KubernetesV2Manifest.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/model/KubernetesV2Manifest.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/model/KubernetesV2Manifest.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/model/KubernetesV2Manifest.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/model/KubernetesV2SecurityGroup.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/model/KubernetesV2SecurityGroup.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/model/KubernetesV2SecurityGroup.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/model/KubernetesV2SecurityGroup.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/model/KubernetesV2ServerGroup.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/model/KubernetesV2ServerGroup.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/model/KubernetesV2ServerGroup.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/model/KubernetesV2ServerGroup.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/model/KubernetesV2ServerGroupManager.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/model/KubernetesV2ServerGroupManager.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/model/KubernetesV2ServerGroupManager.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/model/KubernetesV2ServerGroupManager.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/model/KubernetesV2ServerGroupSummary.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/model/KubernetesV2ServerGroupSummary.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/model/KubernetesV2ServerGroupSummary.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/model/KubernetesV2ServerGroupSummary.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/model/ManifestBasedModel.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/model/ManifestBasedModel.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/model/ManifestBasedModel.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/model/ManifestBasedModel.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/provider/KubernetesCacheUtils.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/provider/KubernetesCacheUtils.java similarity index 98% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/provider/KubernetesCacheUtils.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/provider/KubernetesCacheUtils.java index f8227d57c93..bb27b0518d7 100644 --- a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/provider/KubernetesCacheUtils.java +++ b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/provider/KubernetesCacheUtils.java @@ -20,6 +20,7 @@ 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; @@ -27,7 +28,6 @@ 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/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/provider/KubernetesV2AbstractManifestProvider.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/provider/KubernetesV2AbstractManifestProvider.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/provider/KubernetesV2AbstractManifestProvider.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/provider/KubernetesV2AbstractManifestProvider.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/provider/KubernetesV2ApplicationProvider.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/provider/KubernetesV2ApplicationProvider.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/provider/KubernetesV2ApplicationProvider.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/provider/KubernetesV2ApplicationProvider.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/provider/KubernetesV2ArtifactProvider.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/provider/KubernetesV2ArtifactProvider.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/provider/KubernetesV2ArtifactProvider.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/provider/KubernetesV2ArtifactProvider.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/provider/KubernetesV2ClusterProvider.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/provider/KubernetesV2ClusterProvider.java similarity index 96% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/provider/KubernetesV2ClusterProvider.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/provider/KubernetesV2ClusterProvider.java index 071942fae06..4cf4360a800 100644 --- a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/provider/KubernetesV2ClusterProvider.java +++ b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/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/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/provider/KubernetesV2InstanceProvider.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/provider/KubernetesV2InstanceProvider.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/provider/KubernetesV2InstanceProvider.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/provider/KubernetesV2InstanceProvider.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/provider/KubernetesV2LiveManifestProvider.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/provider/KubernetesV2LiveManifestProvider.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/provider/KubernetesV2LiveManifestProvider.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/provider/KubernetesV2LiveManifestProvider.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/provider/KubernetesV2LoadBalancerProvider.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/provider/KubernetesV2LoadBalancerProvider.java similarity index 93% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/provider/KubernetesV2LoadBalancerProvider.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/provider/KubernetesV2LoadBalancerProvider.java index 1d11ceb56f9..32faba2a4a8 100644 --- a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/provider/KubernetesV2LoadBalancerProvider.java +++ b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/provider/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/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/provider/KubernetesV2ManifestProvider.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/provider/KubernetesV2ManifestProvider.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/provider/KubernetesV2ManifestProvider.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/provider/KubernetesV2ManifestProvider.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/provider/KubernetesV2SecurityGroupProvider.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/provider/KubernetesV2SecurityGroupProvider.java similarity index 87% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/provider/KubernetesV2SecurityGroupProvider.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/provider/KubernetesV2SecurityGroupProvider.java index bc33dcddc26..284c1849b8a 100644 --- a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/provider/KubernetesV2SecurityGroupProvider.java +++ b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/provider/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 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 getAll(boolean includeRules) { @Override public Set 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 getAllByRegion(boolean includeRules, Strin @Override public Set 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 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 getAllByAccountAndName( @Override public Set 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/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/provider/KubernetesV2ServerGroupManagerProvider.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/provider/KubernetesV2ServerGroupManagerProvider.java similarity index 92% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/provider/KubernetesV2ServerGroupManagerProvider.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/provider/KubernetesV2ServerGroupManagerProvider.java index c926aa052c0..e5b970e05cf 100644 --- a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/provider/KubernetesV2ServerGroupManagerProvider.java +++ b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/provider/KubernetesV2ServerGroupManagerProvider.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/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/provider/data/KubernetesV2CacheData.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/provider/data/KubernetesV2CacheData.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/provider/data/KubernetesV2CacheData.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/provider/data/KubernetesV2CacheData.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/provider/data/KubernetesV2ServerGroupCacheData.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/provider/data/KubernetesV2ServerGroupCacheData.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/provider/data/KubernetesV2ServerGroupCacheData.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/provider/data/KubernetesV2ServerGroupCacheData.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/provider/data/KubernetesV2ServerGroupManagerCacheData.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/provider/data/KubernetesV2ServerGroupManagerCacheData.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/provider/data/KubernetesV2ServerGroupManagerCacheData.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/view/provider/data/KubernetesV2ServerGroupManagerCacheData.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/converter/artifact/KubernetesCleanupArtifactsConverter.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/converter/artifact/KubernetesCleanupArtifactsConverter.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/converter/artifact/KubernetesCleanupArtifactsConverter.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/converter/artifact/KubernetesCleanupArtifactsConverter.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/converter/job/KubernetesRunJobOperationConverter.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/converter/job/KubernetesRunJobOperationConverter.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/converter/job/KubernetesRunJobOperationConverter.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/converter/job/KubernetesRunJobOperationConverter.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/converter/manifest/KubernetesDeleteManifestConverter.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/converter/manifest/KubernetesDeleteManifestConverter.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/converter/manifest/KubernetesDeleteManifestConverter.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/converter/manifest/KubernetesDeleteManifestConverter.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/converter/manifest/KubernetesDeployManifestConverter.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/converter/manifest/KubernetesDeployManifestConverter.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/converter/manifest/KubernetesDeployManifestConverter.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/converter/manifest/KubernetesDeployManifestConverter.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/converter/manifest/KubernetesDisableManifestConverter.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/converter/manifest/KubernetesDisableManifestConverter.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/converter/manifest/KubernetesDisableManifestConverter.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/converter/manifest/KubernetesDisableManifestConverter.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/converter/manifest/KubernetesEnableManifestConverter.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/converter/manifest/KubernetesEnableManifestConverter.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/converter/manifest/KubernetesEnableManifestConverter.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/converter/manifest/KubernetesEnableManifestConverter.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/converter/manifest/KubernetesPatchManifestConverter.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/converter/manifest/KubernetesPatchManifestConverter.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/converter/manifest/KubernetesPatchManifestConverter.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/converter/manifest/KubernetesPatchManifestConverter.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/converter/manifest/KubernetesPauseRolloutManifestConverter.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/converter/manifest/KubernetesPauseRolloutManifestConverter.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/converter/manifest/KubernetesPauseRolloutManifestConverter.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/converter/manifest/KubernetesPauseRolloutManifestConverter.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/converter/manifest/KubernetesResumeRolloutManifestConverter.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/converter/manifest/KubernetesResumeRolloutManifestConverter.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/converter/manifest/KubernetesResumeRolloutManifestConverter.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/converter/manifest/KubernetesResumeRolloutManifestConverter.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/converter/manifest/KubernetesScaleManifestConverter.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/converter/manifest/KubernetesScaleManifestConverter.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/converter/manifest/KubernetesScaleManifestConverter.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/converter/manifest/KubernetesScaleManifestConverter.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/converter/manifest/KubernetesUndoRolloutManifestConverter.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/converter/manifest/KubernetesUndoRolloutManifestConverter.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/converter/manifest/KubernetesUndoRolloutManifestConverter.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/converter/manifest/KubernetesUndoRolloutManifestConverter.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/converter/servergroup/KubernetesResizeServerGroupConverter.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/converter/servergroup/KubernetesResizeServerGroupConverter.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/converter/servergroup/KubernetesResizeServerGroupConverter.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/converter/servergroup/KubernetesResizeServerGroupConverter.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/AccountResourcePropertyRegistry.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/AccountResourcePropertyRegistry.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/AccountResourcePropertyRegistry.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/AccountResourcePropertyRegistry.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/GlobalResourcePropertyRegistry.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/GlobalResourcePropertyRegistry.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/GlobalResourcePropertyRegistry.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/GlobalResourcePropertyRegistry.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/JsonPatch.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/JsonPatch.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/JsonPatch.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/JsonPatch.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/KubernetesAccountResolver.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/KubernetesAccountResolver.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/KubernetesAccountResolver.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/KubernetesAccountResolver.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/KubernetesCoordinates.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/KubernetesCoordinates.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/KubernetesCoordinates.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/KubernetesCoordinates.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/KubernetesPatchOptions.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/KubernetesPatchOptions.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/KubernetesPatchOptions.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/KubernetesPatchOptions.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/KubernetesPodMetric.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/KubernetesPodMetric.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/KubernetesPodMetric.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/KubernetesPodMetric.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/KubernetesResourceProperties.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/KubernetesResourceProperties.java similarity index 95% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/KubernetesResourceProperties.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/KubernetesResourceProperties.java index 6dd5ac92cd0..30fd200ab40 100644 --- a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/KubernetesResourceProperties.java +++ b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/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/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/KubernetesSpinnakerKindMap.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/KubernetesSpinnakerKindMap.java similarity index 79% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/KubernetesSpinnakerKindMap.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/KubernetesSpinnakerKindMap.java index b9dd08bef50..e01af298609 100644 --- a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/KubernetesSpinnakerKindMap.java +++ b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/KubernetesSpinnakerKindMap.java @@ -17,13 +17,12 @@ 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; @@ -31,34 +30,6 @@ @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 kubernetesToSpinnaker; private final ImmutableSetMultimap spinnakerToKubernetes; diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/RegistryUtils.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/RegistryUtils.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/RegistryUtils.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/RegistryUtils.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/ResourcePropertyRegistry.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/ResourcePropertyRegistry.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/ResourcePropertyRegistry.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/ResourcePropertyRegistry.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/artifact/KubernetesCleanupArtifactsDescription.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/artifact/KubernetesCleanupArtifactsDescription.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/artifact/KubernetesCleanupArtifactsDescription.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/artifact/KubernetesCleanupArtifactsDescription.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/job/KubernetesRunJobOperationDescription.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/job/KubernetesRunJobOperationDescription.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/job/KubernetesRunJobOperationDescription.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/job/KubernetesRunJobOperationDescription.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/GlobalKubernetesKindRegistry.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/GlobalKubernetesKindRegistry.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/GlobalKubernetesKindRegistry.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/GlobalKubernetesKindRegistry.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesApiGroup.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesApiGroup.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesApiGroup.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesApiGroup.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesApiVersion.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesApiVersion.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesApiVersion.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesApiVersion.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesApplicationProperties.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesApplicationProperties.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesApplicationProperties.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesApplicationProperties.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesCachingProperties.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesCachingProperties.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesCachingProperties.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesCachingProperties.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesDeleteManifestDescription.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesDeleteManifestDescription.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesDeleteManifestDescription.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesDeleteManifestDescription.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesDeployManifestDescription.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesDeployManifestDescription.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesDeployManifestDescription.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesDeployManifestDescription.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesEnableDisableManifestDescription.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesEnableDisableManifestDescription.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesEnableDisableManifestDescription.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesEnableDisableManifestDescription.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesKind.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesKind.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesKind.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesKind.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesKindProperties.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesKindProperties.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesKindProperties.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesKindProperties.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesKindRegistry.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesKindRegistry.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesKindRegistry.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesKindRegistry.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesManifest.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesManifest.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesManifest.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesManifest.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesManifestAnnotater.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesManifestAnnotater.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesManifestAnnotater.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesManifestAnnotater.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesManifestLabeler.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesManifestLabeler.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesManifestLabeler.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesManifestLabeler.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesManifestList.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesManifestList.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesManifestList.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesManifestList.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesManifestOperationDescription.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesManifestOperationDescription.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesManifestOperationDescription.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesManifestOperationDescription.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesManifestSelector.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesManifestSelector.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesManifestSelector.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesManifestSelector.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesManifestStrategy.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesManifestStrategy.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesManifestStrategy.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesManifestStrategy.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesManifestTraffic.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesManifestTraffic.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesManifestTraffic.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesManifestTraffic.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesMultiManifestOperationDescription.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesMultiManifestOperationDescription.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesMultiManifestOperationDescription.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesMultiManifestOperationDescription.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesPatchManifestDescription.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesPatchManifestDescription.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesPatchManifestDescription.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesPatchManifestDescription.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesPauseRolloutManifestDescription.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesPauseRolloutManifestDescription.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesPauseRolloutManifestDescription.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesPauseRolloutManifestDescription.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesResumeRolloutManifestDescription.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesResumeRolloutManifestDescription.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesResumeRolloutManifestDescription.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesResumeRolloutManifestDescription.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesScaleManifestDescription.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesScaleManifestDescription.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesScaleManifestDescription.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesScaleManifestDescription.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesSourceCapacity.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesSourceCapacity.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesSourceCapacity.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesSourceCapacity.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesUndoRolloutManifestDescription.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesUndoRolloutManifestDescription.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesUndoRolloutManifestDescription.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesUndoRolloutManifestDescription.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/MalformedManifestException.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/MalformedManifestException.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/MalformedManifestException.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/MalformedManifestException.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/servergroup/KubernetesResizeServerGroupDescription.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/servergroup/KubernetesResizeServerGroupDescription.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/servergroup/KubernetesResizeServerGroupDescription.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/servergroup/KubernetesResizeServerGroupDescription.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/servergroup/KubernetesServerGroupOperationDescription.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/servergroup/KubernetesServerGroupOperationDescription.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/servergroup/KubernetesServerGroupOperationDescription.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/servergroup/KubernetesServerGroupOperationDescription.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/model/KubernetesV2JobStatus.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/model/KubernetesV2JobStatus.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/model/KubernetesV2JobStatus.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/model/KubernetesV2JobStatus.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/names/KubernetesManifestNamer.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/names/KubernetesManifestNamer.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/names/KubernetesManifestNamer.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/names/KubernetesManifestNamer.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/OperationResult.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/OperationResult.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/OperationResult.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/OperationResult.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/artifact/KubernetesCleanupArtifactsOperation.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/artifact/KubernetesCleanupArtifactsOperation.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/artifact/KubernetesCleanupArtifactsOperation.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/artifact/KubernetesCleanupArtifactsOperation.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/CanDelete.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/CanDelete.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/CanDelete.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/CanDelete.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/CanDeploy.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/CanDeploy.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/CanDeploy.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/CanDeploy.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/CanLoadBalance.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/CanLoadBalance.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/CanLoadBalance.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/CanLoadBalance.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/CanPatch.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/CanPatch.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/CanPatch.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/CanPatch.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/CanPauseRollout.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/CanPauseRollout.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/CanPauseRollout.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/CanPauseRollout.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/CanResize.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/CanResize.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/CanResize.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/CanResize.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/CanResumeRollout.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/CanResumeRollout.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/CanResumeRollout.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/CanResumeRollout.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/CanRollout.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/CanRollout.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/CanRollout.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/CanRollout.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/CanScale.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/CanScale.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/CanScale.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/CanScale.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/CanUndoRollout.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/CanUndoRollout.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/CanUndoRollout.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/CanUndoRollout.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/CustomKubernetesHandlerFactory.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/CustomKubernetesHandlerFactory.java similarity index 97% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/CustomKubernetesHandlerFactory.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/CustomKubernetesHandlerFactory.java index 7016401453b..65705da6e1c 100644 --- a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/CustomKubernetesHandlerFactory.java +++ b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/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/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/HasPods.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/HasPods.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/HasPods.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/HasPods.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesAPIServiceHandler.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesAPIServiceHandler.java similarity index 89% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesAPIServiceHandler.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesAPIServiceHandler.java index b1bd1e36025..332ff48a647 100644 --- a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesAPIServiceHandler.java +++ b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/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/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesClusterRoleBindingHandler.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesClusterRoleBindingHandler.java similarity index 89% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesClusterRoleBindingHandler.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesClusterRoleBindingHandler.java index 834e3f08605..162633103ed 100644 --- a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesClusterRoleBindingHandler.java +++ b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/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/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesClusterRoleHandler.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesClusterRoleHandler.java similarity index 89% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesClusterRoleHandler.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesClusterRoleHandler.java index 1f861be1163..274fd5e387a 100644 --- a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesClusterRoleHandler.java +++ b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/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 diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesConfigMapHandler.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesConfigMapHandler.java similarity index 94% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesConfigMapHandler.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesConfigMapHandler.java index 72ae6e54c99..e992c1afa40 100644 --- a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesConfigMapHandler.java +++ b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesConfigMapHandler.java @@ -19,9 +19,9 @@ import static com.netflix.spinnaker.clouddriver.kubernetes.v2.op.handler.KubernetesHandler.DeployPriority.MOUNTABLE_DATA_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.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.model.Manifest.Status; diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesControllerRevisionHandler.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesControllerRevisionHandler.java similarity index 94% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesControllerRevisionHandler.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesControllerRevisionHandler.java index 6fa60560acb..39cad1c066f 100644 --- a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesControllerRevisionHandler.java +++ b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesControllerRevisionHandler.java @@ -17,9 +17,9 @@ package com.netflix.spinnaker.clouddriver.kubernetes.v2.op.handler; +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.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.model.Manifest.Status; diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesCronJobHandler.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesCronJobHandler.java similarity index 93% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesCronJobHandler.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesCronJobHandler.java index 48886bfe2c0..6e956731443 100644 --- a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesCronJobHandler.java +++ b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesCronJobHandler.java @@ -20,11 +20,11 @@ import static com.netflix.spinnaker.clouddriver.kubernetes.v2.op.handler.KubernetesHandler.DeployPriority.WORKLOAD_CONTROLLER_PRIORITY; import com.google.common.collect.ImmutableList; +import com.netflix.spinnaker.clouddriver.kubernetes.description.SpinnakerKind; import com.netflix.spinnaker.clouddriver.kubernetes.v2.artifact.Replacer; import com.netflix.spinnaker.clouddriver.kubernetes.v2.caching.agent.KubernetesCacheDataConverter; 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; @@ -68,8 +68,8 @@ public boolean versioned() { @Nonnull @Override - public KubernetesSpinnakerKindMap.SpinnakerKind spinnakerKind() { - return KubernetesSpinnakerKindMap.SpinnakerKind.SERVER_GROUPS; + public SpinnakerKind spinnakerKind() { + return SpinnakerKind.SERVER_GROUPS; } @Override diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesCustomResourceDefinitionHandler.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesCustomResourceDefinitionHandler.java similarity index 94% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesCustomResourceDefinitionHandler.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesCustomResourceDefinitionHandler.java index e65d1dd9439..929e3a8cd21 100644 --- a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesCustomResourceDefinitionHandler.java +++ b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesCustomResourceDefinitionHandler.java @@ -19,9 +19,9 @@ import static com.netflix.spinnaker.clouddriver.kubernetes.v2.op.handler.KubernetesHandler.DeployPriority.RESOURCE_DEFINITION_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.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.model.Manifest.Status; diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesDaemonSetHandler.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesDaemonSetHandler.java similarity index 97% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesDaemonSetHandler.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesDaemonSetHandler.java index 6b9fad98e9a..516b6cbedb2 100644 --- a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesDaemonSetHandler.java +++ b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesDaemonSetHandler.java @@ -20,13 +20,13 @@ import static com.netflix.spinnaker.clouddriver.kubernetes.v2.op.handler.KubernetesHandler.DeployPriority.WORKLOAD_CONTROLLER_PRIORITY; import com.google.common.collect.ImmutableList; +import com.netflix.spinnaker.clouddriver.kubernetes.description.SpinnakerKind; import com.netflix.spinnaker.clouddriver.kubernetes.v2.artifact.Replacer; 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.agent.KubernetesCoreCachingAgent; import com.netflix.spinnaker.clouddriver.kubernetes.v2.caching.agent.KubernetesV2CachingAgentFactory; import com.netflix.spinnaker.clouddriver.kubernetes.v2.caching.view.provider.KubernetesCacheUtils; -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.model.Manifest.Status; diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesDeploymentHandler.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesDeploymentHandler.java similarity index 96% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesDeploymentHandler.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesDeploymentHandler.java index 635f9fc94c7..95ead9c80ea 100644 --- a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesDeploymentHandler.java +++ b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesDeploymentHandler.java @@ -23,11 +23,11 @@ import static com.netflix.spinnaker.clouddriver.kubernetes.v2.op.handler.KubernetesHandler.DeployPriority.WORKLOAD_CONTROLLER_PRIORITY; import com.google.common.collect.ImmutableList; +import com.netflix.spinnaker.clouddriver.kubernetes.description.SpinnakerKind; import com.netflix.spinnaker.clouddriver.kubernetes.v2.artifact.Replacer; import com.netflix.spinnaker.clouddriver.kubernetes.v2.caching.agent.KubernetesCacheDataConverter; 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; @@ -77,8 +77,8 @@ public boolean versioned() { @Nonnull @Override - public KubernetesSpinnakerKindMap.SpinnakerKind spinnakerKind() { - return KubernetesSpinnakerKindMap.SpinnakerKind.SERVER_GROUP_MANAGERS; + public SpinnakerKind spinnakerKind() { + return SpinnakerKind.SERVER_GROUP_MANAGERS; } @Override diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesEventHandler.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesEventHandler.java similarity index 94% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesEventHandler.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesEventHandler.java index 7f49671e877..7879cbd4b3a 100644 --- a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesEventHandler.java +++ b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesEventHandler.java @@ -19,10 +19,10 @@ import static com.netflix.spinnaker.clouddriver.kubernetes.v2.description.manifest.KubernetesKind.EVENT; +import com.netflix.spinnaker.clouddriver.kubernetes.description.SpinnakerKind; import com.netflix.spinnaker.clouddriver.kubernetes.v2.caching.agent.KubernetesCacheDataConverter; 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.KubernetesApiVersion; import com.netflix.spinnaker.clouddriver.kubernetes.v2.description.manifest.KubernetesKind; import com.netflix.spinnaker.clouddriver.kubernetes.v2.description.manifest.KubernetesManifest; @@ -60,8 +60,8 @@ public boolean versioned() { @Nonnull @Override - public KubernetesSpinnakerKindMap.SpinnakerKind spinnakerKind() { - return KubernetesSpinnakerKindMap.SpinnakerKind.UNCLASSIFIED; + public SpinnakerKind spinnakerKind() { + return SpinnakerKind.UNCLASSIFIED; } @Override diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesHandler.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesHandler.java similarity index 98% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesHandler.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesHandler.java index cb5eac8f490..81766fd190b 100644 --- a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesHandler.java +++ b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesHandler.java @@ -22,6 +22,7 @@ import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; 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.artifact.ArtifactReplacer; import com.netflix.spinnaker.clouddriver.kubernetes.v2.artifact.ArtifactReplacer.ReplaceResult; @@ -30,7 +31,6 @@ import com.netflix.spinnaker.clouddriver.kubernetes.v2.caching.agent.KubernetesV2CachingAgent; import com.netflix.spinnaker.clouddriver.kubernetes.v2.caching.agent.KubernetesV2CachingAgentFactory; import com.netflix.spinnaker.clouddriver.kubernetes.v2.caching.view.provider.KubernetesCacheUtils; -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/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesHorizontalPodAutoscalerHandler.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesHorizontalPodAutoscalerHandler.java similarity index 95% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesHorizontalPodAutoscalerHandler.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesHorizontalPodAutoscalerHandler.java index 26d1b02db0c..803fb93f9da 100644 --- a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesHorizontalPodAutoscalerHandler.java +++ b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesHorizontalPodAutoscalerHandler.java @@ -20,10 +20,10 @@ import static com.netflix.spinnaker.clouddriver.kubernetes.v2.op.handler.KubernetesHandler.DeployPriority.WORKLOAD_ATTACHMENT_PRIORITY; import com.google.common.collect.ImmutableList; +import com.netflix.spinnaker.clouddriver.kubernetes.description.SpinnakerKind; import com.netflix.spinnaker.clouddriver.kubernetes.v2.artifact.Replacer; 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.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.model.Manifest.Status; diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesIngressHandler.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesIngressHandler.java similarity index 98% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesIngressHandler.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesIngressHandler.java index 146cdadcf65..b892aaee15e 100644 --- a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesIngressHandler.java +++ b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesIngressHandler.java @@ -22,12 +22,12 @@ import static com.netflix.spinnaker.clouddriver.kubernetes.v2.description.manifest.KubernetesKind.SERVICE; import static com.netflix.spinnaker.clouddriver.kubernetes.v2.op.handler.KubernetesHandler.DeployPriority.NETWORK_RESOURCE_PRIORITY; +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.agent.KubernetesCoreCachingAgent; import com.netflix.spinnaker.clouddriver.kubernetes.v2.caching.agent.KubernetesV2CachingAgentFactory; import com.netflix.spinnaker.clouddriver.kubernetes.v2.caching.view.provider.KubernetesCacheUtils; -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.model.Manifest.Status; diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesJobHandler.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesJobHandler.java similarity index 94% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesJobHandler.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesJobHandler.java index cb4de721de1..607555a143e 100644 --- a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesJobHandler.java +++ b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesJobHandler.java @@ -20,11 +20,11 @@ import static com.netflix.spinnaker.clouddriver.kubernetes.v2.op.handler.KubernetesHandler.DeployPriority.WORKLOAD_CONTROLLER_PRIORITY; import com.google.common.collect.ImmutableList; +import com.netflix.spinnaker.clouddriver.kubernetes.description.SpinnakerKind; import com.netflix.spinnaker.clouddriver.kubernetes.v2.artifact.Replacer; import com.netflix.spinnaker.clouddriver.kubernetes.v2.caching.agent.KubernetesCacheDataConverter; 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; @@ -71,8 +71,8 @@ public boolean versioned() { @Nonnull @Override - public KubernetesSpinnakerKindMap.SpinnakerKind spinnakerKind() { - return KubernetesSpinnakerKindMap.SpinnakerKind.SERVER_GROUPS; + public SpinnakerKind spinnakerKind() { + return SpinnakerKind.SERVER_GROUPS; } @Override diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesMutatingWebhookConfigurationHandler.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesMutatingWebhookConfigurationHandler.java similarity index 88% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesMutatingWebhookConfigurationHandler.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesMutatingWebhookConfigurationHandler.java index 8348a314f4c..3061101eae9 100644 --- a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesMutatingWebhookConfigurationHandler.java +++ b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesMutatingWebhookConfigurationHandler.java @@ -16,9 +16,9 @@ package com.netflix.spinnaker.clouddriver.kubernetes.v2.op.handler; +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; @@ -45,8 +45,8 @@ public boolean versioned() { @Nonnull @Override - public KubernetesSpinnakerKindMap.SpinnakerKind spinnakerKind() { - return KubernetesSpinnakerKindMap.SpinnakerKind.UNCLASSIFIED; + public SpinnakerKind spinnakerKind() { + return SpinnakerKind.UNCLASSIFIED; } @Override diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesNamespaceHandler.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesNamespaceHandler.java similarity index 94% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesNamespaceHandler.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesNamespaceHandler.java index e182907f268..6e84da9c337 100644 --- a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesNamespaceHandler.java +++ b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesNamespaceHandler.java @@ -19,9 +19,9 @@ import static com.netflix.spinnaker.clouddriver.kubernetes.v2.op.handler.KubernetesHandler.DeployPriority.NAMESPACE_PRIORITY; +import com.netflix.spinnaker.clouddriver.kubernetes.description.SpinnakerKind; import com.netflix.spinnaker.clouddriver.kubernetes.v2.caching.agent.KubernetesNamespaceCachingAgent; import com.netflix.spinnaker.clouddriver.kubernetes.v2.caching.agent.KubernetesV2CachingAgentFactory; -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.model.Manifest.Status; diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesNetworkPolicyHandler.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesNetworkPolicyHandler.java similarity index 95% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesNetworkPolicyHandler.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesNetworkPolicyHandler.java index 65f8abe62e9..13dbc1ec1a4 100644 --- a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesNetworkPolicyHandler.java +++ b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesNetworkPolicyHandler.java @@ -19,11 +19,11 @@ import static com.netflix.spinnaker.clouddriver.kubernetes.v2.op.handler.KubernetesHandler.DeployPriority.NETWORK_RESOURCE_PRIORITY; +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.KubernetesCoreCachingAgent; import com.netflix.spinnaker.clouddriver.kubernetes.v2.caching.agent.KubernetesV2CachingAgentFactory; import com.netflix.spinnaker.clouddriver.kubernetes.v2.caching.view.provider.KubernetesCacheUtils; -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.model.Manifest.Status; diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesPersistentVolumeClaimHandler.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesPersistentVolumeClaimHandler.java similarity index 94% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesPersistentVolumeClaimHandler.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesPersistentVolumeClaimHandler.java index 3a88a43fbe2..8bc0e2d5c05 100644 --- a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesPersistentVolumeClaimHandler.java +++ b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesPersistentVolumeClaimHandler.java @@ -19,9 +19,9 @@ import static com.netflix.spinnaker.clouddriver.kubernetes.v2.op.handler.KubernetesHandler.DeployPriority.MOUNTABLE_DATA_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.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.model.Manifest.Status; diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesPersistentVolumeHandler.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesPersistentVolumeHandler.java similarity index 94% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesPersistentVolumeHandler.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesPersistentVolumeHandler.java index 18ea448fae7..86fceeb715d 100644 --- a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesPersistentVolumeHandler.java +++ b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesPersistentVolumeHandler.java @@ -19,9 +19,9 @@ import static com.netflix.spinnaker.clouddriver.kubernetes.v2.op.handler.KubernetesHandler.DeployPriority.MOUNTABLE_DATA_BACKING_RESOURCE_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.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.model.Manifest.Status; diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesPodDisruptionBudgetHandler.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesPodDisruptionBudgetHandler.java similarity index 89% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesPodDisruptionBudgetHandler.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesPodDisruptionBudgetHandler.java index 58c01af8dbc..c8d58dae6f4 100644 --- a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesPodDisruptionBudgetHandler.java +++ b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesPodDisruptionBudgetHandler.java @@ -19,9 +19,9 @@ import static com.netflix.spinnaker.clouddriver.kubernetes.v2.op.handler.KubernetesHandler.DeployPriority.PDB_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/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesPodHandler.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesPodHandler.java similarity index 97% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesPodHandler.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesPodHandler.java index ec7827cb794..5a266a9cc7a 100644 --- a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesPodHandler.java +++ b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesPodHandler.java @@ -20,13 +20,13 @@ import static com.netflix.spinnaker.clouddriver.kubernetes.v2.op.handler.KubernetesHandler.DeployPriority.WORKLOAD_PRIORITY; import com.google.common.collect.ImmutableList; +import com.netflix.spinnaker.clouddriver.kubernetes.description.SpinnakerKind; import com.netflix.spinnaker.clouddriver.kubernetes.v2.artifact.Replacer; 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.agent.KubernetesCoreCachingAgent; import com.netflix.spinnaker.clouddriver.kubernetes.v2.caching.agent.KubernetesV2CachingAgentFactory; import com.netflix.spinnaker.clouddriver.kubernetes.v2.caching.view.provider.KubernetesCacheUtils; -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.model.Manifest.Status; diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesPodPresetHandler.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesPodPresetHandler.java similarity index 88% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesPodPresetHandler.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesPodPresetHandler.java index bce58f2cc54..db44bf9aeb1 100644 --- a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesPodPresetHandler.java +++ b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesPodPresetHandler.java @@ -16,9 +16,9 @@ package com.netflix.spinnaker.clouddriver.kubernetes.v2.op.handler; +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; @@ -45,8 +45,8 @@ public boolean versioned() { @Nonnull @Override - public KubernetesSpinnakerKindMap.SpinnakerKind spinnakerKind() { - return KubernetesSpinnakerKindMap.SpinnakerKind.UNCLASSIFIED; + public SpinnakerKind spinnakerKind() { + return SpinnakerKind.UNCLASSIFIED; } @Override diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesPodSecurityPolicyHandler.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesPodSecurityPolicyHandler.java similarity index 88% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesPodSecurityPolicyHandler.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesPodSecurityPolicyHandler.java index 8ef88bd9f11..bdaa6eeb37b 100644 --- a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesPodSecurityPolicyHandler.java +++ b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesPodSecurityPolicyHandler.java @@ -16,9 +16,9 @@ package com.netflix.spinnaker.clouddriver.kubernetes.v2.op.handler; +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; @@ -45,8 +45,8 @@ public boolean versioned() { @Nonnull @Override - public KubernetesSpinnakerKindMap.SpinnakerKind spinnakerKind() { - return KubernetesSpinnakerKindMap.SpinnakerKind.UNCLASSIFIED; + public SpinnakerKind spinnakerKind() { + return SpinnakerKind.UNCLASSIFIED; } @Override diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesReplicaSetHandler.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesReplicaSetHandler.java similarity index 98% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesReplicaSetHandler.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesReplicaSetHandler.java index a12265410ae..2a637bf7ccc 100644 --- a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesReplicaSetHandler.java +++ b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesReplicaSetHandler.java @@ -22,13 +22,13 @@ import static com.netflix.spinnaker.clouddriver.kubernetes.v2.op.handler.KubernetesHandler.DeployPriority.WORKLOAD_CONTROLLER_PRIORITY; import com.google.common.collect.ImmutableList; +import com.netflix.spinnaker.clouddriver.kubernetes.description.SpinnakerKind; import com.netflix.spinnaker.clouddriver.kubernetes.v2.artifact.Replacer; 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.agent.KubernetesCoreCachingAgent; import com.netflix.spinnaker.clouddriver.kubernetes.v2.caching.agent.KubernetesV2CachingAgentFactory; import com.netflix.spinnaker.clouddriver.kubernetes.v2.caching.view.provider.KubernetesCacheUtils; -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.description.manifest.KubernetesManifestSelector; diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesRoleBindingHandler.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesRoleBindingHandler.java similarity index 89% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesRoleBindingHandler.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesRoleBindingHandler.java index 0f745d1b4b2..e6f6d770804 100644 --- a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesRoleBindingHandler.java +++ b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesRoleBindingHandler.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/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesRoleHandler.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesRoleHandler.java similarity index 89% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesRoleHandler.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesRoleHandler.java index c7517eec6c7..a44b3c82db1 100644 --- a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesRoleHandler.java +++ b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesRoleHandler.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 diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesSecretHandler.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesSecretHandler.java similarity index 95% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesSecretHandler.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesSecretHandler.java index ce6f40aa635..5ccc9e2894a 100644 --- a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesSecretHandler.java +++ b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesSecretHandler.java @@ -19,9 +19,9 @@ import static com.netflix.spinnaker.clouddriver.kubernetes.v2.op.handler.KubernetesHandler.DeployPriority.MOUNTABLE_DATA_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.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.model.Manifest.Status; diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesServiceAccountHandler.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesServiceAccountHandler.java similarity index 89% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesServiceAccountHandler.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesServiceAccountHandler.java index 0c700e2c1ad..144f73f77dd 100644 --- a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesServiceAccountHandler.java +++ b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesServiceAccountHandler.java @@ -19,9 +19,9 @@ import static com.netflix.spinnaker.clouddriver.kubernetes.v2.op.handler.KubernetesHandler.DeployPriority.SERVICE_ACCOUNT_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/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesServiceHandler.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesServiceHandler.java similarity index 98% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesServiceHandler.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesServiceHandler.java index 04ab8a3f493..13eb1dde3f4 100644 --- a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesServiceHandler.java +++ b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesServiceHandler.java @@ -23,6 +23,7 @@ import static com.netflix.spinnaker.clouddriver.kubernetes.v2.description.manifest.KubernetesKind.SERVICE; import static com.netflix.spinnaker.clouddriver.kubernetes.v2.op.handler.KubernetesHandler.DeployPriority.NETWORK_RESOURCE_PRIORITY; +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.agent.KubernetesCoreCachingAgent; @@ -30,7 +31,6 @@ import com.netflix.spinnaker.clouddriver.kubernetes.v2.caching.view.provider.KubernetesCacheUtils; import com.netflix.spinnaker.clouddriver.kubernetes.v2.description.JsonPatch; import com.netflix.spinnaker.clouddriver.kubernetes.v2.description.JsonPatch.Op; -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.model.Manifest.Status; diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesStatefulSetHandler.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesStatefulSetHandler.java similarity index 98% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesStatefulSetHandler.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesStatefulSetHandler.java index 3fb22893a98..92d9a41693b 100644 --- a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesStatefulSetHandler.java +++ b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesStatefulSetHandler.java @@ -22,13 +22,13 @@ import static com.netflix.spinnaker.clouddriver.kubernetes.v2.op.handler.KubernetesHandler.DeployPriority.WORKLOAD_CONTROLLER_PRIORITY; import com.google.common.collect.ImmutableList; +import com.netflix.spinnaker.clouddriver.kubernetes.description.SpinnakerKind; import com.netflix.spinnaker.clouddriver.kubernetes.v2.artifact.Replacer; 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.agent.KubernetesCoreCachingAgent; import com.netflix.spinnaker.clouddriver.kubernetes.v2.caching.agent.KubernetesV2CachingAgentFactory; import com.netflix.spinnaker.clouddriver.kubernetes.v2.caching.view.provider.KubernetesCacheUtils; -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.model.Manifest.Status; diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesStorageClassHandler.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesStorageClassHandler.java similarity index 89% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesStorageClassHandler.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesStorageClassHandler.java index d54aa979c5e..2d98d976a7e 100644 --- a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesStorageClassHandler.java +++ b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesStorageClassHandler.java @@ -19,9 +19,9 @@ import static com.netflix.spinnaker.clouddriver.kubernetes.v2.op.handler.KubernetesHandler.DeployPriority.STORAGE_CLASS_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/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesUnregisteredCustomResourceHandler.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesUnregisteredCustomResourceHandler.java similarity index 95% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesUnregisteredCustomResourceHandler.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesUnregisteredCustomResourceHandler.java index ee7d521c10a..e8dec654fac 100644 --- a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesUnregisteredCustomResourceHandler.java +++ b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesUnregisteredCustomResourceHandler.java @@ -19,9 +19,9 @@ import static com.netflix.spinnaker.clouddriver.kubernetes.v2.op.handler.KubernetesHandler.DeployPriority.LOWEST_PRIORITY; +import com.netflix.spinnaker.clouddriver.kubernetes.description.SpinnakerKind; import com.netflix.spinnaker.clouddriver.kubernetes.v2.caching.agent.KubernetesUnregisteredCustomResourceCachingAgent; import com.netflix.spinnaker.clouddriver.kubernetes.v2.caching.agent.KubernetesV2CachingAgentFactory; -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.model.Manifest.Status; diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesValidatingWebhookConfigurationHandler.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesValidatingWebhookConfigurationHandler.java similarity index 89% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesValidatingWebhookConfigurationHandler.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesValidatingWebhookConfigurationHandler.java index 64f0def2eb6..acf2beaef57 100644 --- a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesValidatingWebhookConfigurationHandler.java +++ b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesValidatingWebhookConfigurationHandler.java @@ -16,9 +16,9 @@ package com.netflix.spinnaker.clouddriver.kubernetes.v2.op.handler; +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; @@ -45,8 +45,8 @@ public boolean versioned() { @Nonnull @Override - public KubernetesSpinnakerKindMap.SpinnakerKind spinnakerKind() { - return KubernetesSpinnakerKindMap.SpinnakerKind.UNCLASSIFIED; + public SpinnakerKind spinnakerKind() { + return SpinnakerKind.UNCLASSIFIED; } @Override diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/ModelHandler.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/ModelHandler.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/ModelHandler.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/ModelHandler.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/ServerGroupHandler.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/ServerGroupHandler.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/ServerGroupHandler.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/ServerGroupHandler.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/ServerGroupManagerHandler.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/ServerGroupManagerHandler.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/ServerGroupManagerHandler.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/ServerGroupManagerHandler.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/UnsupportedVersionException.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/UnsupportedVersionException.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/UnsupportedVersionException.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/UnsupportedVersionException.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/job/KubectlJobExecutor.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/job/KubectlJobExecutor.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/job/KubectlJobExecutor.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/job/KubectlJobExecutor.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/job/KubernetesRunJobDeploymentResult.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/job/KubernetesRunJobDeploymentResult.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/job/KubernetesRunJobDeploymentResult.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/job/KubernetesRunJobDeploymentResult.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/job/KubernetesRunJobOperation.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/job/KubernetesRunJobOperation.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/job/KubernetesRunJobOperation.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/job/KubernetesRunJobOperation.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/manifest/AbstractKubernetesEnableDisableManifestOperation.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/manifest/AbstractKubernetesEnableDisableManifestOperation.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/manifest/AbstractKubernetesEnableDisableManifestOperation.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/manifest/AbstractKubernetesEnableDisableManifestOperation.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/manifest/KubernetesDeleteManifestOperation.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/manifest/KubernetesDeleteManifestOperation.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/manifest/KubernetesDeleteManifestOperation.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/manifest/KubernetesDeleteManifestOperation.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/manifest/KubernetesDeployManifestOperation.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/manifest/KubernetesDeployManifestOperation.java similarity index 99% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/manifest/KubernetesDeployManifestOperation.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/manifest/KubernetesDeployManifestOperation.java index 4d52475a760..b6bc2034a4f 100644 --- a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/manifest/KubernetesDeployManifestOperation.java +++ b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/manifest/KubernetesDeployManifestOperation.java @@ -47,7 +47,7 @@ public class KubernetesDeployManifestOperation implements AtomicOperation namer; private final String accountName; private static final String OP_NAME = "DEPLOY_KUBERNETES_MANIFEST"; diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/manifest/KubernetesDisableManifestOperation.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/manifest/KubernetesDisableManifestOperation.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/manifest/KubernetesDisableManifestOperation.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/manifest/KubernetesDisableManifestOperation.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/manifest/KubernetesEnableManifestOperation.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/manifest/KubernetesEnableManifestOperation.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/manifest/KubernetesEnableManifestOperation.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/manifest/KubernetesEnableManifestOperation.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/manifest/KubernetesPatchManifestOperation.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/manifest/KubernetesPatchManifestOperation.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/manifest/KubernetesPatchManifestOperation.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/manifest/KubernetesPatchManifestOperation.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/manifest/KubernetesPauseRolloutManifestOperation.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/manifest/KubernetesPauseRolloutManifestOperation.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/manifest/KubernetesPauseRolloutManifestOperation.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/manifest/KubernetesPauseRolloutManifestOperation.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/manifest/KubernetesResumeRolloutManifestOperation.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/manifest/KubernetesResumeRolloutManifestOperation.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/manifest/KubernetesResumeRolloutManifestOperation.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/manifest/KubernetesResumeRolloutManifestOperation.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/manifest/KubernetesScaleManifestOperation.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/manifest/KubernetesScaleManifestOperation.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/manifest/KubernetesScaleManifestOperation.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/manifest/KubernetesScaleManifestOperation.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/manifest/KubernetesUndoRolloutManifestOperation.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/manifest/KubernetesUndoRolloutManifestOperation.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/manifest/KubernetesUndoRolloutManifestOperation.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/manifest/KubernetesUndoRolloutManifestOperation.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/servergroup/KubernetesResizeServerGroupOperation.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/servergroup/KubernetesResizeServerGroupOperation.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/servergroup/KubernetesResizeServerGroupOperation.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/servergroup/KubernetesResizeServerGroupOperation.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/provider/view/KubernetesV2JobProvider.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/provider/view/KubernetesV2JobProvider.java similarity index 99% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/provider/view/KubernetesV2JobProvider.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/provider/view/KubernetesV2JobProvider.java index 2793d35d671..0d547427527 100644 --- a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/provider/view/KubernetesV2JobProvider.java +++ b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/provider/view/KubernetesV2JobProvider.java @@ -87,7 +87,7 @@ public Map getFileContents( KubernetesV2Credentials credentials = (KubernetesV2Credentials) accountCredentialsProvider.getCredentials(account).getCredentials(); - Map props = null; + Map props = null; try { V1Job job = getKubernetesJob(account, location, id); String logContents = credentials.jobLogs(location, job.getMetadata().getName()); diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/provider/view/PropertyParser.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/provider/view/PropertyParser.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/provider/view/PropertyParser.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/provider/view/PropertyParser.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/security/KubernetesApiResourceParser.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/security/KubernetesApiResourceParser.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/security/KubernetesApiResourceParser.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/security/KubernetesApiResourceParser.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/security/KubernetesSelector.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/security/KubernetesSelector.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/security/KubernetesSelector.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/security/KubernetesSelector.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/security/KubernetesSelectorList.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/security/KubernetesSelectorList.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/security/KubernetesSelectorList.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/security/KubernetesSelectorList.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/security/KubernetesV2Credentials.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/security/KubernetesV2Credentials.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/security/KubernetesV2Credentials.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/security/KubernetesV2Credentials.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/security/MatchExpression.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/security/MatchExpression.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/security/MatchExpression.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/security/MatchExpression.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/validator/KubernetesValidationUtil.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/validator/KubernetesValidationUtil.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/validator/KubernetesValidationUtil.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/validator/KubernetesValidationUtil.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/validator/artifact/KubernetesArtifactCleanupValidator.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/validator/artifact/KubernetesArtifactCleanupValidator.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/validator/artifact/KubernetesArtifactCleanupValidator.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/validator/artifact/KubernetesArtifactCleanupValidator.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/validator/manifest/KubernetesDeleteManifestValidator.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/validator/manifest/KubernetesDeleteManifestValidator.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/validator/manifest/KubernetesDeleteManifestValidator.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/validator/manifest/KubernetesDeleteManifestValidator.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/validator/manifest/KubernetesDeployManifestValidator.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/validator/manifest/KubernetesDeployManifestValidator.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/validator/manifest/KubernetesDeployManifestValidator.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/validator/manifest/KubernetesDeployManifestValidator.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/validator/manifest/KubernetesDisableManifestValidator.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/validator/manifest/KubernetesDisableManifestValidator.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/validator/manifest/KubernetesDisableManifestValidator.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/validator/manifest/KubernetesDisableManifestValidator.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/validator/manifest/KubernetesEnableManifestValidator.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/validator/manifest/KubernetesEnableManifestValidator.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/validator/manifest/KubernetesEnableManifestValidator.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/validator/manifest/KubernetesEnableManifestValidator.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/validator/manifest/KubernetesPatchManifestValidator.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/validator/manifest/KubernetesPatchManifestValidator.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/validator/manifest/KubernetesPatchManifestValidator.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/validator/manifest/KubernetesPatchManifestValidator.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/validator/manifest/KubernetesPauseRolloutManifestValidator.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/validator/manifest/KubernetesPauseRolloutManifestValidator.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/validator/manifest/KubernetesPauseRolloutManifestValidator.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/validator/manifest/KubernetesPauseRolloutManifestValidator.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/validator/manifest/KubernetesResumeRolloutManifestValidator.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/validator/manifest/KubernetesResumeRolloutManifestValidator.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/validator/manifest/KubernetesResumeRolloutManifestValidator.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/validator/manifest/KubernetesResumeRolloutManifestValidator.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/validator/manifest/KubernetesScaleManifestValidator.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/validator/manifest/KubernetesScaleManifestValidator.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/validator/manifest/KubernetesScaleManifestValidator.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/validator/manifest/KubernetesScaleManifestValidator.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/validator/manifest/KubernetesUndoRolloutManifestValidator.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/validator/manifest/KubernetesUndoRolloutManifestValidator.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/validator/manifest/KubernetesUndoRolloutManifestValidator.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/validator/manifest/KubernetesUndoRolloutManifestValidator.java diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/validator/servergroup/KubernetesResizeServerGroupValidator.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/validator/servergroup/KubernetesResizeServerGroupValidator.java similarity index 100% rename from clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/validator/servergroup/KubernetesResizeServerGroupValidator.java rename to clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/clouddriver/kubernetes/v2/validator/servergroup/KubernetesResizeServerGroupValidator.java diff --git a/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/config/KubernetesV2Configuration.java b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/config/KubernetesV2Configuration.java new file mode 100644 index 00000000000..739a47e01c0 --- /dev/null +++ b/clouddriver-kubernetes-v2/src/main/java/com/netflix/spinnaker/config/KubernetesV2Configuration.java @@ -0,0 +1,67 @@ +/* + * 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. + * 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.cats.module.CatsModule; +import com.netflix.spinnaker.clouddriver.kubernetes.config.KubernetesConfigurationProperties; +import com.netflix.spinnaker.clouddriver.kubernetes.v2.caching.KubernetesV2Provider; +import com.netflix.spinnaker.clouddriver.kubernetes.v2.caching.KubernetesV2ProviderSynchronizable; +import com.netflix.spinnaker.clouddriver.kubernetes.v2.caching.agent.KubernetesV2CachingAgentDispatcher; +import com.netflix.spinnaker.clouddriver.kubernetes.v2.description.manifest.GlobalKubernetesKindRegistry; +import com.netflix.spinnaker.clouddriver.kubernetes.v2.description.manifest.KubernetesKindProperties; +import com.netflix.spinnaker.clouddriver.kubernetes.v2.security.KubernetesV2Credentials; +import com.netflix.spinnaker.clouddriver.security.AccountCredentialsRepository; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +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 KubernetesV2Configuration { + @Bean + public KubernetesV2Provider kubernetesV2Provider() { + return new KubernetesV2Provider(); + } + + @Bean + public GlobalKubernetesKindRegistry globalKubernetesKindRegistry() { + return new GlobalKubernetesKindRegistry(KubernetesKindProperties.getGlobalKindProperties()); + } + + @Bean + public KubernetesV2ProviderSynchronizable kubernetesV2ProviderSynchronizable( + KubernetesV2Provider kubernetesV2Provider, + AccountCredentialsRepository accountCredentialsRepository, + KubernetesV2CachingAgentDispatcher kubernetesV2CachingAgentDispatcher, + KubernetesConfigurationProperties kubernetesConfigurationProperties, + KubernetesV2Credentials.Factory credentialFactory, + CatsModule catsModule) { + return new KubernetesV2ProviderSynchronizable( + kubernetesV2Provider, + accountCredentialsRepository, + kubernetesV2CachingAgentDispatcher, + kubernetesConfigurationProperties, + credentialFactory, + catsModule); + } +} diff --git a/clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/security/KubernetesNamedAccountCredentialsSpec.groovy b/clouddriver-kubernetes-v2/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/security/KubernetesNamedAccountCredentialsSpec.groovy similarity index 100% rename from clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/security/KubernetesNamedAccountCredentialsSpec.groovy rename to clouddriver-kubernetes-v2/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/security/KubernetesNamedAccountCredentialsSpec.groovy diff --git a/clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/artifact/ArtifactReplacerSpec.groovy b/clouddriver-kubernetes-v2/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/artifact/ArtifactReplacerSpec.groovy similarity index 100% rename from clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/artifact/ArtifactReplacerSpec.groovy rename to clouddriver-kubernetes-v2/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/artifact/ArtifactReplacerSpec.groovy diff --git a/clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/artifact/KubernetesUnversionedArtifactConverterSpec.groovy b/clouddriver-kubernetes-v2/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/artifact/KubernetesUnversionedArtifactConverterSpec.groovy similarity index 100% rename from clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/artifact/KubernetesUnversionedArtifactConverterSpec.groovy rename to clouddriver-kubernetes-v2/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/artifact/KubernetesUnversionedArtifactConverterSpec.groovy diff --git a/clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/artifact/KubernetesVersionedArtifactConverterSpec.groovy b/clouddriver-kubernetes-v2/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/artifact/KubernetesVersionedArtifactConverterSpec.groovy similarity index 100% rename from clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/artifact/KubernetesVersionedArtifactConverterSpec.groovy rename to clouddriver-kubernetes-v2/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/artifact/KubernetesVersionedArtifactConverterSpec.groovy diff --git a/clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/KeysSpec.groovy b/clouddriver-kubernetes-v2/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/KeysSpec.groovy similarity index 100% rename from clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/KeysSpec.groovy rename to clouddriver-kubernetes-v2/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/KeysSpec.groovy diff --git a/clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/KubernetesV2ProviderSynchronizableSpec.groovy b/clouddriver-kubernetes-v2/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/KubernetesV2ProviderSynchronizableSpec.groovy similarity index 98% rename from clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/KubernetesV2ProviderSynchronizableSpec.groovy rename to clouddriver-kubernetes-v2/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/KubernetesV2ProviderSynchronizableSpec.groovy index aa4e6bc4279..4c6b9fe9aa9 100644 --- a/clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/KubernetesV2ProviderSynchronizableSpec.groovy +++ b/clouddriver-kubernetes-v2/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/KubernetesV2ProviderSynchronizableSpec.groovy @@ -32,7 +32,6 @@ import com.netflix.spinnaker.clouddriver.security.AccountCredentials import com.netflix.spinnaker.clouddriver.security.AccountCredentialsRepository import com.netflix.spinnaker.clouddriver.security.ProviderVersion import com.netflix.spinnaker.kork.configserver.ConfigFileService -import groovy.transform.CompileStatic import spock.lang.Specification class KubernetesV2ProviderSynchronizableSpec extends Specification { @@ -64,7 +63,6 @@ class KubernetesV2ProviderSynchronizableSpec extends Specification { agentDispatcher, configurationProperties, credentialFactory, - new KubernetesSpinnakerKindMap(Collections.emptyList()), catsModule ) diff --git a/clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/agent/KubernetesCacheDataConvertSpec.groovy b/clouddriver-kubernetes-v2/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/agent/KubernetesCacheDataConvertSpec.groovy similarity index 100% rename from clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/agent/KubernetesCacheDataConvertSpec.groovy rename to clouddriver-kubernetes-v2/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/agent/KubernetesCacheDataConvertSpec.groovy diff --git a/clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/agent/KubernetesCacheDataSpec.groovy b/clouddriver-kubernetes-v2/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/agent/KubernetesCacheDataSpec.groovy similarity index 100% rename from clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/agent/KubernetesCacheDataSpec.groovy rename to clouddriver-kubernetes-v2/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/agent/KubernetesCacheDataSpec.groovy diff --git a/clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/agent/KubernetesReplicaSetCachingAgentSpec.groovy b/clouddriver-kubernetes-v2/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/agent/KubernetesReplicaSetCachingAgentSpec.groovy similarity index 100% rename from clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/agent/KubernetesReplicaSetCachingAgentSpec.groovy rename to clouddriver-kubernetes-v2/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/caching/agent/KubernetesReplicaSetCachingAgentSpec.groovy diff --git a/clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/converter/manifest/KubernetesDeployManifestConverterTest.groovy b/clouddriver-kubernetes-v2/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/converter/manifest/KubernetesDeployManifestConverterTest.groovy similarity index 100% rename from clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/converter/manifest/KubernetesDeployManifestConverterTest.groovy rename to clouddriver-kubernetes-v2/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/converter/manifest/KubernetesDeployManifestConverterTest.groovy diff --git a/clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/AccountResourcePropertyRegistrySpec.groovy b/clouddriver-kubernetes-v2/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/AccountResourcePropertyRegistrySpec.groovy similarity index 100% rename from clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/AccountResourcePropertyRegistrySpec.groovy rename to clouddriver-kubernetes-v2/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/AccountResourcePropertyRegistrySpec.groovy diff --git a/clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/GlobalKubernetesKindRegistrySpec.groovy b/clouddriver-kubernetes-v2/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/GlobalKubernetesKindRegistrySpec.groovy similarity index 100% rename from clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/GlobalKubernetesKindRegistrySpec.groovy rename to clouddriver-kubernetes-v2/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/GlobalKubernetesKindRegistrySpec.groovy diff --git a/clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/GlobalResourcePropertyRegistrySpec.groovy b/clouddriver-kubernetes-v2/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/GlobalResourcePropertyRegistrySpec.groovy similarity index 100% rename from clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/GlobalResourcePropertyRegistrySpec.groovy rename to clouddriver-kubernetes-v2/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/GlobalResourcePropertyRegistrySpec.groovy diff --git a/clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/KubernetesAccountResolverSpec.groovy b/clouddriver-kubernetes-v2/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/KubernetesAccountResolverSpec.groovy similarity index 100% rename from clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/KubernetesAccountResolverSpec.groovy rename to clouddriver-kubernetes-v2/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/KubernetesAccountResolverSpec.groovy diff --git a/clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/KubernetesApiGroupSpec.groovy b/clouddriver-kubernetes-v2/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/KubernetesApiGroupSpec.groovy similarity index 100% rename from clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/KubernetesApiGroupSpec.groovy rename to clouddriver-kubernetes-v2/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/KubernetesApiGroupSpec.groovy diff --git a/clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/KubernetesApiVersionSpec.groovy b/clouddriver-kubernetes-v2/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/KubernetesApiVersionSpec.groovy similarity index 100% rename from clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/KubernetesApiVersionSpec.groovy rename to clouddriver-kubernetes-v2/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/KubernetesApiVersionSpec.groovy diff --git a/clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/KubernetesKindPropertiesSpec.groovy b/clouddriver-kubernetes-v2/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/KubernetesKindPropertiesSpec.groovy similarity index 100% rename from clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/KubernetesKindPropertiesSpec.groovy rename to clouddriver-kubernetes-v2/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/KubernetesKindPropertiesSpec.groovy diff --git a/clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/KubernetesKindRegistrySpec.groovy b/clouddriver-kubernetes-v2/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/KubernetesKindRegistrySpec.groovy similarity index 100% rename from clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/KubernetesKindRegistrySpec.groovy rename to clouddriver-kubernetes-v2/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/KubernetesKindRegistrySpec.groovy diff --git a/clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/KubernetesKindSpec.groovy b/clouddriver-kubernetes-v2/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/KubernetesKindSpec.groovy similarity index 100% rename from clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/KubernetesKindSpec.groovy rename to clouddriver-kubernetes-v2/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/KubernetesKindSpec.groovy diff --git a/clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/KubernetesManifestAnnotatorSpec.groovy b/clouddriver-kubernetes-v2/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/KubernetesManifestAnnotatorSpec.groovy similarity index 100% rename from clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/KubernetesManifestAnnotatorSpec.groovy rename to clouddriver-kubernetes-v2/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/KubernetesManifestAnnotatorSpec.groovy diff --git a/clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/KubernetesManifestSpec.groovy b/clouddriver-kubernetes-v2/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/KubernetesManifestSpec.groovy similarity index 100% rename from clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/KubernetesManifestSpec.groovy rename to clouddriver-kubernetes-v2/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/KubernetesManifestSpec.groovy diff --git a/clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/KubernetesSpinnakerKindMapSpec.groovy b/clouddriver-kubernetes-v2/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/KubernetesSpinnakerKindMapSpec.groovy similarity index 63% rename from clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/KubernetesSpinnakerKindMapSpec.groovy rename to clouddriver-kubernetes-v2/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/KubernetesSpinnakerKindMapSpec.groovy index 7523f804387..984f42e1c2f 100644 --- a/clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/KubernetesSpinnakerKindMapSpec.groovy +++ b/clouddriver-kubernetes-v2/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/KubernetesSpinnakerKindMapSpec.groovy @@ -17,6 +17,7 @@ package com.netflix.spinnaker.clouddriver.kubernetes.v2.description import com.google.common.collect.ImmutableSet +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 spock.lang.Specification @@ -25,7 +26,7 @@ class KubernetesSpinnakerKindMapSpec extends Specification { void "the kind map is properly initialized"() { given: def mockHandler = Mock(KubernetesHandler) { - spinnakerKind() >> KubernetesSpinnakerKindMap.SpinnakerKind.INSTANCES + spinnakerKind() >> SpinnakerKind.INSTANCES kind() >> KubernetesKind.REPLICA_SET } @@ -33,32 +34,32 @@ class KubernetesSpinnakerKindMapSpec extends Specification { def kindMap = new KubernetesSpinnakerKindMap([mockHandler]) then: - kindMap.translateSpinnakerKind(KubernetesSpinnakerKindMap.SpinnakerKind.INSTANCES) == ImmutableSet.of(KubernetesKind.REPLICA_SET) - kindMap.translateKubernetesKind(KubernetesKind.REPLICA_SET) == KubernetesSpinnakerKindMap.SpinnakerKind.INSTANCES + kindMap.translateSpinnakerKind(SpinnakerKind.INSTANCES) == ImmutableSet.of(KubernetesKind.REPLICA_SET) + kindMap.translateKubernetesKind(KubernetesKind.REPLICA_SET) == SpinnakerKind.INSTANCES } void "the kind map properly groups kinds"() { when: def kindMap = new KubernetesSpinnakerKindMap([ Mock(KubernetesHandler) { - spinnakerKind() >> KubernetesSpinnakerKindMap.SpinnakerKind.INSTANCES + spinnakerKind() >> SpinnakerKind.INSTANCES kind() >> KubernetesKind.REPLICA_SET }, Mock(KubernetesHandler) { - spinnakerKind() >> KubernetesSpinnakerKindMap.SpinnakerKind.INSTANCES + spinnakerKind() >> SpinnakerKind.INSTANCES kind() >> KubernetesKind.DEPLOYMENT }, Mock(KubernetesHandler) { - spinnakerKind() >> KubernetesSpinnakerKindMap.SpinnakerKind.LOAD_BALANCERS + spinnakerKind() >> SpinnakerKind.LOAD_BALANCERS kind() >> KubernetesKind.SERVICE } ]) then: - kindMap.translateSpinnakerKind(KubernetesSpinnakerKindMap.SpinnakerKind.INSTANCES) == ImmutableSet.of(KubernetesKind.REPLICA_SET, KubernetesKind.DEPLOYMENT) - kindMap.translateSpinnakerKind(KubernetesSpinnakerKindMap.SpinnakerKind.LOAD_BALANCERS) == ImmutableSet.of(KubernetesKind.SERVICE) - kindMap.translateKubernetesKind(KubernetesKind.REPLICA_SET) == KubernetesSpinnakerKindMap.SpinnakerKind.INSTANCES - kindMap.translateKubernetesKind(KubernetesKind.DEPLOYMENT) == KubernetesSpinnakerKindMap.SpinnakerKind.INSTANCES - kindMap.translateKubernetesKind(KubernetesKind.SERVICE) == KubernetesSpinnakerKindMap.SpinnakerKind.LOAD_BALANCERS + kindMap.translateSpinnakerKind(SpinnakerKind.INSTANCES) == ImmutableSet.of(KubernetesKind.REPLICA_SET, KubernetesKind.DEPLOYMENT) + kindMap.translateSpinnakerKind(SpinnakerKind.LOAD_BALANCERS) == ImmutableSet.of(KubernetesKind.SERVICE) + kindMap.translateKubernetesKind(KubernetesKind.REPLICA_SET) == SpinnakerKind.INSTANCES + kindMap.translateKubernetesKind(KubernetesKind.DEPLOYMENT) == SpinnakerKind.INSTANCES + kindMap.translateKubernetesKind(KubernetesKind.SERVICE) == SpinnakerKind.LOAD_BALANCERS } } diff --git a/clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesManifestLabelerSpec.groovy b/clouddriver-kubernetes-v2/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesManifestLabelerSpec.groovy similarity index 100% rename from clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesManifestLabelerSpec.groovy rename to clouddriver-kubernetes-v2/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/KubernetesManifestLabelerSpec.groovy diff --git a/clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/KubernetesDeployManifestOperationSpec.groovy b/clouddriver-kubernetes-v2/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/KubernetesDeployManifestOperationSpec.groovy similarity index 100% rename from clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/KubernetesDeployManifestOperationSpec.groovy rename to clouddriver-kubernetes-v2/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/KubernetesDeployManifestOperationSpec.groovy diff --git a/clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/HandlerPrioritySpec.groovy b/clouddriver-kubernetes-v2/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/HandlerPrioritySpec.groovy similarity index 100% rename from clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/HandlerPrioritySpec.groovy rename to clouddriver-kubernetes-v2/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/HandlerPrioritySpec.groovy diff --git a/clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesDeploymentHandlerSpec.groovy b/clouddriver-kubernetes-v2/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesDeploymentHandlerSpec.groovy similarity index 100% rename from clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesDeploymentHandlerSpec.groovy rename to clouddriver-kubernetes-v2/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesDeploymentHandlerSpec.groovy diff --git a/clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesHorizontalPodAutoscalerHandlerSpec.groovy b/clouddriver-kubernetes-v2/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesHorizontalPodAutoscalerHandlerSpec.groovy similarity index 100% rename from clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesHorizontalPodAutoscalerHandlerSpec.groovy rename to clouddriver-kubernetes-v2/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesHorizontalPodAutoscalerHandlerSpec.groovy diff --git a/clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesStatefulSetHandlerSpec.groovy b/clouddriver-kubernetes-v2/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesStatefulSetHandlerSpec.groovy similarity index 100% rename from clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesStatefulSetHandlerSpec.groovy rename to clouddriver-kubernetes-v2/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/KubernetesStatefulSetHandlerSpec.groovy diff --git a/clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/provider/view/KubernetesV2JobProviderSpec.groovy b/clouddriver-kubernetes-v2/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/provider/view/KubernetesV2JobProviderSpec.groovy similarity index 100% rename from clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/provider/view/KubernetesV2JobProviderSpec.groovy rename to clouddriver-kubernetes-v2/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/provider/view/KubernetesV2JobProviderSpec.groovy diff --git a/clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/provider/view/PropertyParserSpec.groovy b/clouddriver-kubernetes-v2/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/provider/view/PropertyParserSpec.groovy similarity index 100% rename from clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/provider/view/PropertyParserSpec.groovy rename to clouddriver-kubernetes-v2/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/provider/view/PropertyParserSpec.groovy diff --git a/clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/security/KubernetesApiResourceParserSpec.groovy b/clouddriver-kubernetes-v2/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/security/KubernetesApiResourceParserSpec.groovy similarity index 100% rename from clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/security/KubernetesApiResourceParserSpec.groovy rename to clouddriver-kubernetes-v2/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/security/KubernetesApiResourceParserSpec.groovy diff --git a/clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/security/KubernetesSelectorListSpec.groovy b/clouddriver-kubernetes-v2/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/security/KubernetesSelectorListSpec.groovy similarity index 100% rename from clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/security/KubernetesSelectorListSpec.groovy rename to clouddriver-kubernetes-v2/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/security/KubernetesSelectorListSpec.groovy diff --git a/clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/security/KubernetesSelectorSpec.groovy b/clouddriver-kubernetes-v2/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/security/KubernetesSelectorSpec.groovy similarity index 100% rename from clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/security/KubernetesSelectorSpec.groovy rename to clouddriver-kubernetes-v2/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/security/KubernetesSelectorSpec.groovy diff --git a/clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/security/KubernetesV2CredentialsSpec.groovy b/clouddriver-kubernetes-v2/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/security/KubernetesV2CredentialsSpec.groovy similarity index 100% rename from clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/security/KubernetesV2CredentialsSpec.groovy rename to clouddriver-kubernetes-v2/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/security/KubernetesV2CredentialsSpec.groovy diff --git a/clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/validator/KubernetesValidationUtilSpec.groovy b/clouddriver-kubernetes-v2/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/validator/KubernetesValidationUtilSpec.groovy similarity index 100% rename from clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/validator/KubernetesValidationUtilSpec.groovy rename to clouddriver-kubernetes-v2/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v2/validator/KubernetesValidationUtilSpec.groovy diff --git a/clouddriver-kubernetes/src/test/resources/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/crd-manifest.json b/clouddriver-kubernetes-v2/src/test/resources/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/crd-manifest.json similarity index 100% rename from clouddriver-kubernetes/src/test/resources/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/crd-manifest.json rename to clouddriver-kubernetes-v2/src/test/resources/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/crd-manifest.json diff --git a/clouddriver-kubernetes/src/test/resources/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/deployment-manifest.json b/clouddriver-kubernetes-v2/src/test/resources/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/deployment-manifest.json similarity index 100% rename from clouddriver-kubernetes/src/test/resources/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/deployment-manifest.json rename to clouddriver-kubernetes-v2/src/test/resources/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/deployment-manifest.json diff --git a/clouddriver-kubernetes/src/test/resources/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/list-manifest.json b/clouddriver-kubernetes-v2/src/test/resources/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/list-manifest.json similarity index 100% rename from clouddriver-kubernetes/src/test/resources/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/list-manifest.json rename to clouddriver-kubernetes-v2/src/test/resources/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/list-manifest.json diff --git a/clouddriver-kubernetes/src/test/resources/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/manifest.json b/clouddriver-kubernetes-v2/src/test/resources/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/manifest.json similarity index 100% rename from clouddriver-kubernetes/src/test/resources/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/manifest.json rename to clouddriver-kubernetes-v2/src/test/resources/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/manifest.json diff --git a/clouddriver-kubernetes/src/test/resources/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/service-manifest.json b/clouddriver-kubernetes-v2/src/test/resources/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/service-manifest.json similarity index 100% rename from clouddriver-kubernetes/src/test/resources/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/service-manifest.json rename to clouddriver-kubernetes-v2/src/test/resources/com/netflix/spinnaker/clouddriver/kubernetes/v2/description/manifest/service-manifest.json diff --git a/clouddriver-kubernetes/src/test/resources/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/statefulsetbase.json b/clouddriver-kubernetes-v2/src/test/resources/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/statefulsetbase.json similarity index 100% rename from clouddriver-kubernetes/src/test/resources/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/statefulsetbase.json rename to clouddriver-kubernetes-v2/src/test/resources/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/statefulsetbase.json diff --git a/clouddriver-kubernetes/src/test/resources/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/statefulsetpartitionbase.json b/clouddriver-kubernetes-v2/src/test/resources/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/statefulsetpartitionbase.json similarity index 100% rename from clouddriver-kubernetes/src/test/resources/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/statefulsetpartitionbase.json rename to clouddriver-kubernetes-v2/src/test/resources/com/netflix/spinnaker/clouddriver/kubernetes/v2/op/handler/statefulsetpartitionbase.json diff --git a/clouddriver-kubernetes/clouddriver-kubernetes.gradle b/clouddriver-kubernetes/clouddriver-kubernetes.gradle index 5e158ee0585..4eeb042babd 100644 --- a/clouddriver-kubernetes/clouddriver-kubernetes.gradle +++ b/clouddriver-kubernetes/clouddriver-kubernetes.gradle @@ -1,5 +1,4 @@ dependencies { - implementation project(":clouddriver-artifacts") implementation project(":clouddriver-core") implementation project(":cats:cats-core") implementation project(":clouddriver-docker") @@ -15,16 +14,12 @@ dependencies { implementation "com.netflix.frigga:frigga" implementation "com.netflix.spinnaker.fiat:fiat-api:$fiatVersion" implementation "com.netflix.spinnaker.fiat:fiat-core:$fiatVersion" - implementation "com.netflix.spinnaker.kork:kork-artifacts" implementation "com.netflix.spinnaker.kork:kork-config" implementation "com.netflix.spinnaker.moniker:moniker" - implementation "com.netflix.spectator:spectator-api" 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" - implementation 'com.jayway.jsonpath:json-path:2.3.0' - implementation "com.github.ben-manes.caffeine:guava" testImplementation "cglib:cglib-nodep" testImplementation "org.objenesis:objenesis" diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/config/CustomKubernetesResource.java b/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/config/CustomKubernetesResource.java index 5098e04e013..b3eefb249a7 100644 --- a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/config/CustomKubernetesResource.java +++ b/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/config/CustomKubernetesResource.java @@ -15,13 +15,13 @@ */ package com.netflix.spinnaker.clouddriver.kubernetes.config; -import com.netflix.spinnaker.clouddriver.kubernetes.v2.description.KubernetesSpinnakerKindMap; +import com.netflix.spinnaker.clouddriver.kubernetes.description.SpinnakerKind; import lombok.Data; @Data public class CustomKubernetesResource { private String kubernetesKind; - private String spinnakerKind = KubernetesSpinnakerKindMap.SpinnakerKind.UNCLASSIFIED.toString(); + private String spinnakerKind = SpinnakerKind.UNCLASSIFIED.toString(); private String deployPriority = "100"; private boolean versioned = false; private boolean namespaced = true; diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/description/SpinnakerKind.java b/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/description/SpinnakerKind.java new file mode 100644 index 00000000000..f4cfc73fe51 --- /dev/null +++ b/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/description/SpinnakerKind.java @@ -0,0 +1,49 @@ +/* + * Copyright 2019 Netflix, 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.clouddriver.kubernetes.description; + +import com.fasterxml.jackson.annotation.JsonCreator; +import java.util.Arrays; + +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); + } +} diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/provider/KubernetesModelUtil.java b/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/provider/KubernetesModelUtil.java index 34e63db5fcd..e2eddacff6d 100644 --- a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/provider/KubernetesModelUtil.java +++ b/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/provider/KubernetesModelUtil.java @@ -24,7 +24,7 @@ import java.util.Map; import java.util.stream.Collectors; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; @Slf4j public class KubernetesModelUtil { diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v1/provider/KubernetesV1ProviderSynchronizable.java b/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v1/provider/KubernetesV1ProviderSynchronizable.java index 6d9a22669f6..24e06a72fa2 100644 --- a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v1/provider/KubernetesV1ProviderSynchronizable.java +++ b/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v1/provider/KubernetesV1ProviderSynchronizable.java @@ -25,7 +25,6 @@ import com.netflix.spinnaker.clouddriver.kubernetes.security.KubernetesNamedAccountCredentials; import com.netflix.spinnaker.clouddriver.kubernetes.v1.provider.agent.KubernetesV1CachingAgentDispatcher; import com.netflix.spinnaker.clouddriver.kubernetes.v1.security.KubernetesV1Credentials; -import com.netflix.spinnaker.clouddriver.kubernetes.v2.description.KubernetesSpinnakerKindMap; import com.netflix.spinnaker.clouddriver.security.AccountCredentials; import com.netflix.spinnaker.clouddriver.security.AccountCredentialsRepository; import com.netflix.spinnaker.clouddriver.security.CredentialsInitializerSynchronizable; @@ -46,7 +45,6 @@ public class KubernetesV1ProviderSynchronizable implements CredentialsInitialize private KubernetesV1CachingAgentDispatcher kubernetesV1CachingAgentDispatcher; private KubernetesConfigurationProperties kubernetesConfigurationProperties; private KubernetesV1Credentials.Factory credentialFactory; - private KubernetesSpinnakerKindMap kubernetesSpinnakerKindMap; private CatsModule catsModule; public KubernetesV1ProviderSynchronizable( @@ -55,14 +53,12 @@ public KubernetesV1ProviderSynchronizable( KubernetesV1CachingAgentDispatcher kubernetesV1CachingAgentDispatcher, KubernetesConfigurationProperties kubernetesConfigurationProperties, KubernetesV1Credentials.Factory credentialFactory, - KubernetesSpinnakerKindMap kubernetesSpinnakerKindMap, CatsModule catsModule) { this.kubernetesV1Provider = kubernetesV1Provider; this.accountCredentialsRepository = accountCredentialsRepository; this.kubernetesV1CachingAgentDispatcher = kubernetesV1CachingAgentDispatcher; this.kubernetesConfigurationProperties = kubernetesConfigurationProperties; this.credentialFactory = credentialFactory; - this.kubernetesSpinnakerKindMap = kubernetesSpinnakerKindMap; this.catsModule = catsModule; ScheduledExecutorService poller = diff --git a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v1/security/KubernetesV1Credentials.java b/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v1/security/KubernetesV1Credentials.java index f506c0c31a5..45417ca66fe 100644 --- a/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v1/security/KubernetesV1Credentials.java +++ b/clouddriver-kubernetes/src/main/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v1/security/KubernetesV1Credentials.java @@ -30,7 +30,6 @@ import com.netflix.spinnaker.clouddriver.kubernetes.security.KubernetesCredentials; import com.netflix.spinnaker.clouddriver.kubernetes.v1.api.KubernetesApiAdaptor; import com.netflix.spinnaker.clouddriver.kubernetes.v1.api.KubernetesClientApiAdapter; -import com.netflix.spinnaker.clouddriver.kubernetes.v2.description.KubernetesSpinnakerKindMap; import com.netflix.spinnaker.clouddriver.security.AccountCredentialsRepository; import com.netflix.spinnaker.kork.configserver.ConfigFileService; import io.fabric8.kubernetes.api.model.Namespace; @@ -72,8 +71,6 @@ public class KubernetesV1Credentials implements KubernetesCredentials { @Include private final String kubeconfigFileHash; - private KubernetesSpinnakerKindMap kubernetesSpinnakerKindMap; - private KubernetesV1Credentials( String name, String kubeconfigFile, @@ -87,8 +84,7 @@ private KubernetesV1Credentials( List omitNamespaces, List dockerRegistries, Registry spectatorRegistry, - AccountCredentialsRepository accountCredentialsRepository, - KubernetesSpinnakerKindMap kubernetesSpinnakerKindMap) { + AccountCredentialsRepository accountCredentialsRepository) { this.kubeconfigFile = kubeconfigFile; if (dockerRegistries == null || dockerRegistries.size() == 0) { @@ -115,7 +111,6 @@ private KubernetesV1Credentials( this.repository = accountCredentialsRepository; this.LOG = LoggerFactory.getLogger(KubernetesV1Credentials.class); this.configureImagePullSecrets = configureImagePullSecrets; - this.kubernetesSpinnakerKindMap = kubernetesSpinnakerKindMap; configureDockerRegistries(); } @@ -125,8 +120,7 @@ protected KubernetesV1Credentials( List namespaces, List omitNamespaces, List dockerRegistries, - AccountCredentialsRepository repository, - KubernetesSpinnakerKindMap kubernetesSpinnakerKindMap) { + AccountCredentialsRepository repository) { this.apiAdaptor = apiAdaptor; this.namespaces = namespaces != null ? namespaces : new ArrayList<>(); this.omitNamespaces = omitNamespaces != null ? omitNamespaces : new ArrayList<>(); @@ -136,7 +130,6 @@ protected KubernetesV1Credentials( this.configureImagePullSecrets = true; this.kubeconfigFile = ""; this.kubeconfigFileHash = ""; - this.kubernetesSpinnakerKindMap = kubernetesSpinnakerKindMap; configureDockerRegistries(); } @@ -188,7 +181,7 @@ public List getDeclaredNamespaces() { @Override public Map getSpinnakerKindMap() { - return kubernetesSpinnakerKindMap.kubernetesToSpinnakerKindStringMap(); + return Collections.emptyMap(); } private void reconfigureRegistries(List allNamespaces) { @@ -332,7 +325,6 @@ public static class Factory implements KubernetesCredentialFactory())); } - @Bean - public KubernetesV2Provider kubernetesV2Provider() { - return new KubernetesV2Provider(); - } - - @Bean - public GlobalKubernetesKindRegistry globalKubernetesKindRegistry() { - return new GlobalKubernetesKindRegistry(KubernetesKindProperties.getGlobalKindProperties()); - } - - @Bean - public KubernetesV2ProviderSynchronizable kubernetesV2ProviderSynchronizable( - KubernetesV2Provider kubernetesV2Provider, - AccountCredentialsRepository accountCredentialsRepository, - KubernetesV2CachingAgentDispatcher kubernetesV2CachingAgentDispatcher, - KubernetesConfigurationProperties kubernetesConfigurationProperties, - KubernetesV2Credentials.Factory credentialFactory, - KubernetesSpinnakerKindMap kubernetesSpinnakerKindMap, - CatsModule catsModule) { - return new KubernetesV2ProviderSynchronizable( - kubernetesV2Provider, - accountCredentialsRepository, - kubernetesV2CachingAgentDispatcher, - kubernetesConfigurationProperties, - credentialFactory, - kubernetesSpinnakerKindMap, - catsModule); - } - @Bean public KubernetesV1ProviderSynchronizable kubernetesV1ProviderSynchronizable( KubernetesV1Provider kubernetesV1Provider, @@ -109,7 +73,6 @@ public KubernetesV1ProviderSynchronizable kubernetesV1ProviderSynchronizable( KubernetesV1CachingAgentDispatcher kubernetesV1CachingAgentDispatcher, KubernetesConfigurationProperties kubernetesConfigurationProperties, KubernetesV1Credentials.Factory credentialFactory, - KubernetesSpinnakerKindMap kubernetesSpinnakerKindMap, CatsModule catsModule) { return new KubernetesV1ProviderSynchronizable( kubernetesV1Provider, @@ -117,7 +80,6 @@ public KubernetesV1ProviderSynchronizable kubernetesV1ProviderSynchronizable( kubernetesV1CachingAgentDispatcher, kubernetesConfigurationProperties, credentialFactory, - kubernetesSpinnakerKindMap, catsModule); } } diff --git a/clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v1/deploy/ops/loadbalancer/UpsertKubernetesLoadBalancerAtomicOperationSpec.groovy b/clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v1/deploy/ops/loadbalancer/UpsertKubernetesLoadBalancerAtomicOperationSpec.groovy index 2890f7d1016..7c927b53dc8 100644 --- a/clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v1/deploy/ops/loadbalancer/UpsertKubernetesLoadBalancerAtomicOperationSpec.groovy +++ b/clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v1/deploy/ops/loadbalancer/UpsertKubernetesLoadBalancerAtomicOperationSpec.groovy @@ -25,7 +25,6 @@ import com.netflix.spinnaker.clouddriver.kubernetes.v1.deploy.description.loadba import com.netflix.spinnaker.clouddriver.kubernetes.v1.deploy.description.loadbalancer.KubernetesNamedServicePort 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.KubernetesSpinnakerKindMap import com.netflix.spinnaker.clouddriver.security.AccountCredentialsRepository import io.fabric8.kubernetes.api.model.ObjectMeta import io.fabric8.kubernetes.api.model.Service @@ -69,7 +68,7 @@ class UpsertKubernetesLoadBalancerAtomicOperationSpec extends Specification { dockerRegistry = Mock(LinkedDockerRegistryConfiguration) dockerRegistries = [dockerRegistry] accountCredentialsRepositoryMock = Mock(AccountCredentialsRepository) - credentials = new KubernetesV1Credentials(apiMock, NAMESPACES, [], [], accountCredentialsRepositoryMock, new KubernetesSpinnakerKindMap(Collections.emptyList())) + credentials = new KubernetesV1Credentials(apiMock, NAMESPACES, [], [], accountCredentialsRepositoryMock) namedAccountCredentials = Mock(KubernetesNamedAccountCredentials) { getCredentials() >> credentials } diff --git a/clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v1/deploy/ops/securitygroup/UpsertKubernetesV1SecurityGroupAtomicOperationSpec.groovy b/clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v1/deploy/ops/securitygroup/UpsertKubernetesV1SecurityGroupAtomicOperationSpec.groovy index a625a00fa29..832bfdacd89 100644 --- a/clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v1/deploy/ops/securitygroup/UpsertKubernetesV1SecurityGroupAtomicOperationSpec.groovy +++ b/clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v1/deploy/ops/securitygroup/UpsertKubernetesV1SecurityGroupAtomicOperationSpec.groovy @@ -25,7 +25,6 @@ import com.netflix.spinnaker.clouddriver.kubernetes.v1.api.KubernetesApiAdaptor import com.netflix.spinnaker.clouddriver.kubernetes.v1.deploy.description.securitygroup.KubernetesIngressTlS import com.netflix.spinnaker.clouddriver.kubernetes.v1.deploy.description.securitygroup.KubernetesSecurityGroupDescription import com.netflix.spinnaker.clouddriver.kubernetes.v1.security.KubernetesV1Credentials -import com.netflix.spinnaker.clouddriver.kubernetes.v2.description.KubernetesSpinnakerKindMap import com.netflix.spinnaker.clouddriver.security.AccountCredentialsRepository import io.fabric8.kubernetes.api.model.extensions.Ingress import io.fabric8.kubernetes.api.model.extensions.IngressTLS @@ -61,7 +60,7 @@ class UpsertKubernetesV1SecurityGroupAtomicOperationSpec extends Specification { dockerRegistry = Mock(LinkedDockerRegistryConfiguration) dockerRegistries = [dockerRegistry] accountCredentialsRepositoryMock = Mock(AccountCredentialsRepository) - credentials = new KubernetesV1Credentials(apiMock, NAMESPACES, [], [], accountCredentialsRepositoryMock, new KubernetesSpinnakerKindMap(Collections.emptyList())) + credentials = new KubernetesV1Credentials(apiMock, NAMESPACES, [], [], accountCredentialsRepositoryMock) namedAccountCredentials = Mock(KubernetesNamedAccountCredentials) { getCredentials() >> credentials } diff --git a/clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v1/deploy/ops/servergroup/CloneKubernetesAtomicOperationSpec.groovy b/clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v1/deploy/ops/servergroup/CloneKubernetesAtomicOperationSpec.groovy index 78dacc2336f..e3da0f79d86 100644 --- a/clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v1/deploy/ops/servergroup/CloneKubernetesAtomicOperationSpec.groovy +++ b/clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v1/deploy/ops/servergroup/CloneKubernetesAtomicOperationSpec.groovy @@ -27,7 +27,6 @@ import com.netflix.spinnaker.clouddriver.kubernetes.v1.deploy.description.server import com.netflix.spinnaker.clouddriver.kubernetes.v1.deploy.description.servergroup.KubernetesResourceDescription 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.KubernetesSpinnakerKindMap import com.netflix.spinnaker.clouddriver.security.AccountCredentialsRepository import io.fabric8.kubernetes.api.model.* import spock.lang.Specification @@ -113,7 +112,7 @@ class CloneKubernetesAtomicOperationSpec extends Specification { accountCredentialsRepositoryMock = Mock(AccountCredentialsRepository) dockerRegistry = Mock(LinkedDockerRegistryConfiguration) dockerRegistries = [dockerRegistry] - credentials = new KubernetesV1Credentials(apiMock, [], [], [], accountCredentialsRepositoryMock, new KubernetesSpinnakerKindMap(Collections.emptyList())) + credentials = new KubernetesV1Credentials(apiMock, [], [], [], accountCredentialsRepositoryMock) namedAccountCredentials = Mock(KubernetesNamedAccountCredentials) { getCredentials() >> credentials } diff --git a/clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v1/deploy/ops/servergroup/DeployKubernetesAtomicOperationSpec.groovy b/clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v1/deploy/ops/servergroup/DeployKubernetesAtomicOperationSpec.groovy index 18b86849b67..ff6d234466e 100644 --- a/clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v1/deploy/ops/servergroup/DeployKubernetesAtomicOperationSpec.groovy +++ b/clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v1/deploy/ops/servergroup/DeployKubernetesAtomicOperationSpec.groovy @@ -28,7 +28,6 @@ import com.netflix.spinnaker.clouddriver.kubernetes.v1.deploy.description.server import com.netflix.spinnaker.clouddriver.kubernetes.v1.deploy.exception.KubernetesResourceNotFoundException import com.netflix.spinnaker.clouddriver.kubernetes.v1.security.KubernetesV1Credentials import com.netflix.spinnaker.clouddriver.kubernetes.security.KubernetesNamedAccountCredentials -import com.netflix.spinnaker.clouddriver.kubernetes.v2.description.KubernetesSpinnakerKindMap import com.netflix.spinnaker.clouddriver.security.AccountCredentialsRepository import io.fabric8.kubernetes.api.model.* import io.fabric8.kubernetes.api.model.apps.ReplicaSet @@ -133,7 +132,7 @@ class DeployKubernetesAtomicOperationSpec extends Specification { dockerRegistry = Mock(LinkedDockerRegistryConfiguration) dockerRegistries = [dockerRegistry] - credentials = new KubernetesV1Credentials(apiMock, [NAMESPACE], [], DOCKER_REGISTRY_ACCOUNTS, accountCredentialsRepositoryMock, new KubernetesSpinnakerKindMap(Collections.emptyList())) + credentials = new KubernetesV1Credentials(apiMock, [NAMESPACE], [], DOCKER_REGISTRY_ACCOUNTS, accountCredentialsRepositoryMock) namedAccountCredentials = Mock(KubernetesNamedAccountCredentials) { getCredentials() >> credentials } diff --git a/clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v1/deploy/validators/StandardKubernetesAttributeValidatorSpec.groovy b/clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v1/deploy/validators/StandardKubernetesAttributeValidatorSpec.groovy index c8d9639a945..6ca4b2e0663 100644 --- a/clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v1/deploy/validators/StandardKubernetesAttributeValidatorSpec.groovy +++ b/clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v1/deploy/validators/StandardKubernetesAttributeValidatorSpec.groovy @@ -21,7 +21,6 @@ import com.netflix.spinnaker.clouddriver.kubernetes.v1.api.KubernetesApiAdaptor import com.netflix.spinnaker.clouddriver.kubernetes.config.LinkedDockerRegistryConfiguration 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.KubernetesSpinnakerKindMap import com.netflix.spinnaker.clouddriver.security.AccountCredentialsRepository import com.netflix.spinnaker.clouddriver.security.DefaultAccountCredentialsProvider import com.netflix.spinnaker.clouddriver.security.MapBackedAccountCredentialsRepository @@ -60,7 +59,7 @@ class StandardKubernetesAttributeValidatorSpec extends Specification { }) }) - credentials = new KubernetesV1Credentials(apiMock, NAMESPACES, [], DOCKER_REGISTRY_ACCOUNTS, accountCredentialsRepositoryMock, new KubernetesSpinnakerKindMap(Collections.emptyList())) + credentials = new KubernetesV1Credentials(apiMock, NAMESPACES, [], DOCKER_REGISTRY_ACCOUNTS, accountCredentialsRepositoryMock) def namedAccountCredentials =Mock(KubernetesNamedAccountCredentials) { getName() >> ACCOUNT_NAME getCredentials() >> credentials diff --git a/clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v1/deploy/validators/loadbalancer/UpsertKubernetesLoadBalancerAtomicOperationValidatorSpec.groovy b/clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v1/deploy/validators/loadbalancer/UpsertKubernetesLoadBalancerAtomicOperationValidatorSpec.groovy index 7aea614f0ea..8c305e05c5c 100644 --- a/clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v1/deploy/validators/loadbalancer/UpsertKubernetesLoadBalancerAtomicOperationValidatorSpec.groovy +++ b/clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v1/deploy/validators/loadbalancer/UpsertKubernetesLoadBalancerAtomicOperationValidatorSpec.groovy @@ -24,7 +24,6 @@ import com.netflix.spinnaker.clouddriver.kubernetes.v1.deploy.description.loadba import com.netflix.spinnaker.clouddriver.kubernetes.v1.deploy.validators.StandardKubernetesAttributeValidator 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.KubernetesSpinnakerKindMap import com.netflix.spinnaker.clouddriver.security.AccountCredentialsRepository import com.netflix.spinnaker.clouddriver.security.DefaultAccountCredentialsProvider import com.netflix.spinnaker.clouddriver.security.MapBackedAccountCredentialsRepository @@ -69,7 +68,7 @@ class UpsertKubernetesLoadBalancerAtomicOperationValidatorSpec extends Specifica spectatorRegistry = new DefaultRegistry() dockerRegistry = Mock(LinkedDockerRegistryConfiguration) dockerRegistries = [dockerRegistry] - credentials = new KubernetesV1Credentials(apiMock, NAMESPACES, [], [], accountCredentialsRepositoryMock, new KubernetesSpinnakerKindMap(Collections.emptyList())) + credentials = new KubernetesV1Credentials(apiMock, NAMESPACES, [], [], accountCredentialsRepositoryMock) namedAccountCredentials = Mock(KubernetesNamedAccountCredentials) { getName() >> VALID_ACCOUNT getCredentials() >> credentials diff --git a/clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v1/deploy/validators/servergroup/CloneKubernetesAtomicOperationValidatorSpec.groovy b/clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v1/deploy/validators/servergroup/CloneKubernetesAtomicOperationValidatorSpec.groovy index 622fd4adaf1..0dbbf30c19e 100644 --- a/clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v1/deploy/validators/servergroup/CloneKubernetesAtomicOperationValidatorSpec.groovy +++ b/clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v1/deploy/validators/servergroup/CloneKubernetesAtomicOperationValidatorSpec.groovy @@ -27,7 +27,6 @@ import com.netflix.spinnaker.clouddriver.kubernetes.v1.deploy.description.server import com.netflix.spinnaker.clouddriver.kubernetes.v1.deploy.validators.StandardKubernetesAttributeValidator import com.netflix.spinnaker.clouddriver.kubernetes.v1.security.KubernetesV1Credentials import com.netflix.spinnaker.clouddriver.kubernetes.security.KubernetesNamedAccountCredentials -import com.netflix.spinnaker.clouddriver.kubernetes.v2.description.KubernetesSpinnakerKindMap import com.netflix.spinnaker.clouddriver.security.AccountCredentialsRepository import com.netflix.spinnaker.clouddriver.security.DefaultAccountCredentialsProvider import com.netflix.spinnaker.clouddriver.security.MapBackedAccountCredentialsRepository @@ -92,7 +91,7 @@ class CloneKubernetesAtomicOperationValidatorSpec extends Specification { }) }) - def credentials = new KubernetesV1Credentials(apiMock, NAMESPACES, [], DOCKER_REGISTRY_ACCOUNTS, accountCredentialsRepositoryMock, new KubernetesSpinnakerKindMap(Collections.emptyList())) + def credentials = new KubernetesV1Credentials(apiMock, NAMESPACES, [], DOCKER_REGISTRY_ACCOUNTS, accountCredentialsRepositoryMock) def namedAccountCredentials = Mock(KubernetesNamedAccountCredentials) { getName() >> VALID_ACCOUNT getCredentials() >> credentials diff --git a/clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v1/deploy/validators/servergroup/DeployKubernetesAtomicOperationValidatorSpec.groovy b/clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v1/deploy/validators/servergroup/DeployKubernetesAtomicOperationValidatorSpec.groovy index 521386eaba0..31900fc5f4e 100644 --- a/clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v1/deploy/validators/servergroup/DeployKubernetesAtomicOperationValidatorSpec.groovy +++ b/clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v1/deploy/validators/servergroup/DeployKubernetesAtomicOperationValidatorSpec.groovy @@ -26,7 +26,6 @@ import com.netflix.spinnaker.clouddriver.kubernetes.v1.deploy.description.server import com.netflix.spinnaker.clouddriver.kubernetes.v1.deploy.validators.StandardKubernetesAttributeValidator import com.netflix.spinnaker.clouddriver.kubernetes.v1.security.KubernetesV1Credentials import com.netflix.spinnaker.clouddriver.kubernetes.security.KubernetesNamedAccountCredentials -import com.netflix.spinnaker.clouddriver.kubernetes.v2.description.KubernetesSpinnakerKindMap import com.netflix.spinnaker.clouddriver.security.AccountCredentialsRepository import com.netflix.spinnaker.clouddriver.security.DefaultAccountCredentialsProvider import com.netflix.spinnaker.clouddriver.security.MapBackedAccountCredentialsRepository @@ -98,7 +97,7 @@ class DeployKubernetesAtomicOperationValidatorSpec extends Specification { }) }) - def credentials = new KubernetesV1Credentials(apiMock, NAMESPACES, [], DOCKER_REGISTRY_ACCOUNTS, accountCredentialsRepositoryMock, new KubernetesSpinnakerKindMap(Collections.emptyList())) + def credentials = new KubernetesV1Credentials(apiMock, NAMESPACES, [], DOCKER_REGISTRY_ACCOUNTS, accountCredentialsRepositoryMock) def namedAccountCredentials = Mock(KubernetesNamedAccountCredentials) { getName() >> VALID_ACCOUNT getCredentials() >> credentials diff --git a/clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v1/provider/KubernetesV1ProviderSynchronizableSpec.groovy b/clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v1/provider/KubernetesV1ProviderSynchronizableSpec.groovy index 822b5f1ca15..65d1d079f56 100644 --- a/clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v1/provider/KubernetesV1ProviderSynchronizableSpec.groovy +++ b/clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v1/provider/KubernetesV1ProviderSynchronizableSpec.groovy @@ -18,19 +18,13 @@ package com.netflix.spinnaker.clouddriver.kubernetes.v1.provider import com.netflix.spectator.api.NoopRegistry import com.netflix.spinnaker.cats.module.CatsModule - import com.netflix.spinnaker.clouddriver.kubernetes.config.KubernetesConfigurationProperties +import com.netflix.spinnaker.clouddriver.kubernetes.config.LinkedDockerRegistryConfiguration import com.netflix.spinnaker.clouddriver.kubernetes.security.KubernetesNamedAccountCredentials import com.netflix.spinnaker.clouddriver.kubernetes.v1.provider.agent.KubernetesV1CachingAgentDispatcher import com.netflix.spinnaker.clouddriver.kubernetes.v1.security.KubernetesV1Credentials -import com.netflix.spinnaker.clouddriver.kubernetes.v2.description.AccountResourcePropertyRegistry -import com.netflix.spinnaker.clouddriver.kubernetes.v2.description.KubernetesSpinnakerKindMap -import com.netflix.spinnaker.clouddriver.kubernetes.v2.description.manifest.KubernetesKindRegistry -import com.netflix.spinnaker.clouddriver.kubernetes.v2.op.job.KubectlJobExecutor -import com.netflix.spinnaker.clouddriver.names.NamerRegistry import com.netflix.spinnaker.clouddriver.security.AccountCredentials import com.netflix.spinnaker.clouddriver.security.AccountCredentialsRepository -import com.netflix.spinnaker.clouddriver.kubernetes.config.LinkedDockerRegistryConfiguration import com.netflix.spinnaker.clouddriver.security.ProviderVersion import com.netflix.spinnaker.kork.configserver.ConfigFileService import spock.lang.Specification @@ -47,8 +41,7 @@ class KubernetesV1ProviderSynchronizableSpec extends Specification { "userAgent", new NoopRegistry(), accountCredentialsRepository, - configFileService, - new KubernetesSpinnakerKindMap(Collections.emptyList()) + configFileService ) def synchronizeAccounts(KubernetesConfigurationProperties configurationProperties) { @@ -57,8 +50,8 @@ class KubernetesV1ProviderSynchronizableSpec extends Specification { accountCredentialsRepository, agentDispatcher, configurationProperties, - credentialFactory, - new KubernetesSpinnakerKindMap(Collections.emptyList()), + credentialFactory + , catsModule ) diff --git a/clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v1/provider/agent/KubernetesLoadBalancerCachingAgentSpec.groovy b/clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v1/provider/agent/KubernetesLoadBalancerCachingAgentSpec.groovy index 6101d203e10..3fb8a4e393e 100644 --- a/clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v1/provider/agent/KubernetesLoadBalancerCachingAgentSpec.groovy +++ b/clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v1/provider/agent/KubernetesLoadBalancerCachingAgentSpec.groovy @@ -24,7 +24,6 @@ import com.netflix.spinnaker.clouddriver.kubernetes.KubernetesCloudProvider import com.netflix.spinnaker.clouddriver.kubernetes.v1.api.KubernetesApiAdaptor 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.KubernetesSpinnakerKindMap import com.netflix.spinnaker.clouddriver.security.AccountCredentialsRepository import spock.lang.Specification import spock.lang.Unroll @@ -49,7 +48,7 @@ class KubernetesLoadBalancerCachingAgentSpec extends Specification { def accountCredentialsRepositoryMock = Mock(AccountCredentialsRepository) - kubernetesCredentials = new KubernetesV1Credentials(apiMock, [], [], [], accountCredentialsRepositoryMock, new KubernetesSpinnakerKindMap(Collections.emptyList())) + kubernetesCredentials = new KubernetesV1Credentials(apiMock, [], [], [], accountCredentialsRepositoryMock) def namedCrededentialsMock = Mock(KubernetesNamedAccountCredentials) namedCrededentialsMock.getCredentials() >> kubernetesCredentials diff --git a/clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v1/provider/agent/KubernetesServerGroupCachingAgentSpec.groovy b/clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v1/provider/agent/KubernetesServerGroupCachingAgentSpec.groovy index edd90e05b81..bf15ef6b077 100644 --- a/clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v1/provider/agent/KubernetesServerGroupCachingAgentSpec.groovy +++ b/clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v1/provider/agent/KubernetesServerGroupCachingAgentSpec.groovy @@ -26,7 +26,6 @@ import com.netflix.spinnaker.clouddriver.kubernetes.v1.deploy.KubernetesUtil import com.netflix.spinnaker.clouddriver.kubernetes.security.KubernetesNamedAccountCredentials import com.netflix.spinnaker.clouddriver.kubernetes.v1.caching.Keys import com.netflix.spinnaker.clouddriver.kubernetes.v1.security.KubernetesV1Credentials -import com.netflix.spinnaker.clouddriver.kubernetes.v2.description.KubernetesSpinnakerKindMap import com.netflix.spinnaker.clouddriver.security.AccountCredentialsRepository import io.fabric8.kubernetes.api.model.ObjectMeta import io.fabric8.kubernetes.api.model.PodList @@ -68,7 +67,7 @@ class KubernetesServerGroupCachingAgentSpec extends Specification { def accountCredentialsRepositoryMock = Mock(AccountCredentialsRepository) - kubernetesCredentials = new KubernetesV1Credentials(apiMock, [], [], [], accountCredentialsRepositoryMock, new KubernetesSpinnakerKindMap(Collections.emptyList())) + kubernetesCredentials = new KubernetesV1Credentials(apiMock, [], [], [], accountCredentialsRepositoryMock) def namedCrededentialsMock = Mock(KubernetesNamedAccountCredentials) namedCrededentialsMock.getCredentials() >> kubernetesCredentials diff --git a/clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v1/provider/agent/KubernetesV1SecurityGroupCachingAgentSpec.groovy b/clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v1/provider/agent/KubernetesV1SecurityGroupCachingAgentSpec.groovy index ee45c6b2eb5..1eb71d72695 100644 --- a/clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v1/provider/agent/KubernetesV1SecurityGroupCachingAgentSpec.groovy +++ b/clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v1/provider/agent/KubernetesV1SecurityGroupCachingAgentSpec.groovy @@ -24,7 +24,6 @@ import com.netflix.spinnaker.clouddriver.kubernetes.KubernetesCloudProvider import com.netflix.spinnaker.clouddriver.kubernetes.v1.api.KubernetesApiAdaptor 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.KubernetesSpinnakerKindMap import com.netflix.spinnaker.clouddriver.security.AccountCredentialsRepository import spock.lang.Specification import spock.lang.Unroll @@ -49,7 +48,7 @@ class KubernetesV1SecurityGroupCachingAgentSpec extends Specification { def accountCredentialsRepositoryMock = Mock(AccountCredentialsRepository) - kubernetesCredentials = new KubernetesV1Credentials(apiMock, [], [], [], accountCredentialsRepositoryMock, new KubernetesSpinnakerKindMap(Collections.emptyList())) + kubernetesCredentials = new KubernetesV1Credentials(apiMock, [], [], [], accountCredentialsRepositoryMock) def namedCrededentialsMock = Mock(KubernetesNamedAccountCredentials) namedCrededentialsMock.getCredentials() >> kubernetesCredentials diff --git a/clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v1/security/KubernetesV1CredentialsSpec.groovy b/clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v1/security/KubernetesV1CredentialsSpec.groovy index f2ec74e5aae..6b1492f3f40 100644 --- a/clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v1/security/KubernetesV1CredentialsSpec.groovy +++ b/clouddriver-kubernetes/src/test/groovy/com/netflix/spinnaker/clouddriver/kubernetes/v1/security/KubernetesV1CredentialsSpec.groovy @@ -20,7 +20,6 @@ package com.netflix.spinnaker.clouddriver.kubernetes.v1.security import com.netflix.spinnaker.clouddriver.docker.registry.security.DockerRegistryNamedAccountCredentials import com.netflix.spinnaker.clouddriver.kubernetes.v1.api.KubernetesApiAdaptor import com.netflix.spinnaker.clouddriver.kubernetes.config.LinkedDockerRegistryConfiguration -import com.netflix.spinnaker.clouddriver.kubernetes.v2.description.KubernetesSpinnakerKindMap import com.netflix.spinnaker.clouddriver.security.AccountCredentialsRepository import spock.lang.Specification @@ -62,7 +61,7 @@ class KubernetesV1CredentialsSpec extends Specification { repositoryMock.getOne(ACCOUNT1) >> registryAccountMock when: - def result = new KubernetesV1Credentials(adaptorMock, NAMESPACES1, [], REGISTRIES1, repositoryMock, new KubernetesSpinnakerKindMap(Collections.emptyList())) + def result = new KubernetesV1Credentials(adaptorMock, NAMESPACES1, [], REGISTRIES1, repositoryMock) then: result.getDeclaredNamespaces() == NAMESPACES1 @@ -79,7 +78,7 @@ class KubernetesV1CredentialsSpec extends Specification { repositoryMock.getOne(ACCOUNT1) >> registryAccountMock when: - def result = new KubernetesV1Credentials(adaptorMock, null, [], REGISTRIES2, repositoryMock, new KubernetesSpinnakerKindMap(Collections.emptyList())) + def result = new KubernetesV1Credentials(adaptorMock, null, [], REGISTRIES2, repositoryMock) then: result.getDeclaredNamespaces() == NAMESPACES2 @@ -96,7 +95,7 @@ class KubernetesV1CredentialsSpec extends Specification { repositoryMock.getOne(ACCOUNT1) >> registryAccountMock when: - def result = new KubernetesV1Credentials(adaptorMock, null, NAMESPACES2, REGISTRIES2, repositoryMock, new KubernetesSpinnakerKindMap(Collections.emptyList())) + def result = new KubernetesV1Credentials(adaptorMock, null, NAMESPACES2, REGISTRIES2, repositoryMock) then: result.getDeclaredNamespaces() == [] @@ -113,7 +112,7 @@ class KubernetesV1CredentialsSpec extends Specification { repositoryMock.getOne(ACCOUNT1) >> registryAccountMock when: - def result = new KubernetesV1Credentials(adaptorMock, null, [], REGISTRIES1, repositoryMock, new KubernetesSpinnakerKindMap(Collections.emptyList())) + def result = new KubernetesV1Credentials(adaptorMock, null, [], REGISTRIES1, repositoryMock) then: result.getDeclaredNamespaces() == NAMESPACES2 @@ -131,7 +130,7 @@ class KubernetesV1CredentialsSpec extends Specification { repositoryMock.getOne(ACCOUNT1) >> registryAccountMock when: - def namespaces = new KubernetesV1Credentials(adaptorMock, null, [], REGISTRIES1, repositoryMock, new KubernetesSpinnakerKindMap(Collections.emptyList())).getDeclaredNamespaces() + def namespaces = new KubernetesV1Credentials(adaptorMock, null, [], REGISTRIES1, repositoryMock).getDeclaredNamespaces() then: namespaces == [] diff --git a/settings.gradle b/settings.gradle index 26b41818c43..f282004ce36 100644 --- 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-docker'], + 'kubernetes': [':clouddriver-kubernetes', ':clouddriver-kubernetes-v2', ':clouddriver-docker'], 'oracle': [':clouddriver-oracle'] ] cloudProviderProjects.put('gcp', cloudProviderProjects['appengine'] + cloudProviderProjects['gce'] + cloudProviderProjects['kubernetes'])