diff --git a/app/scripts/modules/kubernetes/src/securityGroup/reader.js b/app/scripts/modules/kubernetes/src/securityGroup/reader.js deleted file mode 100644 index cafc1063875..00000000000 --- a/app/scripts/modules/kubernetes/src/securityGroup/reader.js +++ /dev/null @@ -1,15 +0,0 @@ -'use strict'; - -const angular = require('angular'); - -module.exports = angular - .module('spinnaker.kubernetes.securityGroup.reader', []) - .factory('kubernetesSecurityGroupReader', function() { - function resolveIndexedSecurityGroup(indexedSecurityGroups, container, securityGroupId) { - return indexedSecurityGroups[container.account][container.region][securityGroupId]; - } - - return { - resolveIndexedSecurityGroup: resolveIndexedSecurityGroup, - }; - }); diff --git a/app/scripts/modules/kubernetes/src/help/kubernetes.help.ts b/app/scripts/modules/kubernetes/src/shared/help/kubernetes.help.ts similarity index 100% rename from app/scripts/modules/kubernetes/src/help/kubernetes.help.ts rename to app/scripts/modules/kubernetes/src/shared/help/kubernetes.help.ts diff --git a/app/scripts/modules/kubernetes/src/logo/kubernetes.icon.svg b/app/scripts/modules/kubernetes/src/shared/logo/kubernetes.icon.svg similarity index 100% rename from app/scripts/modules/kubernetes/src/logo/kubernetes.icon.svg rename to app/scripts/modules/kubernetes/src/shared/logo/kubernetes.icon.svg diff --git a/app/scripts/modules/kubernetes/src/logo/kubernetes.logo.less b/app/scripts/modules/kubernetes/src/shared/logo/kubernetes.logo.less similarity index 100% rename from app/scripts/modules/kubernetes/src/logo/kubernetes.logo.less rename to app/scripts/modules/kubernetes/src/shared/logo/kubernetes.logo.less diff --git a/app/scripts/modules/kubernetes/src/logo/kubernetes.logo.svg b/app/scripts/modules/kubernetes/src/shared/logo/kubernetes.logo.svg similarity index 100% rename from app/scripts/modules/kubernetes/src/logo/kubernetes.logo.svg rename to app/scripts/modules/kubernetes/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 new file mode 100644 index 00000000000..59755513326 --- /dev/null +++ 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/app/scripts/modules/kubernetes/src/validation/applicationName.validator.js b/app/scripts/modules/kubernetes/src/shared/validation/applicationName.validator.js similarity index 100% rename from app/scripts/modules/kubernetes/src/validation/applicationName.validator.js rename to app/scripts/modules/kubernetes/src/shared/validation/applicationName.validator.js diff --git a/app/scripts/modules/kubernetes/src/autoscaler/autoscaler.write.service.js b/app/scripts/modules/kubernetes/src/v1/autoscaler/autoscaler.write.service.js similarity index 100% rename from app/scripts/modules/kubernetes/src/autoscaler/autoscaler.write.service.js rename to app/scripts/modules/kubernetes/src/v1/autoscaler/autoscaler.write.service.js diff --git a/app/scripts/modules/kubernetes/src/cluster/cluster.kubernetes.module.js b/app/scripts/modules/kubernetes/src/v1/cluster/cluster.kubernetes.module.js similarity index 100% rename from app/scripts/modules/kubernetes/src/cluster/cluster.kubernetes.module.js rename to app/scripts/modules/kubernetes/src/v1/cluster/cluster.kubernetes.module.js diff --git a/app/scripts/modules/kubernetes/src/cluster/configure/CommandBuilder.js b/app/scripts/modules/kubernetes/src/v1/cluster/configure/CommandBuilder.js similarity index 99% rename from app/scripts/modules/kubernetes/src/cluster/configure/CommandBuilder.js rename to app/scripts/modules/kubernetes/src/v1/cluster/configure/CommandBuilder.js index 8513e89b29f..4259ce12375 100644 --- a/app/scripts/modules/kubernetes/src/cluster/configure/CommandBuilder.js +++ b/app/scripts/modules/kubernetes/src/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/app/scripts/modules/kubernetes/src/common/keyValueDetails.component.ts b/app/scripts/modules/kubernetes/src/v1/common/keyValueDetails.component.ts similarity index 100% rename from app/scripts/modules/kubernetes/src/common/keyValueDetails.component.ts rename to app/scripts/modules/kubernetes/src/v1/common/keyValueDetails.component.ts diff --git a/app/scripts/modules/kubernetes/src/common/tolerations/TolerationsComponent.tsx b/app/scripts/modules/kubernetes/src/v1/common/tolerations/TolerationsComponent.tsx similarity index 100% rename from app/scripts/modules/kubernetes/src/common/tolerations/TolerationsComponent.tsx rename to app/scripts/modules/kubernetes/src/v1/common/tolerations/TolerationsComponent.tsx diff --git a/app/scripts/modules/kubernetes/src/common/tolerations/tolerations.component.ts b/app/scripts/modules/kubernetes/src/v1/common/tolerations/tolerations.component.ts similarity index 100% rename from app/scripts/modules/kubernetes/src/common/tolerations/tolerations.component.ts rename to app/scripts/modules/kubernetes/src/v1/common/tolerations/tolerations.component.ts diff --git a/app/scripts/modules/kubernetes/src/container/arguments.component.html b/app/scripts/modules/kubernetes/src/v1/container/arguments.component.html similarity index 100% rename from app/scripts/modules/kubernetes/src/container/arguments.component.html rename to app/scripts/modules/kubernetes/src/v1/container/arguments.component.html diff --git a/app/scripts/modules/kubernetes/src/container/arguments.component.js b/app/scripts/modules/kubernetes/src/v1/container/arguments.component.js similarity index 100% rename from app/scripts/modules/kubernetes/src/container/arguments.component.js rename to app/scripts/modules/kubernetes/src/v1/container/arguments.component.js diff --git a/app/scripts/modules/kubernetes/src/container/commands.component.html b/app/scripts/modules/kubernetes/src/v1/container/commands.component.html similarity index 100% rename from app/scripts/modules/kubernetes/src/container/commands.component.html rename to app/scripts/modules/kubernetes/src/v1/container/commands.component.html diff --git a/app/scripts/modules/kubernetes/src/container/commands.component.js b/app/scripts/modules/kubernetes/src/v1/container/commands.component.js similarity index 100% rename from app/scripts/modules/kubernetes/src/container/commands.component.js rename to app/scripts/modules/kubernetes/src/v1/container/commands.component.js diff --git a/app/scripts/modules/kubernetes/src/container/configurer.directive.html b/app/scripts/modules/kubernetes/src/v1/container/configurer.directive.html similarity index 100% rename from app/scripts/modules/kubernetes/src/container/configurer.directive.html rename to app/scripts/modules/kubernetes/src/v1/container/configurer.directive.html diff --git a/app/scripts/modules/kubernetes/src/container/configurer.directive.js b/app/scripts/modules/kubernetes/src/v1/container/configurer.directive.js similarity index 100% rename from app/scripts/modules/kubernetes/src/container/configurer.directive.js rename to app/scripts/modules/kubernetes/src/v1/container/configurer.directive.js diff --git a/app/scripts/modules/kubernetes/src/container/environmentFrom.component.html b/app/scripts/modules/kubernetes/src/v1/container/environmentFrom.component.html similarity index 100% rename from app/scripts/modules/kubernetes/src/container/environmentFrom.component.html rename to app/scripts/modules/kubernetes/src/v1/container/environmentFrom.component.html diff --git a/app/scripts/modules/kubernetes/src/container/environmentFrom.component.ts b/app/scripts/modules/kubernetes/src/v1/container/environmentFrom.component.ts similarity index 100% rename from app/scripts/modules/kubernetes/src/container/environmentFrom.component.ts rename to app/scripts/modules/kubernetes/src/v1/container/environmentFrom.component.ts diff --git a/app/scripts/modules/kubernetes/src/container/environmentVariables.component.html b/app/scripts/modules/kubernetes/src/v1/container/environmentVariables.component.html similarity index 100% rename from app/scripts/modules/kubernetes/src/container/environmentVariables.component.html rename to app/scripts/modules/kubernetes/src/v1/container/environmentVariables.component.html diff --git a/app/scripts/modules/kubernetes/src/container/environmentVariables.component.js b/app/scripts/modules/kubernetes/src/v1/container/environmentVariables.component.js similarity index 100% rename from app/scripts/modules/kubernetes/src/container/environmentVariables.component.js rename to app/scripts/modules/kubernetes/src/v1/container/environmentVariables.component.js diff --git a/app/scripts/modules/kubernetes/src/container/lifecycleHook.component.html b/app/scripts/modules/kubernetes/src/v1/container/lifecycleHook.component.html similarity index 100% rename from app/scripts/modules/kubernetes/src/container/lifecycleHook.component.html rename to app/scripts/modules/kubernetes/src/v1/container/lifecycleHook.component.html diff --git a/app/scripts/modules/kubernetes/src/container/lifecycleHook.component.ts b/app/scripts/modules/kubernetes/src/v1/container/lifecycleHook.component.ts similarity index 100% rename from app/scripts/modules/kubernetes/src/container/lifecycleHook.component.ts rename to app/scripts/modules/kubernetes/src/v1/container/lifecycleHook.component.ts diff --git a/app/scripts/modules/kubernetes/src/container/ports.component.html b/app/scripts/modules/kubernetes/src/v1/container/ports.component.html similarity index 100% rename from app/scripts/modules/kubernetes/src/container/ports.component.html rename to app/scripts/modules/kubernetes/src/v1/container/ports.component.html diff --git a/app/scripts/modules/kubernetes/src/container/ports.component.js b/app/scripts/modules/kubernetes/src/v1/container/ports.component.js similarity index 100% rename from app/scripts/modules/kubernetes/src/container/ports.component.js rename to app/scripts/modules/kubernetes/src/v1/container/ports.component.js diff --git a/app/scripts/modules/kubernetes/src/container/probe.directive.html b/app/scripts/modules/kubernetes/src/v1/container/probe.directive.html similarity index 100% rename from app/scripts/modules/kubernetes/src/container/probe.directive.html rename to app/scripts/modules/kubernetes/src/v1/container/probe.directive.html diff --git a/app/scripts/modules/kubernetes/src/container/probe.directive.js b/app/scripts/modules/kubernetes/src/v1/container/probe.directive.js similarity index 100% rename from app/scripts/modules/kubernetes/src/container/probe.directive.js rename to app/scripts/modules/kubernetes/src/v1/container/probe.directive.js diff --git a/app/scripts/modules/kubernetes/src/container/resources.component.html b/app/scripts/modules/kubernetes/src/v1/container/resources.component.html similarity index 100% rename from app/scripts/modules/kubernetes/src/container/resources.component.html rename to app/scripts/modules/kubernetes/src/v1/container/resources.component.html diff --git a/app/scripts/modules/kubernetes/src/container/resources.component.js b/app/scripts/modules/kubernetes/src/v1/container/resources.component.js similarity index 100% rename from app/scripts/modules/kubernetes/src/container/resources.component.js rename to app/scripts/modules/kubernetes/src/v1/container/resources.component.js diff --git a/app/scripts/modules/kubernetes/src/container/securityContext/capabilitiesSelector.component.html b/app/scripts/modules/kubernetes/src/v1/container/securityContext/capabilitiesSelector.component.html similarity index 100% rename from app/scripts/modules/kubernetes/src/container/securityContext/capabilitiesSelector.component.html rename to app/scripts/modules/kubernetes/src/v1/container/securityContext/capabilitiesSelector.component.html diff --git a/app/scripts/modules/kubernetes/src/container/securityContext/capabilitiesSelector.component.ts b/app/scripts/modules/kubernetes/src/v1/container/securityContext/capabilitiesSelector.component.ts similarity index 100% rename from app/scripts/modules/kubernetes/src/container/securityContext/capabilitiesSelector.component.ts rename to app/scripts/modules/kubernetes/src/v1/container/securityContext/capabilitiesSelector.component.ts diff --git a/app/scripts/modules/kubernetes/src/container/securityContext/seLinuxOptionsSelector.component.html b/app/scripts/modules/kubernetes/src/v1/container/securityContext/seLinuxOptionsSelector.component.html similarity index 100% rename from app/scripts/modules/kubernetes/src/container/securityContext/seLinuxOptionsSelector.component.html rename to app/scripts/modules/kubernetes/src/v1/container/securityContext/seLinuxOptionsSelector.component.html diff --git a/app/scripts/modules/kubernetes/src/container/securityContext/seLinuxOptionsSelector.component.ts b/app/scripts/modules/kubernetes/src/v1/container/securityContext/seLinuxOptionsSelector.component.ts similarity index 100% rename from app/scripts/modules/kubernetes/src/container/securityContext/seLinuxOptionsSelector.component.ts rename to app/scripts/modules/kubernetes/src/v1/container/securityContext/seLinuxOptionsSelector.component.ts diff --git a/app/scripts/modules/kubernetes/src/container/securityContext/securityContextSelector.component.html b/app/scripts/modules/kubernetes/src/v1/container/securityContext/securityContextSelector.component.html similarity index 100% rename from app/scripts/modules/kubernetes/src/container/securityContext/securityContextSelector.component.html rename to app/scripts/modules/kubernetes/src/v1/container/securityContext/securityContextSelector.component.html diff --git a/app/scripts/modules/kubernetes/src/container/securityContext/securityContextSelector.component.less b/app/scripts/modules/kubernetes/src/v1/container/securityContext/securityContextSelector.component.less similarity index 100% rename from app/scripts/modules/kubernetes/src/container/securityContext/securityContextSelector.component.less rename to app/scripts/modules/kubernetes/src/v1/container/securityContext/securityContextSelector.component.less diff --git a/app/scripts/modules/kubernetes/src/container/securityContext/securityContextSelector.component.ts b/app/scripts/modules/kubernetes/src/v1/container/securityContext/securityContextSelector.component.ts similarity index 100% rename from app/scripts/modules/kubernetes/src/container/securityContext/securityContextSelector.component.ts rename to app/scripts/modules/kubernetes/src/v1/container/securityContext/securityContextSelector.component.ts diff --git a/app/scripts/modules/kubernetes/src/container/volumes.component.html b/app/scripts/modules/kubernetes/src/v1/container/volumes.component.html similarity index 100% rename from app/scripts/modules/kubernetes/src/container/volumes.component.html rename to app/scripts/modules/kubernetes/src/v1/container/volumes.component.html diff --git a/app/scripts/modules/kubernetes/src/container/volumes.component.js b/app/scripts/modules/kubernetes/src/v1/container/volumes.component.js similarity index 100% rename from app/scripts/modules/kubernetes/src/container/volumes.component.js rename to app/scripts/modules/kubernetes/src/v1/container/volumes.component.js diff --git a/app/scripts/modules/kubernetes/src/event/event.directive.html b/app/scripts/modules/kubernetes/src/v1/event/event.directive.html similarity index 100% rename from app/scripts/modules/kubernetes/src/event/event.directive.html rename to app/scripts/modules/kubernetes/src/v1/event/event.directive.html diff --git a/app/scripts/modules/kubernetes/src/event/event.directive.js b/app/scripts/modules/kubernetes/src/v1/event/event.directive.js similarity index 100% rename from app/scripts/modules/kubernetes/src/event/event.directive.js rename to app/scripts/modules/kubernetes/src/v1/event/event.directive.js diff --git a/app/scripts/modules/kubernetes/src/image/image.reader.js b/app/scripts/modules/kubernetes/src/v1/image/image.reader.js similarity index 100% rename from app/scripts/modules/kubernetes/src/image/image.reader.js rename to app/scripts/modules/kubernetes/src/v1/image/image.reader.js diff --git a/app/scripts/modules/kubernetes/src/instance/details/containerDetail.component.ts b/app/scripts/modules/kubernetes/src/v1/instance/details/containerDetail.component.ts similarity index 100% rename from app/scripts/modules/kubernetes/src/instance/details/containerDetail.component.ts rename to app/scripts/modules/kubernetes/src/v1/instance/details/containerDetail.component.ts diff --git a/app/scripts/modules/kubernetes/src/instance/details/details.controller.js b/app/scripts/modules/kubernetes/src/v1/instance/details/details.controller.js similarity index 100% rename from app/scripts/modules/kubernetes/src/instance/details/details.controller.js rename to app/scripts/modules/kubernetes/src/v1/instance/details/details.controller.js diff --git a/app/scripts/modules/kubernetes/src/instance/details/details.html b/app/scripts/modules/kubernetes/src/v1/instance/details/details.html similarity index 100% rename from app/scripts/modules/kubernetes/src/instance/details/details.html rename to app/scripts/modules/kubernetes/src/v1/instance/details/details.html diff --git a/app/scripts/modules/kubernetes/src/instance/details/details.kubernetes.module.js b/app/scripts/modules/kubernetes/src/v1/instance/details/details.kubernetes.module.js similarity index 100% rename from app/scripts/modules/kubernetes/src/instance/details/details.kubernetes.module.js rename to app/scripts/modules/kubernetes/src/v1/instance/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 index 578a4418fd1..3d3c9fce981 100644 --- 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/app/scripts/modules/kubernetes/src/loadBalancer/configure/configure.kubernetes.module.js b/app/scripts/modules/kubernetes/src/v1/loadBalancer/configure/configure.kubernetes.module.js similarity index 100% rename from app/scripts/modules/kubernetes/src/loadBalancer/configure/configure.kubernetes.module.js rename to app/scripts/modules/kubernetes/src/v1/loadBalancer/configure/configure.kubernetes.module.js diff --git a/app/scripts/modules/kubernetes/src/loadBalancer/configure/wizard/advancedSettings.controller.js b/app/scripts/modules/kubernetes/src/v1/loadBalancer/configure/wizard/advancedSettings.controller.js similarity index 100% rename from app/scripts/modules/kubernetes/src/loadBalancer/configure/wizard/advancedSettings.controller.js rename to app/scripts/modules/kubernetes/src/v1/loadBalancer/configure/wizard/advancedSettings.controller.js diff --git a/app/scripts/modules/kubernetes/src/loadBalancer/configure/wizard/advancedSettings.html b/app/scripts/modules/kubernetes/src/v1/loadBalancer/configure/wizard/advancedSettings.html similarity index 100% rename from app/scripts/modules/kubernetes/src/loadBalancer/configure/wizard/advancedSettings.html rename to app/scripts/modules/kubernetes/src/v1/loadBalancer/configure/wizard/advancedSettings.html diff --git a/app/scripts/modules/kubernetes/src/loadBalancer/configure/wizard/basicSettings.html b/app/scripts/modules/kubernetes/src/v1/loadBalancer/configure/wizard/basicSettings.html similarity index 100% rename from app/scripts/modules/kubernetes/src/loadBalancer/configure/wizard/basicSettings.html rename to app/scripts/modules/kubernetes/src/v1/loadBalancer/configure/wizard/basicSettings.html diff --git a/app/scripts/modules/kubernetes/src/loadBalancer/configure/wizard/createWizard.html b/app/scripts/modules/kubernetes/src/v1/loadBalancer/configure/wizard/createWizard.html similarity index 100% rename from app/scripts/modules/kubernetes/src/loadBalancer/configure/wizard/createWizard.html rename to app/scripts/modules/kubernetes/src/v1/loadBalancer/configure/wizard/createWizard.html diff --git a/app/scripts/modules/kubernetes/src/loadBalancer/configure/wizard/editWizard.html b/app/scripts/modules/kubernetes/src/v1/loadBalancer/configure/wizard/editWizard.html similarity index 100% rename from app/scripts/modules/kubernetes/src/loadBalancer/configure/wizard/editWizard.html rename to app/scripts/modules/kubernetes/src/v1/loadBalancer/configure/wizard/editWizard.html diff --git a/app/scripts/modules/kubernetes/src/loadBalancer/configure/wizard/ports.controller.js b/app/scripts/modules/kubernetes/src/v1/loadBalancer/configure/wizard/ports.controller.js similarity index 100% rename from app/scripts/modules/kubernetes/src/loadBalancer/configure/wizard/ports.controller.js rename to app/scripts/modules/kubernetes/src/v1/loadBalancer/configure/wizard/ports.controller.js diff --git a/app/scripts/modules/kubernetes/src/loadBalancer/configure/wizard/ports.html b/app/scripts/modules/kubernetes/src/v1/loadBalancer/configure/wizard/ports.html similarity index 100% rename from app/scripts/modules/kubernetes/src/loadBalancer/configure/wizard/ports.html rename to app/scripts/modules/kubernetes/src/v1/loadBalancer/configure/wizard/ports.html diff --git a/app/scripts/modules/kubernetes/src/loadBalancer/configure/wizard/upsert.controller.js b/app/scripts/modules/kubernetes/src/v1/loadBalancer/configure/wizard/upsert.controller.js similarity index 100% rename from app/scripts/modules/kubernetes/src/loadBalancer/configure/wizard/upsert.controller.js rename to app/scripts/modules/kubernetes/src/v1/loadBalancer/configure/wizard/upsert.controller.js diff --git a/app/scripts/modules/kubernetes/src/loadBalancer/details/details.controller.js b/app/scripts/modules/kubernetes/src/v1/loadBalancer/details/details.controller.js similarity index 100% rename from app/scripts/modules/kubernetes/src/loadBalancer/details/details.controller.js rename to app/scripts/modules/kubernetes/src/v1/loadBalancer/details/details.controller.js diff --git a/app/scripts/modules/kubernetes/src/loadBalancer/details/details.html b/app/scripts/modules/kubernetes/src/v1/loadBalancer/details/details.html similarity index 100% rename from app/scripts/modules/kubernetes/src/loadBalancer/details/details.html rename to app/scripts/modules/kubernetes/src/v1/loadBalancer/details/details.html diff --git a/app/scripts/modules/kubernetes/src/loadBalancer/details/details.kubernetes.module.js b/app/scripts/modules/kubernetes/src/v1/loadBalancer/details/details.kubernetes.module.js similarity index 100% rename from app/scripts/modules/kubernetes/src/loadBalancer/details/details.kubernetes.module.js rename to app/scripts/modules/kubernetes/src/v1/loadBalancer/details/details.kubernetes.module.js diff --git a/app/scripts/modules/kubernetes/src/loadBalancer/transformer.js b/app/scripts/modules/kubernetes/src/v1/loadBalancer/transformer.js similarity index 96% rename from app/scripts/modules/kubernetes/src/loadBalancer/transformer.js rename to app/scripts/modules/kubernetes/src/v1/loadBalancer/transformer.js index cd22969d636..847ff7c7bb9 100644 --- a/app/scripts/modules/kubernetes/src/loadBalancer/transformer.js +++ b/app/scripts/modules/kubernetes/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/app/scripts/modules/kubernetes/src/namespace/multiSelectField.component.html b/app/scripts/modules/kubernetes/src/v1/namespace/multiSelectField.component.html similarity index 100% rename from app/scripts/modules/kubernetes/src/namespace/multiSelectField.component.html rename to app/scripts/modules/kubernetes/src/v1/namespace/multiSelectField.component.html diff --git a/app/scripts/modules/kubernetes/src/namespace/multiSelectField.component.js b/app/scripts/modules/kubernetes/src/v1/namespace/multiSelectField.component.js similarity index 100% rename from app/scripts/modules/kubernetes/src/namespace/multiSelectField.component.js rename to app/scripts/modules/kubernetes/src/v1/namespace/multiSelectField.component.js diff --git a/app/scripts/modules/kubernetes/src/namespace/multiSelectField.directive.html b/app/scripts/modules/kubernetes/src/v1/namespace/multiSelectField.directive.html similarity index 100% rename from app/scripts/modules/kubernetes/src/namespace/multiSelectField.directive.html rename to app/scripts/modules/kubernetes/src/v1/namespace/multiSelectField.directive.html diff --git a/app/scripts/modules/kubernetes/src/namespace/selectField.directive.html b/app/scripts/modules/kubernetes/src/v1/namespace/selectField.directive.html similarity index 100% rename from app/scripts/modules/kubernetes/src/namespace/selectField.directive.html rename to app/scripts/modules/kubernetes/src/v1/namespace/selectField.directive.html diff --git a/app/scripts/modules/kubernetes/src/namespace/selectField.directive.js b/app/scripts/modules/kubernetes/src/v1/namespace/selectField.directive.js similarity index 100% rename from app/scripts/modules/kubernetes/src/namespace/selectField.directive.js rename to app/scripts/modules/kubernetes/src/v1/namespace/selectField.directive.js diff --git a/app/scripts/modules/kubernetes/src/pipeline/stages/destroyAsg/destroyAsgExecutionDetails.html b/app/scripts/modules/kubernetes/src/v1/pipeline/stages/destroyAsg/destroyAsgExecutionDetails.html similarity index 100% rename from app/scripts/modules/kubernetes/src/pipeline/stages/destroyAsg/destroyAsgExecutionDetails.html rename to app/scripts/modules/kubernetes/src/v1/pipeline/stages/destroyAsg/destroyAsgExecutionDetails.html diff --git a/app/scripts/modules/kubernetes/src/pipeline/stages/destroyAsg/destroyAsgStage.html b/app/scripts/modules/kubernetes/src/v1/pipeline/stages/destroyAsg/destroyAsgStage.html similarity index 100% rename from app/scripts/modules/kubernetes/src/pipeline/stages/destroyAsg/destroyAsgStage.html rename to app/scripts/modules/kubernetes/src/v1/pipeline/stages/destroyAsg/destroyAsgStage.html diff --git a/app/scripts/modules/kubernetes/src/pipeline/stages/destroyAsg/destroyAsgStepLabel.html b/app/scripts/modules/kubernetes/src/v1/pipeline/stages/destroyAsg/destroyAsgStepLabel.html similarity index 100% rename from app/scripts/modules/kubernetes/src/pipeline/stages/destroyAsg/destroyAsgStepLabel.html rename to app/scripts/modules/kubernetes/src/v1/pipeline/stages/destroyAsg/destroyAsgStepLabel.html diff --git a/app/scripts/modules/kubernetes/src/pipeline/stages/destroyAsg/kubernetesDestroyAsgStage.js b/app/scripts/modules/kubernetes/src/v1/pipeline/stages/destroyAsg/kubernetesDestroyAsgStage.js similarity index 100% rename from app/scripts/modules/kubernetes/src/pipeline/stages/destroyAsg/kubernetesDestroyAsgStage.js rename to app/scripts/modules/kubernetes/src/v1/pipeline/stages/destroyAsg/kubernetesDestroyAsgStage.js diff --git a/app/scripts/modules/kubernetes/src/pipeline/stages/disableAsg/disableAsgExecutionDetails.html b/app/scripts/modules/kubernetes/src/v1/pipeline/stages/disableAsg/disableAsgExecutionDetails.html similarity index 100% rename from app/scripts/modules/kubernetes/src/pipeline/stages/disableAsg/disableAsgExecutionDetails.html rename to app/scripts/modules/kubernetes/src/v1/pipeline/stages/disableAsg/disableAsgExecutionDetails.html diff --git a/app/scripts/modules/kubernetes/src/pipeline/stages/disableAsg/disableAsgStage.html b/app/scripts/modules/kubernetes/src/v1/pipeline/stages/disableAsg/disableAsgStage.html similarity index 100% rename from app/scripts/modules/kubernetes/src/pipeline/stages/disableAsg/disableAsgStage.html rename to app/scripts/modules/kubernetes/src/v1/pipeline/stages/disableAsg/disableAsgStage.html diff --git a/app/scripts/modules/kubernetes/src/pipeline/stages/disableAsg/disableAsgStepLabel.html b/app/scripts/modules/kubernetes/src/v1/pipeline/stages/disableAsg/disableAsgStepLabel.html similarity index 100% rename from app/scripts/modules/kubernetes/src/pipeline/stages/disableAsg/disableAsgStepLabel.html rename to app/scripts/modules/kubernetes/src/v1/pipeline/stages/disableAsg/disableAsgStepLabel.html diff --git a/app/scripts/modules/kubernetes/src/pipeline/stages/disableAsg/kubernetesDisableAsgStage.js b/app/scripts/modules/kubernetes/src/v1/pipeline/stages/disableAsg/kubernetesDisableAsgStage.js similarity index 100% rename from app/scripts/modules/kubernetes/src/pipeline/stages/disableAsg/kubernetesDisableAsgStage.js rename to app/scripts/modules/kubernetes/src/v1/pipeline/stages/disableAsg/kubernetesDisableAsgStage.js diff --git a/app/scripts/modules/kubernetes/src/pipeline/stages/disableCluster/disableClusterExecutionDetails.html b/app/scripts/modules/kubernetes/src/v1/pipeline/stages/disableCluster/disableClusterExecutionDetails.html similarity index 100% rename from app/scripts/modules/kubernetes/src/pipeline/stages/disableCluster/disableClusterExecutionDetails.html rename to app/scripts/modules/kubernetes/src/v1/pipeline/stages/disableCluster/disableClusterExecutionDetails.html diff --git a/app/scripts/modules/kubernetes/src/pipeline/stages/disableCluster/disableClusterStage.html b/app/scripts/modules/kubernetes/src/v1/pipeline/stages/disableCluster/disableClusterStage.html similarity index 100% rename from app/scripts/modules/kubernetes/src/pipeline/stages/disableCluster/disableClusterStage.html rename to app/scripts/modules/kubernetes/src/v1/pipeline/stages/disableCluster/disableClusterStage.html diff --git a/app/scripts/modules/kubernetes/src/pipeline/stages/disableCluster/kubernetesDisableClusterStage.js b/app/scripts/modules/kubernetes/src/v1/pipeline/stages/disableCluster/kubernetesDisableClusterStage.js similarity index 100% rename from app/scripts/modules/kubernetes/src/pipeline/stages/disableCluster/kubernetesDisableClusterStage.js rename to app/scripts/modules/kubernetes/src/v1/pipeline/stages/disableCluster/kubernetesDisableClusterStage.js diff --git a/app/scripts/modules/kubernetes/src/pipeline/stages/enableAsg/enableAsgExecutionDetails.html b/app/scripts/modules/kubernetes/src/v1/pipeline/stages/enableAsg/enableAsgExecutionDetails.html similarity index 100% rename from app/scripts/modules/kubernetes/src/pipeline/stages/enableAsg/enableAsgExecutionDetails.html rename to app/scripts/modules/kubernetes/src/v1/pipeline/stages/enableAsg/enableAsgExecutionDetails.html diff --git a/app/scripts/modules/kubernetes/src/pipeline/stages/enableAsg/enableAsgStage.html b/app/scripts/modules/kubernetes/src/v1/pipeline/stages/enableAsg/enableAsgStage.html similarity index 100% rename from app/scripts/modules/kubernetes/src/pipeline/stages/enableAsg/enableAsgStage.html rename to app/scripts/modules/kubernetes/src/v1/pipeline/stages/enableAsg/enableAsgStage.html diff --git a/app/scripts/modules/kubernetes/src/pipeline/stages/enableAsg/enableAsgStepLabel.html b/app/scripts/modules/kubernetes/src/v1/pipeline/stages/enableAsg/enableAsgStepLabel.html similarity index 100% rename from app/scripts/modules/kubernetes/src/pipeline/stages/enableAsg/enableAsgStepLabel.html rename to app/scripts/modules/kubernetes/src/v1/pipeline/stages/enableAsg/enableAsgStepLabel.html diff --git a/app/scripts/modules/kubernetes/src/pipeline/stages/enableAsg/kubernetesEnableAsgStage.js b/app/scripts/modules/kubernetes/src/v1/pipeline/stages/enableAsg/kubernetesEnableAsgStage.js similarity index 100% rename from app/scripts/modules/kubernetes/src/pipeline/stages/enableAsg/kubernetesEnableAsgStage.js rename to app/scripts/modules/kubernetes/src/v1/pipeline/stages/enableAsg/kubernetesEnableAsgStage.js diff --git a/app/scripts/modules/kubernetes/src/pipeline/stages/findAmi/findAmiExecutionDetails.html b/app/scripts/modules/kubernetes/src/v1/pipeline/stages/findAmi/findAmiExecutionDetails.html similarity index 100% rename from app/scripts/modules/kubernetes/src/pipeline/stages/findAmi/findAmiExecutionDetails.html rename to app/scripts/modules/kubernetes/src/v1/pipeline/stages/findAmi/findAmiExecutionDetails.html diff --git a/app/scripts/modules/kubernetes/src/pipeline/stages/findAmi/findAmiStage.html b/app/scripts/modules/kubernetes/src/v1/pipeline/stages/findAmi/findAmiStage.html similarity index 100% rename from app/scripts/modules/kubernetes/src/pipeline/stages/findAmi/findAmiStage.html rename to app/scripts/modules/kubernetes/src/v1/pipeline/stages/findAmi/findAmiStage.html diff --git a/app/scripts/modules/kubernetes/src/pipeline/stages/findAmi/kubernetesFindAmiStage.js b/app/scripts/modules/kubernetes/src/v1/pipeline/stages/findAmi/kubernetesFindAmiStage.js similarity index 100% rename from app/scripts/modules/kubernetes/src/pipeline/stages/findAmi/kubernetesFindAmiStage.js rename to app/scripts/modules/kubernetes/src/v1/pipeline/stages/findAmi/kubernetesFindAmiStage.js diff --git a/app/scripts/modules/kubernetes/src/pipeline/stages/resizeAsg/resizeExecutionDetails.html b/app/scripts/modules/kubernetes/src/v1/pipeline/stages/resizeAsg/resizeExecutionDetails.html similarity index 100% rename from app/scripts/modules/kubernetes/src/pipeline/stages/resizeAsg/resizeExecutionDetails.html rename to app/scripts/modules/kubernetes/src/v1/pipeline/stages/resizeAsg/resizeExecutionDetails.html diff --git a/app/scripts/modules/kubernetes/src/pipeline/stages/resizeAsg/resizeStage.html b/app/scripts/modules/kubernetes/src/v1/pipeline/stages/resizeAsg/resizeStage.html similarity index 100% rename from app/scripts/modules/kubernetes/src/pipeline/stages/resizeAsg/resizeStage.html rename to app/scripts/modules/kubernetes/src/v1/pipeline/stages/resizeAsg/resizeStage.html diff --git a/app/scripts/modules/kubernetes/src/pipeline/stages/resizeAsg/resizeStage.js b/app/scripts/modules/kubernetes/src/v1/pipeline/stages/resizeAsg/resizeStage.js similarity index 100% rename from app/scripts/modules/kubernetes/src/pipeline/stages/resizeAsg/resizeStage.js rename to app/scripts/modules/kubernetes/src/v1/pipeline/stages/resizeAsg/resizeStage.js diff --git a/app/scripts/modules/kubernetes/src/pipeline/stages/resizeAsg/resizeStage.less b/app/scripts/modules/kubernetes/src/v1/pipeline/stages/resizeAsg/resizeStage.less similarity index 100% rename from app/scripts/modules/kubernetes/src/pipeline/stages/resizeAsg/resizeStage.less rename to app/scripts/modules/kubernetes/src/v1/pipeline/stages/resizeAsg/resizeStage.less diff --git a/app/scripts/modules/kubernetes/src/pipeline/stages/resizeAsg/resizeStepLabel.html b/app/scripts/modules/kubernetes/src/v1/pipeline/stages/resizeAsg/resizeStepLabel.html similarity index 100% rename from app/scripts/modules/kubernetes/src/pipeline/stages/resizeAsg/resizeStepLabel.html rename to app/scripts/modules/kubernetes/src/v1/pipeline/stages/resizeAsg/resizeStepLabel.html diff --git a/app/scripts/modules/kubernetes/src/pipeline/stages/runJob/configureJob.controller.js b/app/scripts/modules/kubernetes/src/v1/pipeline/stages/runJob/configureJob.controller.js similarity index 91% rename from app/scripts/modules/kubernetes/src/pipeline/stages/runJob/configureJob.controller.js rename to app/scripts/modules/kubernetes/src/v1/pipeline/stages/runJob/configureJob.controller.js index 14f3f74d471..6f342926ff0 100644 --- a/app/scripts/modules/kubernetes/src/pipeline/stages/runJob/configureJob.controller.js +++ b/app/scripts/modules/kubernetes/src/v1/pipeline/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/app/scripts/modules/kubernetes/src/pipeline/stages/runJob/configureJob.html b/app/scripts/modules/kubernetes/src/v1/pipeline/stages/runJob/configureJob.html similarity index 100% rename from app/scripts/modules/kubernetes/src/pipeline/stages/runJob/configureJob.html rename to app/scripts/modules/kubernetes/src/v1/pipeline/stages/runJob/configureJob.html diff --git a/app/scripts/modules/kubernetes/src/pipeline/stages/runJob/runJobExecutionDetails.controller.js b/app/scripts/modules/kubernetes/src/v1/pipeline/stages/runJob/runJobExecutionDetails.controller.js similarity index 100% rename from app/scripts/modules/kubernetes/src/pipeline/stages/runJob/runJobExecutionDetails.controller.js rename to app/scripts/modules/kubernetes/src/v1/pipeline/stages/runJob/runJobExecutionDetails.controller.js diff --git a/app/scripts/modules/kubernetes/src/pipeline/stages/runJob/runJobExecutionDetails.html b/app/scripts/modules/kubernetes/src/v1/pipeline/stages/runJob/runJobExecutionDetails.html similarity index 100% rename from app/scripts/modules/kubernetes/src/pipeline/stages/runJob/runJobExecutionDetails.html rename to app/scripts/modules/kubernetes/src/v1/pipeline/stages/runJob/runJobExecutionDetails.html diff --git a/app/scripts/modules/kubernetes/src/pipeline/stages/runJob/runJobLogs.html b/app/scripts/modules/kubernetes/src/v1/pipeline/stages/runJob/runJobLogs.html similarity index 100% rename from app/scripts/modules/kubernetes/src/pipeline/stages/runJob/runJobLogs.html rename to app/scripts/modules/kubernetes/src/v1/pipeline/stages/runJob/runJobLogs.html diff --git a/app/scripts/modules/kubernetes/src/pipeline/stages/runJob/runJobStage.html b/app/scripts/modules/kubernetes/src/v1/pipeline/stages/runJob/runJobStage.html similarity index 100% rename from app/scripts/modules/kubernetes/src/pipeline/stages/runJob/runJobStage.html rename to app/scripts/modules/kubernetes/src/v1/pipeline/stages/runJob/runJobStage.html diff --git a/app/scripts/modules/kubernetes/src/pipeline/stages/runJob/runJobStage.js b/app/scripts/modules/kubernetes/src/v1/pipeline/stages/runJob/runJobStage.js similarity index 81% rename from app/scripts/modules/kubernetes/src/pipeline/stages/runJob/runJobStage.js rename to app/scripts/modules/kubernetes/src/v1/pipeline/stages/runJob/runJobStage.js index 0a160aff049..255f06c0fbe 100644 --- a/app/scripts/modules/kubernetes/src/pipeline/stages/runJob/runJobStage.js +++ b/app/scripts/modules/kubernetes/src/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/app/scripts/modules/kubernetes/src/pipeline/stages/scaleDownCluster/scaleDownClusterExecutionDetails.html b/app/scripts/modules/kubernetes/src/v1/pipeline/stages/scaleDownCluster/scaleDownClusterExecutionDetails.html similarity index 100% rename from app/scripts/modules/kubernetes/src/pipeline/stages/scaleDownCluster/scaleDownClusterExecutionDetails.html rename to app/scripts/modules/kubernetes/src/v1/pipeline/stages/scaleDownCluster/scaleDownClusterExecutionDetails.html diff --git a/app/scripts/modules/kubernetes/src/pipeline/stages/scaleDownCluster/scaleDownClusterStage.html b/app/scripts/modules/kubernetes/src/v1/pipeline/stages/scaleDownCluster/scaleDownClusterStage.html similarity index 100% rename from app/scripts/modules/kubernetes/src/pipeline/stages/scaleDownCluster/scaleDownClusterStage.html rename to app/scripts/modules/kubernetes/src/v1/pipeline/stages/scaleDownCluster/scaleDownClusterStage.html diff --git a/app/scripts/modules/kubernetes/src/pipeline/stages/scaleDownCluster/scaleDownClusterStage.js b/app/scripts/modules/kubernetes/src/v1/pipeline/stages/scaleDownCluster/scaleDownClusterStage.js similarity index 100% rename from app/scripts/modules/kubernetes/src/pipeline/stages/scaleDownCluster/scaleDownClusterStage.js rename to app/scripts/modules/kubernetes/src/v1/pipeline/stages/scaleDownCluster/scaleDownClusterStage.js diff --git a/app/scripts/modules/kubernetes/src/pipeline/stages/shrinkCluster/shrinkClusterExecutionDetails.html b/app/scripts/modules/kubernetes/src/v1/pipeline/stages/shrinkCluster/shrinkClusterExecutionDetails.html similarity index 100% rename from app/scripts/modules/kubernetes/src/pipeline/stages/shrinkCluster/shrinkClusterExecutionDetails.html rename to app/scripts/modules/kubernetes/src/v1/pipeline/stages/shrinkCluster/shrinkClusterExecutionDetails.html diff --git a/app/scripts/modules/kubernetes/src/pipeline/stages/shrinkCluster/shrinkClusterStage.html b/app/scripts/modules/kubernetes/src/v1/pipeline/stages/shrinkCluster/shrinkClusterStage.html similarity index 100% rename from app/scripts/modules/kubernetes/src/pipeline/stages/shrinkCluster/shrinkClusterStage.html rename to app/scripts/modules/kubernetes/src/v1/pipeline/stages/shrinkCluster/shrinkClusterStage.html diff --git a/app/scripts/modules/kubernetes/src/pipeline/stages/shrinkCluster/shrinkClusterStage.js b/app/scripts/modules/kubernetes/src/v1/pipeline/stages/shrinkCluster/shrinkClusterStage.js similarity index 100% rename from app/scripts/modules/kubernetes/src/pipeline/stages/shrinkCluster/shrinkClusterStage.js rename to app/scripts/modules/kubernetes/src/v1/pipeline/stages/shrinkCluster/shrinkClusterStage.js diff --git a/app/scripts/modules/kubernetes/src/presentation/imageId.filter.ts b/app/scripts/modules/kubernetes/src/v1/presentation/imageId.filter.ts similarity index 100% rename from app/scripts/modules/kubernetes/src/presentation/imageId.filter.ts rename to app/scripts/modules/kubernetes/src/v1/presentation/imageId.filter.ts diff --git a/app/scripts/modules/kubernetes/src/proxy/ui.service.js b/app/scripts/modules/kubernetes/src/v1/proxy/ui.service.js similarity index 95% rename from app/scripts/modules/kubernetes/src/proxy/ui.service.js rename to app/scripts/modules/kubernetes/src/v1/proxy/ui.service.js index 001f6c8b2c0..8ea63dbe493 100644 --- a/app/scripts/modules/kubernetes/src/proxy/ui.service.js +++ b/app/scripts/modules/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/app/scripts/modules/kubernetes/src/search/resultFormatter.js b/app/scripts/modules/kubernetes/src/v1/search/resultFormatter.js similarity index 100% rename from app/scripts/modules/kubernetes/src/search/resultFormatter.js rename to app/scripts/modules/kubernetes/src/v1/search/resultFormatter.js diff --git a/app/scripts/modules/kubernetes/src/securityGroup/configure/configure.kubernetes.module.js b/app/scripts/modules/kubernetes/src/v1/securityGroup/configure/configure.kubernetes.module.js similarity index 100% rename from app/scripts/modules/kubernetes/src/securityGroup/configure/configure.kubernetes.module.js rename to app/scripts/modules/kubernetes/src/v1/securityGroup/configure/configure.kubernetes.module.js diff --git a/app/scripts/modules/kubernetes/src/securityGroup/configure/wizard/advancedSettings.html b/app/scripts/modules/kubernetes/src/v1/securityGroup/configure/wizard/advancedSettings.html similarity index 100% rename from app/scripts/modules/kubernetes/src/securityGroup/configure/wizard/advancedSettings.html rename to app/scripts/modules/kubernetes/src/v1/securityGroup/configure/wizard/advancedSettings.html diff --git a/app/scripts/modules/kubernetes/src/securityGroup/configure/wizard/backend.controller.js b/app/scripts/modules/kubernetes/src/v1/securityGroup/configure/wizard/backend.controller.js similarity index 100% rename from app/scripts/modules/kubernetes/src/securityGroup/configure/wizard/backend.controller.js rename to app/scripts/modules/kubernetes/src/v1/securityGroup/configure/wizard/backend.controller.js diff --git a/app/scripts/modules/kubernetes/src/securityGroup/configure/wizard/backend.html b/app/scripts/modules/kubernetes/src/v1/securityGroup/configure/wizard/backend.html similarity index 100% rename from app/scripts/modules/kubernetes/src/securityGroup/configure/wizard/backend.html rename to app/scripts/modules/kubernetes/src/v1/securityGroup/configure/wizard/backend.html diff --git a/app/scripts/modules/kubernetes/src/securityGroup/configure/wizard/basicSettings.html b/app/scripts/modules/kubernetes/src/v1/securityGroup/configure/wizard/basicSettings.html similarity index 100% rename from app/scripts/modules/kubernetes/src/securityGroup/configure/wizard/basicSettings.html rename to app/scripts/modules/kubernetes/src/v1/securityGroup/configure/wizard/basicSettings.html diff --git a/app/scripts/modules/kubernetes/src/securityGroup/configure/wizard/createWizard.html b/app/scripts/modules/kubernetes/src/v1/securityGroup/configure/wizard/createWizard.html similarity index 100% rename from app/scripts/modules/kubernetes/src/securityGroup/configure/wizard/createWizard.html rename to app/scripts/modules/kubernetes/src/v1/securityGroup/configure/wizard/createWizard.html diff --git a/app/scripts/modules/kubernetes/src/securityGroup/configure/wizard/editWizard.html b/app/scripts/modules/kubernetes/src/v1/securityGroup/configure/wizard/editWizard.html similarity index 100% rename from app/scripts/modules/kubernetes/src/securityGroup/configure/wizard/editWizard.html rename to app/scripts/modules/kubernetes/src/v1/securityGroup/configure/wizard/editWizard.html diff --git a/app/scripts/modules/kubernetes/src/securityGroup/configure/wizard/rules.controller.js b/app/scripts/modules/kubernetes/src/v1/securityGroup/configure/wizard/rules.controller.js similarity index 100% rename from app/scripts/modules/kubernetes/src/securityGroup/configure/wizard/rules.controller.js rename to app/scripts/modules/kubernetes/src/v1/securityGroup/configure/wizard/rules.controller.js diff --git a/app/scripts/modules/kubernetes/src/securityGroup/configure/wizard/rules.html b/app/scripts/modules/kubernetes/src/v1/securityGroup/configure/wizard/rules.html similarity index 100% rename from app/scripts/modules/kubernetes/src/securityGroup/configure/wizard/rules.html rename to app/scripts/modules/kubernetes/src/v1/securityGroup/configure/wizard/rules.html diff --git a/app/scripts/modules/kubernetes/src/securityGroup/configure/wizard/tls.controller.js b/app/scripts/modules/kubernetes/src/v1/securityGroup/configure/wizard/tls.controller.js similarity index 100% rename from app/scripts/modules/kubernetes/src/securityGroup/configure/wizard/tls.controller.js rename to app/scripts/modules/kubernetes/src/v1/securityGroup/configure/wizard/tls.controller.js diff --git a/app/scripts/modules/kubernetes/src/securityGroup/configure/wizard/tls.html b/app/scripts/modules/kubernetes/src/v1/securityGroup/configure/wizard/tls.html similarity index 100% rename from app/scripts/modules/kubernetes/src/securityGroup/configure/wizard/tls.html rename to app/scripts/modules/kubernetes/src/v1/securityGroup/configure/wizard/tls.html diff --git a/app/scripts/modules/kubernetes/src/securityGroup/configure/wizard/upsert.controller.js b/app/scripts/modules/kubernetes/src/v1/securityGroup/configure/wizard/upsert.controller.js similarity index 100% rename from app/scripts/modules/kubernetes/src/securityGroup/configure/wizard/upsert.controller.js rename to app/scripts/modules/kubernetes/src/v1/securityGroup/configure/wizard/upsert.controller.js diff --git a/app/scripts/modules/kubernetes/src/securityGroup/details/details.controller.js b/app/scripts/modules/kubernetes/src/v1/securityGroup/details/details.controller.js similarity index 100% rename from app/scripts/modules/kubernetes/src/securityGroup/details/details.controller.js rename to app/scripts/modules/kubernetes/src/v1/securityGroup/details/details.controller.js diff --git a/app/scripts/modules/kubernetes/src/securityGroup/details/details.html b/app/scripts/modules/kubernetes/src/v1/securityGroup/details/details.html similarity index 100% rename from app/scripts/modules/kubernetes/src/securityGroup/details/details.html rename to app/scripts/modules/kubernetes/src/v1/securityGroup/details/details.html diff --git a/app/scripts/modules/kubernetes/src/securityGroup/details/details.kubernetes.module.js b/app/scripts/modules/kubernetes/src/v1/securityGroup/details/details.kubernetes.module.js similarity index 100% rename from app/scripts/modules/kubernetes/src/securityGroup/details/details.kubernetes.module.js rename to app/scripts/modules/kubernetes/src/v1/securityGroup/details/details.kubernetes.module.js diff --git a/app/scripts/modules/kubernetes/src/securityGroup/transformer.js b/app/scripts/modules/kubernetes/src/v1/securityGroup/transformer.js similarity index 95% rename from app/scripts/modules/kubernetes/src/securityGroup/transformer.js rename to app/scripts/modules/kubernetes/src/v1/securityGroup/transformer.js index a15444a7e21..4f5f74e2bbd 100644 --- a/app/scripts/modules/kubernetes/src/securityGroup/transformer.js +++ b/app/scripts/modules/kubernetes/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/app/scripts/modules/kubernetes/src/serverGroup/artifactExtractor.ts b/app/scripts/modules/kubernetes/src/v1/serverGroup/artifactExtractor.ts similarity index 100% rename from app/scripts/modules/kubernetes/src/serverGroup/artifactExtractor.ts rename to app/scripts/modules/kubernetes/src/v1/serverGroup/artifactExtractor.ts diff --git a/app/scripts/modules/kubernetes/src/serverGroup/configure/CommandBuilder.js b/app/scripts/modules/kubernetes/src/v1/serverGroup/configure/CommandBuilder.js similarity index 100% rename from app/scripts/modules/kubernetes/src/serverGroup/configure/CommandBuilder.js rename to app/scripts/modules/kubernetes/src/v1/serverGroup/configure/CommandBuilder.js diff --git a/app/scripts/modules/kubernetes/src/serverGroup/configure/configuration.service.js b/app/scripts/modules/kubernetes/src/v1/serverGroup/configure/configuration.service.js similarity index 100% rename from app/scripts/modules/kubernetes/src/serverGroup/configure/configuration.service.js rename to app/scripts/modules/kubernetes/src/v1/serverGroup/configure/configuration.service.js diff --git a/app/scripts/modules/kubernetes/src/serverGroup/configure/configure.kubernetes.module.js b/app/scripts/modules/kubernetes/src/v1/serverGroup/configure/configure.kubernetes.module.js similarity index 100% rename from app/scripts/modules/kubernetes/src/serverGroup/configure/configure.kubernetes.module.js rename to app/scripts/modules/kubernetes/src/v1/serverGroup/configure/configure.kubernetes.module.js diff --git a/app/scripts/modules/kubernetes/src/serverGroup/configure/wizard/BasicSettings.controller.js b/app/scripts/modules/kubernetes/src/v1/serverGroup/configure/wizard/BasicSettings.controller.js similarity index 100% rename from app/scripts/modules/kubernetes/src/serverGroup/configure/wizard/BasicSettings.controller.js rename to app/scripts/modules/kubernetes/src/v1/serverGroup/configure/wizard/BasicSettings.controller.js diff --git a/app/scripts/modules/kubernetes/src/serverGroup/configure/wizard/Clone.controller.js b/app/scripts/modules/kubernetes/src/v1/serverGroup/configure/wizard/Clone.controller.js similarity index 100% rename from app/scripts/modules/kubernetes/src/serverGroup/configure/wizard/Clone.controller.js rename to app/scripts/modules/kubernetes/src/v1/serverGroup/configure/wizard/Clone.controller.js diff --git a/app/scripts/modules/kubernetes/src/serverGroup/configure/wizard/advancedSettings.controller.js b/app/scripts/modules/kubernetes/src/v1/serverGroup/configure/wizard/advancedSettings.controller.js similarity index 100% rename from app/scripts/modules/kubernetes/src/serverGroup/configure/wizard/advancedSettings.controller.js rename to app/scripts/modules/kubernetes/src/v1/serverGroup/configure/wizard/advancedSettings.controller.js diff --git a/app/scripts/modules/kubernetes/src/serverGroup/configure/wizard/advancedSettings.html b/app/scripts/modules/kubernetes/src/v1/serverGroup/configure/wizard/advancedSettings.html similarity index 100% rename from app/scripts/modules/kubernetes/src/serverGroup/configure/wizard/advancedSettings.html rename to app/scripts/modules/kubernetes/src/v1/serverGroup/configure/wizard/advancedSettings.html diff --git a/app/scripts/modules/kubernetes/src/serverGroup/configure/wizard/basicSettings.html b/app/scripts/modules/kubernetes/src/v1/serverGroup/configure/wizard/basicSettings.html similarity index 100% rename from app/scripts/modules/kubernetes/src/serverGroup/configure/wizard/basicSettings.html rename to app/scripts/modules/kubernetes/src/v1/serverGroup/configure/wizard/basicSettings.html diff --git a/app/scripts/modules/kubernetes/src/serverGroup/configure/wizard/deployment.controller.js b/app/scripts/modules/kubernetes/src/v1/serverGroup/configure/wizard/deployment.controller.js similarity index 100% rename from app/scripts/modules/kubernetes/src/serverGroup/configure/wizard/deployment.controller.js rename to app/scripts/modules/kubernetes/src/v1/serverGroup/configure/wizard/deployment.controller.js diff --git a/app/scripts/modules/kubernetes/src/serverGroup/configure/wizard/deployment.html b/app/scripts/modules/kubernetes/src/v1/serverGroup/configure/wizard/deployment.html similarity index 100% rename from app/scripts/modules/kubernetes/src/serverGroup/configure/wizard/deployment.html rename to app/scripts/modules/kubernetes/src/v1/serverGroup/configure/wizard/deployment.html diff --git a/app/scripts/modules/kubernetes/src/serverGroup/configure/wizard/loadBalancers.controller.js b/app/scripts/modules/kubernetes/src/v1/serverGroup/configure/wizard/loadBalancers.controller.js similarity index 100% rename from app/scripts/modules/kubernetes/src/serverGroup/configure/wizard/loadBalancers.controller.js rename to app/scripts/modules/kubernetes/src/v1/serverGroup/configure/wizard/loadBalancers.controller.js diff --git a/app/scripts/modules/kubernetes/src/serverGroup/configure/wizard/loadBalancers.html b/app/scripts/modules/kubernetes/src/v1/serverGroup/configure/wizard/loadBalancers.html similarity index 100% rename from app/scripts/modules/kubernetes/src/serverGroup/configure/wizard/loadBalancers.html rename to app/scripts/modules/kubernetes/src/v1/serverGroup/configure/wizard/loadBalancers.html diff --git a/app/scripts/modules/kubernetes/src/serverGroup/configure/wizard/replicas.html b/app/scripts/modules/kubernetes/src/v1/serverGroup/configure/wizard/replicas.html similarity index 100% rename from app/scripts/modules/kubernetes/src/serverGroup/configure/wizard/replicas.html rename to app/scripts/modules/kubernetes/src/v1/serverGroup/configure/wizard/replicas.html diff --git a/app/scripts/modules/kubernetes/src/serverGroup/configure/wizard/templateSelection.html b/app/scripts/modules/kubernetes/src/v1/serverGroup/configure/wizard/templateSelection.html similarity index 100% rename from app/scripts/modules/kubernetes/src/serverGroup/configure/wizard/templateSelection.html rename to app/scripts/modules/kubernetes/src/v1/serverGroup/configure/wizard/templateSelection.html diff --git a/app/scripts/modules/kubernetes/src/serverGroup/configure/wizard/volumes.controller.js b/app/scripts/modules/kubernetes/src/v1/serverGroup/configure/wizard/volumes.controller.js similarity index 100% rename from app/scripts/modules/kubernetes/src/serverGroup/configure/wizard/volumes.controller.js rename to app/scripts/modules/kubernetes/src/v1/serverGroup/configure/wizard/volumes.controller.js diff --git a/app/scripts/modules/kubernetes/src/serverGroup/configure/wizard/volumes.html b/app/scripts/modules/kubernetes/src/v1/serverGroup/configure/wizard/volumes.html similarity index 100% rename from app/scripts/modules/kubernetes/src/serverGroup/configure/wizard/volumes.html rename to app/scripts/modules/kubernetes/src/v1/serverGroup/configure/wizard/volumes.html diff --git a/app/scripts/modules/kubernetes/src/serverGroup/configure/wizard/wizard.html b/app/scripts/modules/kubernetes/src/v1/serverGroup/configure/wizard/wizard.html similarity index 100% rename from app/scripts/modules/kubernetes/src/serverGroup/configure/wizard/wizard.html rename to app/scripts/modules/kubernetes/src/v1/serverGroup/configure/wizard/wizard.html diff --git a/app/scripts/modules/kubernetes/src/serverGroup/details/containerDetail.component.ts b/app/scripts/modules/kubernetes/src/v1/serverGroup/details/containerDetail.component.ts similarity index 100% rename from app/scripts/modules/kubernetes/src/serverGroup/details/containerDetail.component.ts rename to app/scripts/modules/kubernetes/src/v1/serverGroup/details/containerDetail.component.ts diff --git a/app/scripts/modules/kubernetes/src/serverGroup/details/details.controller.js b/app/scripts/modules/kubernetes/src/v1/serverGroup/details/details.controller.js similarity index 100% rename from app/scripts/modules/kubernetes/src/serverGroup/details/details.controller.js rename to app/scripts/modules/kubernetes/src/v1/serverGroup/details/details.controller.js diff --git a/app/scripts/modules/kubernetes/src/serverGroup/details/details.html b/app/scripts/modules/kubernetes/src/v1/serverGroup/details/details.html similarity index 100% rename from app/scripts/modules/kubernetes/src/serverGroup/details/details.html rename to app/scripts/modules/kubernetes/src/v1/serverGroup/details/details.html diff --git a/app/scripts/modules/kubernetes/src/serverGroup/details/details.kubernetes.module.js b/app/scripts/modules/kubernetes/src/v1/serverGroup/details/details.kubernetes.module.js similarity index 100% rename from app/scripts/modules/kubernetes/src/serverGroup/details/details.kubernetes.module.js rename to app/scripts/modules/kubernetes/src/v1/serverGroup/details/details.kubernetes.module.js diff --git a/app/scripts/modules/kubernetes/src/serverGroup/details/lifecycleHookDetails.component.ts b/app/scripts/modules/kubernetes/src/v1/serverGroup/details/lifecycleHookDetails.component.ts similarity index 100% rename from app/scripts/modules/kubernetes/src/serverGroup/details/lifecycleHookDetails.component.ts rename to app/scripts/modules/kubernetes/src/v1/serverGroup/details/lifecycleHookDetails.component.ts diff --git a/app/scripts/modules/kubernetes/src/serverGroup/details/resize/resize.controller.js b/app/scripts/modules/kubernetes/src/v1/serverGroup/details/resize/resize.controller.js similarity index 100% rename from app/scripts/modules/kubernetes/src/serverGroup/details/resize/resize.controller.js rename to app/scripts/modules/kubernetes/src/v1/serverGroup/details/resize/resize.controller.js diff --git a/app/scripts/modules/kubernetes/src/serverGroup/details/resize/resize.html b/app/scripts/modules/kubernetes/src/v1/serverGroup/details/resize/resize.html similarity index 100% rename from app/scripts/modules/kubernetes/src/serverGroup/details/resize/resize.html rename to app/scripts/modules/kubernetes/src/v1/serverGroup/details/resize/resize.html diff --git a/app/scripts/modules/kubernetes/src/serverGroup/details/rollback/rollback.controller.js b/app/scripts/modules/kubernetes/src/v1/serverGroup/details/rollback/rollback.controller.js similarity index 100% rename from app/scripts/modules/kubernetes/src/serverGroup/details/rollback/rollback.controller.js rename to app/scripts/modules/kubernetes/src/v1/serverGroup/details/rollback/rollback.controller.js diff --git a/app/scripts/modules/kubernetes/src/serverGroup/details/rollback/rollback.html b/app/scripts/modules/kubernetes/src/v1/serverGroup/details/rollback/rollback.html similarity index 100% rename from app/scripts/modules/kubernetes/src/serverGroup/details/rollback/rollback.html rename to app/scripts/modules/kubernetes/src/v1/serverGroup/details/rollback/rollback.html diff --git a/app/scripts/modules/kubernetes/src/serverGroup/paramsMixin.js b/app/scripts/modules/kubernetes/src/v1/serverGroup/paramsMixin.js similarity index 100% rename from app/scripts/modules/kubernetes/src/serverGroup/paramsMixin.js rename to app/scripts/modules/kubernetes/src/v1/serverGroup/paramsMixin.js diff --git a/app/scripts/modules/kubernetes/src/serverGroup/transformer.js b/app/scripts/modules/kubernetes/src/v1/serverGroup/transformer.js similarity index 100% rename from app/scripts/modules/kubernetes/src/serverGroup/transformer.js rename to app/scripts/modules/kubernetes/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 index 293c83b6e1d..f9790d72c0f 100644 --- 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'),