refactor(kubernetes): isolate v1 code (#7451)

spinnaker · Sep 27, 2019 · e667bdf · e667bdf
1 parent f535e52
commit e667bdf
Show file tree

Hide file tree

Showing 151 changed files with 81 additions and 85 deletions.
diff --git a/app/scripts/modules/kubernetes/src/securityGroup/reader.js b/app/scripts/modules/kubernetes/src/securityGroup/reader.js
diff --git a/...es/kubernetes/src/help/kubernetes.help.ts → ...rnetes/src/shared/help/kubernetes.help.ts b/...es/kubernetes/src/help/kubernetes.help.ts → ...rnetes/src/shared/help/kubernetes.help.ts
diff --git a/...s/kubernetes/src/logo/kubernetes.icon.svg → ...netes/src/shared/logo/kubernetes.icon.svg b/...s/kubernetes/src/logo/kubernetes.icon.svg → ...netes/src/shared/logo/kubernetes.icon.svg
diff --git a/.../kubernetes/src/logo/kubernetes.logo.less → ...etes/src/shared/logo/kubernetes.logo.less b/.../kubernetes/src/logo/kubernetes.logo.less → ...etes/src/shared/logo/kubernetes.logo.less
diff --git a/...s/kubernetes/src/logo/kubernetes.logo.svg → ...netes/src/shared/logo/kubernetes.logo.svg b/...s/kubernetes/src/logo/kubernetes.logo.svg → ...netes/src/shared/logo/kubernetes.logo.svg
diff --git a/app/scripts/modules/kubernetes/src/shared/securityGroup/securityGroup.reader.ts b/app/scripts/modules/kubernetes/src/shared/securityGroup/securityGroup.reader.ts
@@ -0,0 +1,11 @@
+import { ISecurityGroupsByAccount, ISecurityGroup } from '@spinnaker/core';
+
+export class KubernetesSecurityGroupReader {
+  public static resolveIndexedSecurityGroup(
+    indexedSecurityGroups: ISecurityGroupsByAccount,
+    container: ISecurityGroup,
+    securityGroupId: string,
+  ): ISecurityGroup {
+    return indexedSecurityGroups[container.account][container.region][securityGroupId];
+  }
+}
diff --git a/...c/validation/applicationName.validator.js → ...d/validation/applicationName.validator.js b/...c/validation/applicationName.validator.js → ...d/validation/applicationName.validator.js
diff --git a/...rc/autoscaler/autoscaler.write.service.js → ...v1/autoscaler/autoscaler.write.service.js b/...rc/autoscaler/autoscaler.write.service.js → ...v1/autoscaler/autoscaler.write.service.js
diff --git a/.../src/cluster/cluster.kubernetes.module.js → ...c/v1/cluster/cluster.kubernetes.module.js b/.../src/cluster/cluster.kubernetes.module.js → ...c/v1/cluster/cluster.kubernetes.module.js
diff --git a/...s/src/cluster/configure/CommandBuilder.js → ...rc/v1/cluster/configure/CommandBuilder.js b/...s/src/cluster/configure/CommandBuilder.js → ...rc/v1/cluster/configure/CommandBuilder.js
@@ -5,7 +5,7 @@ import _ from 'lodash';
 
 import { AccountService, ExpectedArtifactService } from '@spinnaker/core';
 
-import { KubernetesProviderSettings } from '../../kubernetes.settings';
+import { KubernetesProviderSettings } from '../../../kubernetes.settings';
 
 module.exports = angular
   .module('spinnaker.kubernetes.clusterCommandBuilder.service', [])

diff --git a/...s/src/common/keyValueDetails.component.ts → ...rc/v1/common/keyValueDetails.component.ts b/...s/src/common/keyValueDetails.component.ts → ...rc/v1/common/keyValueDetails.component.ts
diff --git a/...mmon/tolerations/TolerationsComponent.tsx → ...mmon/tolerations/TolerationsComponent.tsx b/...mmon/tolerations/TolerationsComponent.tsx → ...mmon/tolerations/TolerationsComponent.tsx
diff --git a/...mmon/tolerations/tolerations.component.ts → ...mmon/tolerations/tolerations.component.ts b/...mmon/tolerations/tolerations.component.ts → ...mmon/tolerations/tolerations.component.ts
diff --git a/...es/src/container/arguments.component.html → ...src/v1/container/arguments.component.html b/...es/src/container/arguments.component.html → ...src/v1/container/arguments.component.html
diff --git a/...etes/src/container/arguments.component.js → ...s/src/v1/container/arguments.component.js b/...etes/src/container/arguments.component.js → ...s/src/v1/container/arguments.component.js
diff --git a/...tes/src/container/commands.component.html → .../src/v1/container/commands.component.html b/...tes/src/container/commands.component.html → .../src/v1/container/commands.component.html
diff --git a/...netes/src/container/commands.component.js → ...es/src/v1/container/commands.component.js b/...netes/src/container/commands.component.js → ...es/src/v1/container/commands.component.js
diff --git a/...s/src/container/configurer.directive.html → ...rc/v1/container/configurer.directive.html b/...s/src/container/configurer.directive.html → ...rc/v1/container/configurer.directive.html
diff --git a/...tes/src/container/configurer.directive.js → .../src/v1/container/configurer.directive.js b/...tes/src/container/configurer.directive.js → .../src/v1/container/configurer.directive.js
diff --git a/.../container/environmentFrom.component.html → .../container/environmentFrom.component.html b/.../container/environmentFrom.component.html → .../container/environmentFrom.component.html
diff --git a/...rc/container/environmentFrom.component.ts → ...v1/container/environmentFrom.component.ts b/...rc/container/environmentFrom.component.ts → ...v1/container/environmentFrom.component.ts
diff --git a/...ainer/environmentVariables.component.html → ...ainer/environmentVariables.component.html b/...ainer/environmentVariables.component.html → ...ainer/environmentVariables.component.html
diff --git a/...ntainer/environmentVariables.component.js → ...ntainer/environmentVariables.component.js b/...ntainer/environmentVariables.component.js → ...ntainer/environmentVariables.component.js
diff --git a/...rc/container/lifecycleHook.component.html → ...v1/container/lifecycleHook.component.html b/...rc/container/lifecycleHook.component.html → ...v1/container/lifecycleHook.component.html
diff --git a/.../src/container/lifecycleHook.component.ts → ...c/v1/container/lifecycleHook.component.ts b/.../src/container/lifecycleHook.component.ts → ...c/v1/container/lifecycleHook.component.ts
diff --git a/...rnetes/src/container/ports.component.html → ...tes/src/v1/container/ports.component.html b/...rnetes/src/container/ports.component.html → ...tes/src/v1/container/ports.component.html
diff --git a/...bernetes/src/container/ports.component.js → ...netes/src/v1/container/ports.component.js b/...bernetes/src/container/ports.component.js → ...netes/src/v1/container/ports.component.js
diff --git a/...rnetes/src/container/probe.directive.html → ...tes/src/v1/container/probe.directive.html b/...rnetes/src/container/probe.directive.html → ...tes/src/v1/container/probe.directive.html
diff --git a/...bernetes/src/container/probe.directive.js → ...netes/src/v1/container/probe.directive.js b/...bernetes/src/container/probe.directive.js → ...netes/src/v1/container/probe.directive.js
diff --git a/...es/src/container/resources.component.html → ...src/v1/container/resources.component.html b/...es/src/container/resources.component.html → ...src/v1/container/resources.component.html
diff --git a/...etes/src/container/resources.component.js → ...s/src/v1/container/resources.component.js b/...etes/src/container/resources.component.js → ...s/src/v1/container/resources.component.js
diff --git a/...ntext/capabilitiesSelector.component.html → ...ntext/capabilitiesSelector.component.html b/...ntext/capabilitiesSelector.component.html → ...ntext/capabilitiesSelector.component.html
diff --git a/...Context/capabilitiesSelector.component.ts → ...Context/capabilitiesSelector.component.ts b/...Context/capabilitiesSelector.component.ts → ...Context/capabilitiesSelector.component.ts
diff --git a/...ext/seLinuxOptionsSelector.component.html → ...ext/seLinuxOptionsSelector.component.html b/...ext/seLinuxOptionsSelector.component.html → ...ext/seLinuxOptionsSelector.component.html
diff --git a/...ntext/seLinuxOptionsSelector.component.ts → ...ntext/seLinuxOptionsSelector.component.ts b/...ntext/seLinuxOptionsSelector.component.ts → ...ntext/seLinuxOptionsSelector.component.ts
diff --git a/...xt/securityContextSelector.component.html → ...xt/securityContextSelector.component.html b/...xt/securityContextSelector.component.html → ...xt/securityContextSelector.component.html
diff --git a/...xt/securityContextSelector.component.less → ...xt/securityContextSelector.component.less b/...xt/securityContextSelector.component.less → ...xt/securityContextSelector.component.less
diff --git a/...text/securityContextSelector.component.ts → ...text/securityContextSelector.component.ts b/...text/securityContextSelector.component.ts → ...text/securityContextSelector.component.ts
diff --git a/...etes/src/container/volumes.component.html → ...s/src/v1/container/volumes.component.html b/...etes/src/container/volumes.component.html → ...s/src/v1/container/volumes.component.html
diff --git a/...rnetes/src/container/volumes.component.js → ...tes/src/v1/container/volumes.component.js b/...rnetes/src/container/volumes.component.js → ...tes/src/v1/container/volumes.component.js
diff --git a/...kubernetes/src/event/event.directive.html → ...ernetes/src/v1/event/event.directive.html b/...kubernetes/src/event/event.directive.html → ...ernetes/src/v1/event/event.directive.html
diff --git a/...s/kubernetes/src/event/event.directive.js → ...ubernetes/src/v1/event/event.directive.js b/...s/kubernetes/src/event/event.directive.js → ...ubernetes/src/v1/event/event.directive.js
diff --git a/...ules/kubernetes/src/image/image.reader.js → ...s/kubernetes/src/v1/image/image.reader.js b/...ules/kubernetes/src/image/image.reader.js → ...s/kubernetes/src/v1/image/image.reader.js
diff --git a/...ance/details/containerDetail.component.ts → ...ance/details/containerDetail.component.ts b/...ance/details/containerDetail.component.ts → ...ance/details/containerDetail.component.ts
diff --git a/...rc/instance/details/details.controller.js → ...v1/instance/details/details.controller.js b/...rc/instance/details/details.controller.js → ...v1/instance/details/details.controller.js
diff --git a/...ernetes/src/instance/details/details.html → ...etes/src/v1/instance/details/details.html b/...ernetes/src/instance/details/details.html → ...etes/src/v1/instance/details/details.html
diff --git a/...ance/details/details.kubernetes.module.js → ...ance/details/details.kubernetes.module.js b/...ance/details/details.kubernetes.module.js → ...ance/details/details.kubernetes.module.js
diff --git a/app/scripts/modules/kubernetes/src/v1/kubernetes.v1.module.ts b/app/scripts/modules/kubernetes/src/v1/kubernetes.v1.module.ts
@@ -2,14 +2,15 @@ import { module } from 'angular';
 
 import { CloudProviderRegistry, DeploymentStrategyRegistry } from '@spinnaker/core';
 
-import { KUBERNETES_KEY_VALUE_DETAILS } from '../common/keyValueDetails.component';
-import { KUBERNETES_TOLERATIONS } from '../common/tolerations/tolerations.component';
-import { KUBERNETES_SECURITY_CONTEXT_SELECTOR } from '../container/securityContext/securityContextSelector.component';
-import { KUBERNETES_SERVERGROUP_ARTIFACTEXTRACTOR } from '../serverGroup/artifactExtractor';
-import '../help/kubernetes.help';
+import { KUBERNETES_KEY_VALUE_DETAILS } from './common/keyValueDetails.component';
+import { KUBERNETES_TOLERATIONS } from './common/tolerations/tolerations.component';
+import { KUBERNETES_SECURITY_CONTEXT_SELECTOR } from './container/securityContext/securityContextSelector.component';
+import { KUBERNETES_SERVERGROUP_ARTIFACTEXTRACTOR } from './serverGroup/artifactExtractor';
+import '../shared/help/kubernetes.help';
 import { KubernetesProviderSettings } from '../kubernetes.settings';
+import { KubernetesSecurityGroupReader } from 'kubernetes/shared/securityGroup/securityGroup.reader';
 
-import '../logo/kubernetes.logo.less';
+import '../shared/logo/kubernetes.logo.less';
 
 // load all templates into the $templateCache
 const templates = require.context('kubernetes', true, /\.html$/);
@@ -19,41 +20,40 @@ templates.keys().forEach(function(key) {
 
 export const KUBERNETES_V1_MODULE = 'spinnaker.kubernetes.v1';
 module(KUBERNETES_V1_MODULE, [
-  require('../autoscaler/autoscaler.write.service').name,
-  require('../cluster/cluster.kubernetes.module').name,
-  require('../container/configurer.directive').name,
-  require('../container/probe.directive').name,
-  require('../event/event.directive').name,
-  require('../instance/details/details.kubernetes.module').name,
+  require('./autoscaler/autoscaler.write.service').name,
+  require('./cluster/cluster.kubernetes.module').name,
+  require('./container/configurer.directive').name,
+  require('./container/probe.directive').name,
+  require('./event/event.directive').name,
+  require('./instance/details/details.kubernetes.module').name,
   KUBERNETES_KEY_VALUE_DETAILS,
   KUBERNETES_SECURITY_CONTEXT_SELECTOR,
-  require('../loadBalancer/configure/configure.kubernetes.module').name,
-  require('../loadBalancer/details/details.kubernetes.module').name,
-  require('../loadBalancer/transformer').name,
-  require('../namespace/multiSelectField.component').name,
-  require('../namespace/selectField.directive').name,
-  require('../pipeline/stages/destroyAsg/kubernetesDestroyAsgStage').name,
-  require('../pipeline/stages/disableAsg/kubernetesDisableAsgStage').name,
-  require('../pipeline/stages/disableCluster/kubernetesDisableClusterStage').name,
-  require('../pipeline/stages/enableAsg/kubernetesEnableAsgStage').name,
-  require('../pipeline/stages/findAmi/kubernetesFindAmiStage').name,
-  require('../pipeline/stages/resizeAsg/resizeStage').name,
-  require('../pipeline/stages/runJob/runJobStage').name,
-  require('../pipeline/stages/scaleDownCluster/scaleDownClusterStage').name,
-  require('../pipeline/stages/shrinkCluster/shrinkClusterStage').name,
-  require('../proxy/ui.service').name,
-  require('../search/resultFormatter').name,
-  require('../securityGroup/configure/configure.kubernetes.module').name,
-  require('../securityGroup/details/details.kubernetes.module').name,
-  require('../securityGroup/reader').name,
-  require('../securityGroup/transformer').name,
-  require('../serverGroup/configure/CommandBuilder').name,
-  require('../serverGroup/configure/configure.kubernetes.module').name,
-  require('../serverGroup/details/details.kubernetes.module').name,
+  require('./loadBalancer/configure/configure.kubernetes.module').name,
+  require('./loadBalancer/details/details.kubernetes.module').name,
+  require('./loadBalancer/transformer').name,
+  require('./namespace/multiSelectField.component').name,
+  require('./namespace/selectField.directive').name,
+  require('./pipeline/stages/destroyAsg/kubernetesDestroyAsgStage').name,
+  require('./pipeline/stages/disableAsg/kubernetesDisableAsgStage').name,
+  require('./pipeline/stages/disableCluster/kubernetesDisableClusterStage').name,
+  require('./pipeline/stages/enableAsg/kubernetesEnableAsgStage').name,
+  require('./pipeline/stages/findAmi/kubernetesFindAmiStage').name,
+  require('./pipeline/stages/resizeAsg/resizeStage').name,
+  require('./pipeline/stages/runJob/runJobStage').name,
+  require('./pipeline/stages/scaleDownCluster/scaleDownClusterStage').name,
+  require('./pipeline/stages/shrinkCluster/shrinkClusterStage').name,
+  require('./proxy/ui.service').name,
+  require('./search/resultFormatter').name,
+  require('./securityGroup/configure/configure.kubernetes.module').name,
+  require('./securityGroup/details/details.kubernetes.module').name,
+  require('./securityGroup/transformer').name,
+  require('./serverGroup/configure/CommandBuilder').name,
+  require('./serverGroup/configure/configure.kubernetes.module').name,
+  require('./serverGroup/details/details.kubernetes.module').name,
   KUBERNETES_SERVERGROUP_ARTIFACTEXTRACTOR,
-  require('../serverGroup/paramsMixin').name,
-  require('../serverGroup/transformer').name,
-  require('../validation/applicationName.validator').name,
+  require('./serverGroup/paramsMixin').name,
+  require('./serverGroup/transformer').name,
+  require('../shared/validation/applicationName.validator').name,
   KUBERNETES_TOLERATIONS,
 ]).config(() => {
   CloudProviderRegistry.registerProvider('kubernetes', {
@@ -64,38 +64,38 @@ module(KUBERNETES_V1_MODULE, [
       resultFormatter: 'kubernetesSearchResultFormatter',
     },
     logo: {
-      path: require('../logo/kubernetes.logo.svg'),
+      path: require('../shared/logo/kubernetes.logo.svg'),
     },
     image: {
       reader: 'kubernetesImageReader',
     },
     instance: {
-      detailsTemplateUrl: require('../instance/details/details.html'),
+      detailsTemplateUrl: require('./instance/details/details.html'),
       detailsController: 'kubernetesInstanceDetailsController',
     },
     loadBalancer: {
       transformer: 'kubernetesLoadBalancerTransformer',
-      detailsTemplateUrl: require('../loadBalancer/details/details.html'),
+      detailsTemplateUrl: require('./loadBalancer/details/details.html'),
       detailsController: 'kubernetesLoadBalancerDetailsController',
-      createLoadBalancerTemplateUrl: require('../loadBalancer/configure/wizard/createWizard.html'),
+      createLoadBalancerTemplateUrl: require('./loadBalancer/configure/wizard/createWizard.html'),
       createLoadBalancerController: 'kubernetesUpsertLoadBalancerController',
     },
     securityGroup: {
-      reader: 'kubernetesSecurityGroupReader',
+      reader: KubernetesSecurityGroupReader,
       transformer: 'kubernetesSecurityGroupTransformer',
-      detailsTemplateUrl: require('../securityGroup/details/details.html'),
+      detailsTemplateUrl: require('./securityGroup/details/details.html'),
       detailsController: 'kubernetesSecurityGroupDetailsController',
-      createSecurityGroupTemplateUrl: require('../securityGroup/configure/wizard/createWizard.html'),
+      createSecurityGroupTemplateUrl: require('./securityGroup/configure/wizard/createWizard.html'),
       createSecurityGroupController: 'kubernetesUpsertSecurityGroupController',
     },
     serverGroup: {
       artifactExtractor: 'kubernetesServerGroupArtifactExtractor',
       skipUpstreamStageCheck: true,
       transformer: 'kubernetesServerGroupTransformer',
-      detailsTemplateUrl: require('../serverGroup/details/details.html'),
+      detailsTemplateUrl: require('./serverGroup/details/details.html'),
       detailsController: 'kubernetesServerGroupDetailsController',
       cloneServerGroupController: 'kubernetesCloneServerGroupController',
-      cloneServerGroupTemplateUrl: require('../serverGroup/configure/wizard/wizard.html'),
+      cloneServerGroupTemplateUrl: require('./serverGroup/configure/wizard/wizard.html'),
       commandBuilder: 'kubernetesServerGroupCommandBuilder',
       configurationService: 'kubernetesServerGroupConfigurationService',
       paramsMixin: 'kubernetesServerGroupParamsMixin',

diff --git a/.../configure/configure.kubernetes.module.js → .../configure/configure.kubernetes.module.js b/.../configure/configure.kubernetes.module.js → .../configure/configure.kubernetes.module.js
diff --git a/...ure/wizard/advancedSettings.controller.js → ...ure/wizard/advancedSettings.controller.js b/...ure/wizard/advancedSettings.controller.js → ...ure/wizard/advancedSettings.controller.js
diff --git a/...er/configure/wizard/advancedSettings.html → ...er/configure/wizard/advancedSettings.html b/...er/configure/wizard/advancedSettings.html → ...er/configure/wizard/advancedSettings.html
diff --git a/...ancer/configure/wizard/basicSettings.html → ...ancer/configure/wizard/basicSettings.html b/...ancer/configure/wizard/basicSettings.html → ...ancer/configure/wizard/basicSettings.html
diff --git a/...lancer/configure/wizard/createWizard.html → ...lancer/configure/wizard/createWizard.html b/...lancer/configure/wizard/createWizard.html → ...lancer/configure/wizard/createWizard.html
diff --git a/...Balancer/configure/wizard/editWizard.html → ...Balancer/configure/wizard/editWizard.html b/...Balancer/configure/wizard/editWizard.html → ...Balancer/configure/wizard/editWizard.html
diff --git a/...ncer/configure/wizard/ports.controller.js → ...ncer/configure/wizard/ports.controller.js b/...ncer/configure/wizard/ports.controller.js → ...ncer/configure/wizard/ports.controller.js
diff --git a/.../loadBalancer/configure/wizard/ports.html → .../loadBalancer/configure/wizard/ports.html b/.../loadBalancer/configure/wizard/ports.html → .../loadBalancer/configure/wizard/ports.html
diff --git a/...cer/configure/wizard/upsert.controller.js → ...cer/configure/wizard/upsert.controller.js b/...cer/configure/wizard/upsert.controller.js → ...cer/configure/wizard/upsert.controller.js
diff --git a/...oadBalancer/details/details.controller.js → ...oadBalancer/details/details.controller.js b/...oadBalancer/details/details.controller.js → ...oadBalancer/details/details.controller.js
diff --git a/...tes/src/loadBalancer/details/details.html → .../src/v1/loadBalancer/details/details.html b/...tes/src/loadBalancer/details/details.html → .../src/v1/loadBalancer/details/details.html
diff --git a/...ncer/details/details.kubernetes.module.js → ...ncer/details/details.kubernetes.module.js b/...ncer/details/details.kubernetes.module.js → ...ncer/details/details.kubernetes.module.js
diff --git a/...ubernetes/src/loadBalancer/transformer.js → ...rnetes/src/v1/loadBalancer/transformer.js b/...ubernetes/src/loadBalancer/transformer.js → ...rnetes/src/v1/loadBalancer/transformer.js
@@ -2,7 +2,7 @@
 
 import _ from 'lodash';
 
-import { KubernetesProviderSettings } from '../kubernetes.settings';
+import { KubernetesProviderSettings } from '../../kubernetes.settings';
 
 const angular = require('angular');
 

diff --git a/...namespace/multiSelectField.component.html → ...namespace/multiSelectField.component.html b/...namespace/multiSelectField.component.html → ...namespace/multiSelectField.component.html
diff --git a/...c/namespace/multiSelectField.component.js → ...1/namespace/multiSelectField.component.js b/...c/namespace/multiSelectField.component.js → ...1/namespace/multiSelectField.component.js
diff --git a/...namespace/multiSelectField.directive.html → ...namespace/multiSelectField.directive.html b/...namespace/multiSelectField.directive.html → ...namespace/multiSelectField.directive.html
diff --git a/.../src/namespace/selectField.directive.html → ...c/v1/namespace/selectField.directive.html b/.../src/namespace/selectField.directive.html → ...c/v1/namespace/selectField.directive.html
diff --git a/...es/src/namespace/selectField.directive.js → ...src/v1/namespace/selectField.directive.js b/...es/src/namespace/selectField.directive.js → ...src/v1/namespace/selectField.directive.js
diff --git a/...estroyAsg/destroyAsgExecutionDetails.html → ...estroyAsg/destroyAsgExecutionDetails.html b/...estroyAsg/destroyAsgExecutionDetails.html → ...estroyAsg/destroyAsgExecutionDetails.html
diff --git a/...ne/stages/destroyAsg/destroyAsgStage.html → ...ne/stages/destroyAsg/destroyAsgStage.html b/...ne/stages/destroyAsg/destroyAsgStage.html → ...ne/stages/destroyAsg/destroyAsgStage.html
diff --git a/...tages/destroyAsg/destroyAsgStepLabel.html → ...tages/destroyAsg/destroyAsgStepLabel.html b/...tages/destroyAsg/destroyAsgStepLabel.html → ...tages/destroyAsg/destroyAsgStepLabel.html
diff --git a/...s/destroyAsg/kubernetesDestroyAsgStage.js → ...s/destroyAsg/kubernetesDestroyAsgStage.js b/...s/destroyAsg/kubernetesDestroyAsgStage.js → ...s/destroyAsg/kubernetesDestroyAsgStage.js
diff --git a/...isableAsg/disableAsgExecutionDetails.html → ...isableAsg/disableAsgExecutionDetails.html b/...isableAsg/disableAsgExecutionDetails.html → ...isableAsg/disableAsgExecutionDetails.html
diff --git a/...ne/stages/disableAsg/disableAsgStage.html → ...ne/stages/disableAsg/disableAsgStage.html b/...ne/stages/disableAsg/disableAsgStage.html → ...ne/stages/disableAsg/disableAsgStage.html
diff --git a/...tages/disableAsg/disableAsgStepLabel.html → ...tages/disableAsg/disableAsgStepLabel.html b/...tages/disableAsg/disableAsgStepLabel.html → ...tages/disableAsg/disableAsgStepLabel.html
diff --git a/...s/disableAsg/kubernetesDisableAsgStage.js → ...s/disableAsg/kubernetesDisableAsgStage.js b/...s/disableAsg/kubernetesDisableAsgStage.js → ...s/disableAsg/kubernetesDisableAsgStage.js
diff --git a/...uster/disableClusterExecutionDetails.html → ...uster/disableClusterExecutionDetails.html b/...uster/disableClusterExecutionDetails.html → ...uster/disableClusterExecutionDetails.html
diff --git a/...s/disableCluster/disableClusterStage.html → ...s/disableCluster/disableClusterStage.html b/...s/disableCluster/disableClusterStage.html → ...s/disableCluster/disableClusterStage.html
diff --git a/...eCluster/kubernetesDisableClusterStage.js → ...eCluster/kubernetesDisableClusterStage.js b/...eCluster/kubernetesDisableClusterStage.js → ...eCluster/kubernetesDisableClusterStage.js
diff --git a/.../enableAsg/enableAsgExecutionDetails.html → .../enableAsg/enableAsgExecutionDetails.html b/.../enableAsg/enableAsgExecutionDetails.html → .../enableAsg/enableAsgExecutionDetails.html
diff --git a/...line/stages/enableAsg/enableAsgStage.html → ...line/stages/enableAsg/enableAsgStage.html b/...line/stages/enableAsg/enableAsgStage.html → ...line/stages/enableAsg/enableAsgStage.html
diff --git a/.../stages/enableAsg/enableAsgStepLabel.html → .../stages/enableAsg/enableAsgStepLabel.html b/.../stages/enableAsg/enableAsgStepLabel.html → .../stages/enableAsg/enableAsgStepLabel.html
diff --git a/...ges/enableAsg/kubernetesEnableAsgStage.js → ...ges/enableAsg/kubernetesEnableAsgStage.js b/...ges/enableAsg/kubernetesEnableAsgStage.js → ...ges/enableAsg/kubernetesEnableAsgStage.js
diff --git a/...ages/findAmi/findAmiExecutionDetails.html → ...ages/findAmi/findAmiExecutionDetails.html b/...ages/findAmi/findAmiExecutionDetails.html → ...ages/findAmi/findAmiExecutionDetails.html
diff --git a/...pipeline/stages/findAmi/findAmiStage.html → ...pipeline/stages/findAmi/findAmiStage.html b/...pipeline/stages/findAmi/findAmiStage.html → ...pipeline/stages/findAmi/findAmiStage.html
diff --git a/.../stages/findAmi/kubernetesFindAmiStage.js → .../stages/findAmi/kubernetesFindAmiStage.js b/.../stages/findAmi/kubernetesFindAmiStage.js → .../stages/findAmi/kubernetesFindAmiStage.js
diff --git a/...ges/resizeAsg/resizeExecutionDetails.html → ...ges/resizeAsg/resizeExecutionDetails.html b/...ges/resizeAsg/resizeExecutionDetails.html → ...ges/resizeAsg/resizeExecutionDetails.html
diff --git a/...ipeline/stages/resizeAsg/resizeStage.html → ...ipeline/stages/resizeAsg/resizeStage.html b/...ipeline/stages/resizeAsg/resizeStage.html → ...ipeline/stages/resizeAsg/resizeStage.html
diff --git a/.../pipeline/stages/resizeAsg/resizeStage.js → .../pipeline/stages/resizeAsg/resizeStage.js b/.../pipeline/stages/resizeAsg/resizeStage.js → .../pipeline/stages/resizeAsg/resizeStage.js
diff --git a/...ipeline/stages/resizeAsg/resizeStage.less → ...ipeline/stages/resizeAsg/resizeStage.less b/...ipeline/stages/resizeAsg/resizeStage.less → ...ipeline/stages/resizeAsg/resizeStage.less
diff --git a/...ine/stages/resizeAsg/resizeStepLabel.html → ...ine/stages/resizeAsg/resizeStepLabel.html b/...ine/stages/resizeAsg/resizeStepLabel.html → ...ine/stages/resizeAsg/resizeStepLabel.html
diff --git a/.../stages/runJob/configureJob.controller.js → .../stages/runJob/configureJob.controller.js b/.../stages/runJob/configureJob.controller.js → .../stages/runJob/configureJob.controller.js
@@ -4,18 +4,18 @@ const angular = require('angular');
 
 import { AccountService, PipelineConfigService } from '@spinnaker/core';
 
-import { KUBERNETES_LIFECYCLE_HOOK_CONFIGURER } from 'kubernetes/container/lifecycleHook.component';
-import { KUBERNETES_CONTAINER_ENVIRONMENT_FROM } from 'kubernetes/container/environmentFrom.component';
+import { KUBERNETES_LIFECYCLE_HOOK_CONFIGURER } from 'kubernetes/v1/container/lifecycleHook.component';
+import { KUBERNETES_CONTAINER_ENVIRONMENT_FROM } from 'kubernetes/v1/container/environmentFrom.component';
 
 module.exports = angular
   .module('spinnaker.kubernetes.pipeline.stage.runJobStage.configure', [
-    require('kubernetes/container/commands.component').name,
-    require('kubernetes/container/arguments.component').name,
-    require('kubernetes/container/environmentVariables.component').name,
-    require('kubernetes/container/volumes.component').name,
-    require('kubernetes/container/ports.component').name,
-    require('kubernetes/container/resources.component').name,
-    require('kubernetes/container/probe.directive').name,
+    require('kubernetes/v1/container/commands.component').name,
+    require('kubernetes/v1/container/arguments.component').name,
+    require('kubernetes/v1/container/environmentVariables.component').name,
+    require('kubernetes/v1/container/volumes.component').name,
+    require('kubernetes/v1/container/ports.component').name,
+    require('kubernetes/v1/container/resources.component').name,
+    require('kubernetes/v1/container/probe.directive').name,
     KUBERNETES_LIFECYCLE_HOOK_CONFIGURER,
     KUBERNETES_CONTAINER_ENVIRONMENT_FROM,
   ])

diff --git a/.../pipeline/stages/runJob/configureJob.html → .../pipeline/stages/runJob/configureJob.html b/.../pipeline/stages/runJob/configureJob.html → .../pipeline/stages/runJob/configureJob.html
diff --git a/...nJob/runJobExecutionDetails.controller.js → ...nJob/runJobExecutionDetails.controller.js b/...nJob/runJobExecutionDetails.controller.js → ...nJob/runJobExecutionDetails.controller.js
diff --git a/...stages/runJob/runJobExecutionDetails.html → ...stages/runJob/runJobExecutionDetails.html b/...stages/runJob/runJobExecutionDetails.html → ...stages/runJob/runJobExecutionDetails.html
diff --git a/...rc/pipeline/stages/runJob/runJobLogs.html → ...v1/pipeline/stages/runJob/runJobLogs.html b/...rc/pipeline/stages/runJob/runJobLogs.html → ...v1/pipeline/stages/runJob/runJobLogs.html
diff --git a/...c/pipeline/stages/runJob/runJobStage.html → ...1/pipeline/stages/runJob/runJobStage.html b/...c/pipeline/stages/runJob/runJobStage.html → ...1/pipeline/stages/runJob/runJobStage.html
diff --git a/...src/pipeline/stages/runJob/runJobStage.js → .../v1/pipeline/stages/runJob/runJobStage.js b/...src/pipeline/stages/runJob/runJobStage.js → .../v1/pipeline/stages/runJob/runJobStage.js
@@ -4,17 +4,17 @@ import _ from 'lodash';
 
 import { Registry } from '@spinnaker/core';
 
-import { KUBERNETES_IMAGE_ID_FILTER } from 'kubernetes/presentation/imageId.filter';
+import { KUBERNETES_IMAGE_ID_FILTER } from 'kubernetes/v1/presentation/imageId.filter';
 
 const angular = require('angular');
 
 module.exports = angular
   .module('spinnaker.kubernetes.pipeline.stage.runJobStage', [
-    require('kubernetes/container/commands.component').name,
-    require('kubernetes/container/arguments.component').name,
-    require('kubernetes/container/environmentVariables.component').name,
-    require('kubernetes/container/volumes.component').name,
-    require('kubernetes/image/image.reader').name,
+    require('kubernetes/v1/container/commands.component').name,
+    require('kubernetes/v1/container/arguments.component').name,
+    require('kubernetes/v1/container/environmentVariables.component').name,
+    require('kubernetes/v1/container/volumes.component').name,
+    require('kubernetes/v1/image/image.reader').name,
     require('./runJobExecutionDetails.controller').name,
     require('./configureJob.controller').name,
     KUBERNETES_IMAGE_ID_FILTER,

diff --git a/...ter/scaleDownClusterExecutionDetails.html → ...ter/scaleDownClusterExecutionDetails.html b/...ter/scaleDownClusterExecutionDetails.html → ...ter/scaleDownClusterExecutionDetails.html
diff --git a/...aleDownCluster/scaleDownClusterStage.html → ...aleDownCluster/scaleDownClusterStage.html b/...aleDownCluster/scaleDownClusterStage.html → ...aleDownCluster/scaleDownClusterStage.html
diff --git a/...scaleDownCluster/scaleDownClusterStage.js → ...scaleDownCluster/scaleDownClusterStage.js b/...scaleDownCluster/scaleDownClusterStage.js → ...scaleDownCluster/scaleDownClusterStage.js
diff --git a/...luster/shrinkClusterExecutionDetails.html → ...luster/shrinkClusterExecutionDetails.html b/...luster/shrinkClusterExecutionDetails.html → ...luster/shrinkClusterExecutionDetails.html
diff --git a/...ges/shrinkCluster/shrinkClusterStage.html → ...ges/shrinkCluster/shrinkClusterStage.html b/...ges/shrinkCluster/shrinkClusterStage.html → ...ges/shrinkCluster/shrinkClusterStage.html
diff --git a/...tages/shrinkCluster/shrinkClusterStage.js → ...tages/shrinkCluster/shrinkClusterStage.js b/...tages/shrinkCluster/shrinkClusterStage.js → ...tages/shrinkCluster/shrinkClusterStage.js
diff --git a/...rnetes/src/presentation/imageId.filter.ts → ...tes/src/v1/presentation/imageId.filter.ts b/...rnetes/src/presentation/imageId.filter.ts → ...tes/src/v1/presentation/imageId.filter.ts
diff --git a/...odules/kubernetes/src/proxy/ui.service.js → ...les/kubernetes/src/v1/proxy/ui.service.js b/...odules/kubernetes/src/proxy/ui.service.js → ...les/kubernetes/src/v1/proxy/ui.service.js
@@ -2,7 +2,7 @@
 
 const angular = require('angular');
 
-import { KubernetesProviderSettings } from '../kubernetes.settings';
+import { KubernetesProviderSettings } from '../../kubernetes.settings';
 
 module.exports = angular.module('spinnaker.proxy.kubernetes.ui.service', []).factory('kubernetesProxyUiService', [
   '$interpolate',

diff --git a/.../kubernetes/src/search/resultFormatter.js → ...bernetes/src/v1/search/resultFormatter.js b/.../kubernetes/src/search/resultFormatter.js → ...bernetes/src/v1/search/resultFormatter.js
diff --git a/.../configure/configure.kubernetes.module.js → .../configure/configure.kubernetes.module.js b/.../configure/configure.kubernetes.module.js → .../configure/configure.kubernetes.module.js
diff --git a/...up/configure/wizard/advancedSettings.html → ...up/configure/wizard/advancedSettings.html b/...up/configure/wizard/advancedSettings.html → ...up/configure/wizard/advancedSettings.html
diff --git a/...up/configure/wizard/backend.controller.js → ...up/configure/wizard/backend.controller.js b/...up/configure/wizard/backend.controller.js → ...up/configure/wizard/backend.controller.js
diff --git a/...curityGroup/configure/wizard/backend.html → ...curityGroup/configure/wizard/backend.html b/...curityGroup/configure/wizard/backend.html → ...curityGroup/configure/wizard/backend.html
diff --git a/...Group/configure/wizard/basicSettings.html → ...Group/configure/wizard/basicSettings.html b/...Group/configure/wizard/basicSettings.html → ...Group/configure/wizard/basicSettings.html
diff --git a/...yGroup/configure/wizard/createWizard.html → ...yGroup/configure/wizard/createWizard.html b/...yGroup/configure/wizard/createWizard.html → ...yGroup/configure/wizard/createWizard.html
diff --git a/...ityGroup/configure/wizard/editWizard.html → ...ityGroup/configure/wizard/editWizard.html b/...ityGroup/configure/wizard/editWizard.html → ...ityGroup/configure/wizard/editWizard.html
diff --git a/...roup/configure/wizard/rules.controller.js → ...roup/configure/wizard/rules.controller.js b/...roup/configure/wizard/rules.controller.js → ...roup/configure/wizard/rules.controller.js
diff --git a/...securityGroup/configure/wizard/rules.html → ...securityGroup/configure/wizard/rules.html b/...securityGroup/configure/wizard/rules.html → ...securityGroup/configure/wizard/rules.html
diff --git a/...yGroup/configure/wizard/tls.controller.js → ...yGroup/configure/wizard/tls.controller.js b/...yGroup/configure/wizard/tls.controller.js → ...yGroup/configure/wizard/tls.controller.js
diff --git a/...c/securityGroup/configure/wizard/tls.html → ...1/securityGroup/configure/wizard/tls.html b/...c/securityGroup/configure/wizard/tls.html → ...1/securityGroup/configure/wizard/tls.html
diff --git a/...oup/configure/wizard/upsert.controller.js → ...oup/configure/wizard/upsert.controller.js b/...oup/configure/wizard/upsert.controller.js → ...oup/configure/wizard/upsert.controller.js
diff --git a/...curityGroup/details/details.controller.js → ...curityGroup/details/details.controller.js b/...curityGroup/details/details.controller.js → ...curityGroup/details/details.controller.js
diff --git a/...es/src/securityGroup/details/details.html → ...src/v1/securityGroup/details/details.html b/...es/src/securityGroup/details/details.html → ...src/v1/securityGroup/details/details.html
diff --git a/...roup/details/details.kubernetes.module.js → ...roup/details/details.kubernetes.module.js b/...roup/details/details.kubernetes.module.js → ...roup/details/details.kubernetes.module.js
diff --git a/...bernetes/src/securityGroup/transformer.js → ...netes/src/v1/securityGroup/transformer.js b/...bernetes/src/securityGroup/transformer.js → ...netes/src/v1/securityGroup/transformer.js
@@ -2,7 +2,7 @@
 
 const angular = require('angular');
 
-import { KubernetesProviderSettings } from '../kubernetes.settings';
+import { KubernetesProviderSettings } from '../../kubernetes.settings';
 
 module.exports = angular
   .module('spinnaker.kubernetes.securityGroup.transformer', [])

diff --git a/...etes/src/serverGroup/artifactExtractor.ts → ...s/src/v1/serverGroup/artifactExtractor.ts b/...etes/src/serverGroup/artifactExtractor.ts → ...s/src/v1/serverGroup/artifactExtractor.ts
diff --git a/...c/serverGroup/configure/CommandBuilder.js → ...1/serverGroup/configure/CommandBuilder.js b/...c/serverGroup/configure/CommandBuilder.js → ...1/serverGroup/configure/CommandBuilder.js
diff --git a/...rGroup/configure/configuration.service.js → ...rGroup/configure/configuration.service.js b/...rGroup/configure/configuration.service.js → ...rGroup/configure/configuration.service.js
diff --git a/.../configure/configure.kubernetes.module.js → .../configure/configure.kubernetes.module.js b/.../configure/configure.kubernetes.module.js → .../configure/configure.kubernetes.module.js
diff --git a/...figure/wizard/BasicSettings.controller.js → ...figure/wizard/BasicSettings.controller.js b/...figure/wizard/BasicSettings.controller.js → ...figure/wizard/BasicSettings.controller.js
diff --git a/...roup/configure/wizard/Clone.controller.js → ...roup/configure/wizard/Clone.controller.js b/...roup/configure/wizard/Clone.controller.js → ...roup/configure/wizard/Clone.controller.js
diff --git a/...ure/wizard/advancedSettings.controller.js → ...ure/wizard/advancedSettings.controller.js b/...ure/wizard/advancedSettings.controller.js → ...ure/wizard/advancedSettings.controller.js
diff --git a/...up/configure/wizard/advancedSettings.html → ...up/configure/wizard/advancedSettings.html b/...up/configure/wizard/advancedSettings.html → ...up/configure/wizard/advancedSettings.html
diff --git a/...Group/configure/wizard/basicSettings.html → ...Group/configure/wizard/basicSettings.html b/...Group/configure/wizard/basicSettings.html → ...Group/configure/wizard/basicSettings.html
diff --git a/...configure/wizard/deployment.controller.js → ...configure/wizard/deployment.controller.js b/...configure/wizard/deployment.controller.js → ...configure/wizard/deployment.controller.js
diff --git a/...verGroup/configure/wizard/deployment.html → ...verGroup/configure/wizard/deployment.html b/...verGroup/configure/wizard/deployment.html → ...verGroup/configure/wizard/deployment.html
diff --git a/...figure/wizard/loadBalancers.controller.js → ...figure/wizard/loadBalancers.controller.js b/...figure/wizard/loadBalancers.controller.js → ...figure/wizard/loadBalancers.controller.js
diff --git a/...Group/configure/wizard/loadBalancers.html → ...Group/configure/wizard/loadBalancers.html b/...Group/configure/wizard/loadBalancers.html → ...Group/configure/wizard/loadBalancers.html
diff --git a/...erverGroup/configure/wizard/replicas.html → ...erverGroup/configure/wizard/replicas.html b/...erverGroup/configure/wizard/replicas.html → ...erverGroup/configure/wizard/replicas.html
diff --git a/...p/configure/wizard/templateSelection.html → ...p/configure/wizard/templateSelection.html b/...p/configure/wizard/templateSelection.html → ...p/configure/wizard/templateSelection.html
diff --git a/...up/configure/wizard/volumes.controller.js → ...up/configure/wizard/volumes.controller.js b/...up/configure/wizard/volumes.controller.js → ...up/configure/wizard/volumes.controller.js
diff --git a/...serverGroup/configure/wizard/volumes.html → ...serverGroup/configure/wizard/volumes.html b/...serverGroup/configure/wizard/volumes.html → ...serverGroup/configure/wizard/volumes.html
diff --git a/.../serverGroup/configure/wizard/wizard.html → .../serverGroup/configure/wizard/wizard.html b/.../serverGroup/configure/wizard/wizard.html → .../serverGroup/configure/wizard/wizard.html
diff --git a/...roup/details/containerDetail.component.ts → ...roup/details/containerDetail.component.ts b/...roup/details/containerDetail.component.ts → ...roup/details/containerDetail.component.ts
diff --git a/...serverGroup/details/details.controller.js → ...serverGroup/details/details.controller.js b/...serverGroup/details/details.controller.js → ...serverGroup/details/details.controller.js
diff --git a/...etes/src/serverGroup/details/details.html → ...s/src/v1/serverGroup/details/details.html b/...etes/src/serverGroup/details/details.html → ...s/src/v1/serverGroup/details/details.html
diff --git a/...roup/details/details.kubernetes.module.js → ...roup/details/details.kubernetes.module.js b/...roup/details/details.kubernetes.module.js → ...roup/details/details.kubernetes.module.js
diff --git a/...details/lifecycleHookDetails.component.ts → ...details/lifecycleHookDetails.component.ts b/...details/lifecycleHookDetails.component.ts → ...details/lifecycleHookDetails.component.ts
diff --git a/...Group/details/resize/resize.controller.js → ...Group/details/resize/resize.controller.js b/...Group/details/resize/resize.controller.js → ...Group/details/resize/resize.controller.js
diff --git a/...rc/serverGroup/details/resize/resize.html → ...v1/serverGroup/details/resize/resize.html b/...rc/serverGroup/details/resize/resize.html → ...v1/serverGroup/details/resize/resize.html
diff --git a/...p/details/rollback/rollback.controller.js → ...p/details/rollback/rollback.controller.js b/...p/details/rollback/rollback.controller.js → ...p/details/rollback/rollback.controller.js
diff --git a/...erverGroup/details/rollback/rollback.html → ...erverGroup/details/rollback/rollback.html b/...erverGroup/details/rollback/rollback.html → ...erverGroup/details/rollback/rollback.html
diff --git a/...kubernetes/src/serverGroup/paramsMixin.js → ...ernetes/src/v1/serverGroup/paramsMixin.js b/...kubernetes/src/serverGroup/paramsMixin.js → ...ernetes/src/v1/serverGroup/paramsMixin.js
diff --git a/...kubernetes/src/serverGroup/transformer.js → ...ernetes/src/v1/serverGroup/transformer.js b/...kubernetes/src/serverGroup/transformer.js → ...ernetes/src/v1/serverGroup/transformer.js
diff --git a/app/scripts/modules/kubernetes/src/v2/kubernetes.v2.module.ts b/app/scripts/modules/kubernetes/src/v2/kubernetes.v2.module.ts
@@ -2,7 +2,7 @@ import { module } from 'angular';
 
 import { CloudProviderRegistry, STAGE_ARTIFACT_SELECTOR_COMPONENT_REACT, YAML_EDITOR_COMPONENT } from '@spinnaker/core';
 
-import '../logo/kubernetes.logo.less';
+import '../shared/logo/kubernetes.logo.less';
 
 import { KUBERNETES_MANIFEST_DELETE_CTRL } from './manifest/delete/delete.controller';
 import { KUBERNETES_MANIFEST_SCALE_CTRL } from './manifest/scale/scale.controller';
@@ -39,6 +39,7 @@ import { ManifestWizard } from 'kubernetes/v2/manifest/wizard/ManifestWizard';
 import { KUBERNETES_ENABLE_MANIFEST_STAGE } from 'kubernetes/v2/pipelines/stages/traffic/enableManifest.stage';
 import { KUBERNETES_DISABLE_MANIFEST_STAGE } from 'kubernetes/v2/pipelines/stages/traffic/disableManifest.stage';
 import { KUBERNETES_V2_RUN_JOB_STAGE } from 'kubernetes/v2/pipelines/stages/runJob/runJobStage';
+import { KubernetesSecurityGroupReader } from 'kubernetes/shared/securityGroup/securityGroup.reader';
 
 // React stages
 import './pipelines/stages/deployManifest/deployManifestStage';
@@ -74,7 +75,6 @@ module(KUBERNETES_V2_MODULE, [
   KUBERNETES_MANIFEST_ARTIFACT,
   KUBERNETES_V2_LOAD_BALANCER_TRANSFORMER,
   KUBERNETES_V2_SECURITY_GROUP_TRANSFORMER,
-  require('../securityGroup/reader').name,
   KUBERNETES_DELETE_MANIFEST_STAGE,
   KUBERNETES_SCALE_MANIFEST_STAGE,
   KUBERNETES_UNDO_ROLLOUT_MANIFEST_STAGE,
@@ -98,7 +98,7 @@ module(KUBERNETES_V2_MODULE, [
     name: 'Kubernetes',
     skin: 'v2',
     logo: {
-      path: require('../logo/kubernetes.icon.svg'),
+      path: require('../shared/logo/kubernetes.icon.svg'),
     },
     serverGroup: {
       CloneServerGroupModal: ManifestWizard,
@@ -118,7 +118,7 @@ module(KUBERNETES_V2_MODULE, [
       transformer: 'kubernetesV2LoadBalancerTransformer',
     },
     securityGroup: {
-      reader: 'kubernetesSecurityGroupReader',
+      reader: KubernetesSecurityGroupReader,
       CreateSecurityGroupModal: ManifestWizard,
       detailsController: 'kubernetesV2SecurityGroupDetailsCtrl',
       detailsTemplateUrl: require('./securityGroup/details/details.html'),