Butler operator hooks

butler/.dockerignore

@@ -0,0 +1,2 @@
+node_modules
+dist

butler/Dockerfile

@@ -1,9 +1,5 @@
 FROM node:12.17.0-alpine3.9
 
-ENV NODE_ENV qa
-
-ENV CONSUL_HOST consul-server
-
 ENV APP_PATH /opt/darwin-deploy
 
 RUN apk upgrade --update-cache --available && \
@@ -16,10 +12,11 @@ RUN helm version
 
 RUN mkdir -p $APP_PATH
 WORKDIR $APP_PATH
+COPY . $APP_PATH
 
-ADD package.json $APP_PATH
-RUN npm install
+RUN npm ci
+RUN npm run build
 
-ADD ./dist $APP_PATH
+ENV NODE_OPTIONS --enable-source-maps
 
-ENTRYPOINT node main.js
+ENTRYPOINT node dist/main.js

butler/doc/adr/0001-operator-architecture.md

@@ -40,14 +40,26 @@ spec:
 
 Routes example
 ```yaml
-api: k8s.charles.io
+apiVersion: charlescd.io/v1
 kind: CharlesRoutes
+metadata:
+  name: default-routes
 spec:
   circles:
-    - id: <id-circle>
+    - id: first-circle
+      default: true
+      components:
+        - name: quiz-app-backend
+          tag: v1
+        - name: quiz-app-frontend
+          tag: v1
+    - id: second-circle
+      default: false
       components:
-      - quiz-app-backend
-      - quiz-app-frontend
+        - name: quiz-app-backend
+          tag: v2
+        - name: quiz-app-frontend
+          tag: v2
 ```
 
 Butler will only directly apply the CRDs to the cluster.

butler/docker-compose.yml

@@ -24,13 +24,12 @@ services:
       - ./src/resources/stubby/integrations.yml:/usr/local/stubby.yml
 
   app:
-    image: node:12.17.0-alpine3.9
+    build:
+      context: ./
+      dockerfile: Dockerfile
     depends_on:
       - stubby4j
-    volumes:
-    - ./:/app
-    working_dir: /app
-    command: sh -c 'while sleep 3600; do :; done'
+    entrypoint: sh -c 'while sleep 3600; do :; done'
     environment:
         TZ: America/Sao_Paulo
         DEPLOYMENT_EXPIRE_TIME: 25
@@ -40,7 +39,5 @@ services:
         DARWIN_UNDEPLOYMENT_CALLBACK: http://stubby4j:8883/deploy/notifications/undeployment
         DARWIN_DEPLOYMENT_CALLBACK: http://stubby4j:8883/deploy/notifications/deployment
         DARWIN_ISTIO_DEPLOYMENT_CALLBACK:  http://stubby4j:8883/deploy/notifications/istio-deployment
-        SPINNAKER_URL: http://stubby4j:8883/spinnaker
         HELM_TEMPLATE_URL: http://stubby4j:8883/helm
         HELM_PREFIX_URL: http://stubby4j:8883/helm
-        OCTOPIPE_URL: http://stubby4j:8883/octopipe

butler/src/app/app.module.ts

@@ -23,6 +23,7 @@ import { Configuration } from './v2/core/config/configurations'
 import { AppConstants } from './v2/core/constants'
 import { IoCTokensConstants } from './v2/core/constants/ioc'
 import { CoreModule } from './v2/core/core.module'
+import { OperatorModule } from './v2/operator/operator.module'
 
 @Global()
 @Module({})
@@ -40,6 +41,7 @@ export class AppModule {
       imports: [
         CoreModule,
         ApiModuleV2,
+        OperatorModule,
         TypeOrmModule.forRootAsync({
           useFactory: () => (
             DatabasesService.getPostgresConnectionOptions(envConfiguration)

butler/src/app/v2/api/deployments/controller/deployments.controller.ts

@@ -19,7 +19,7 @@ import { validate as uuidValidate } from 'uuid'
 import { CreateDeploymentRequestDto } from '../dto/create-deployment-request.dto'
 import { ReadDeploymentDto } from '../dto/read-deployment.dto'
 import { ReadUndeploymentDto } from '../dto/read-undeployment.dto'
-import { CdConfigurationExistencePipe, SimultaneousDeploymentValidationPipe } from '../pipes'
+import { CdConfigurationExistencePipe } from '../pipes'
 import { CreateDeploymentUseCase } from '../use-cases/create-deployment.usecase'
 import { CreateUndeploymentUseCase } from '../use-cases/create-undeployment.usecase'
 import { DeploymentUniquenessPipe } from '../pipes/deployment-uniqueness.pipe'
@@ -34,7 +34,6 @@ export class DeploymentsController {
   ) { }
 
   @Post('/')
-  @UsePipes(SimultaneousDeploymentValidationPipe)
   @UsePipes(CdConfigurationExistencePipe)
   @UsePipes(DeploymentUniquenessPipe)
   @UsePipes(new ValidationPipe({ transform: true }))

butler/src/app/v2/api/deployments/controller/executions.controller.ts

@@ -1,15 +1,11 @@
-import { Body, Controller, Get, Param, Post, Query, UsePipes, ValidationPipe } from '@nestjs/common'
-import { DeploymentNotificationRequestDto } from '../dto/deployment-notification-request.dto'
+import { Controller, Get, Query, UsePipes, ValidationPipe } from '@nestjs/common'
 import { ExecutionQuery } from '../dto/execution/paginated-execution-query.dto'
 import { PaginatedExecutions } from '../dto/execution/paginated-executions.dto'
-import { Execution } from '../entity/execution.entity'
 import { PaginatedExecutionsUseCase } from '../use-cases/paginated-executions.usecase'
-import { ReceiveNotificationUseCase } from '../use-cases/receive-notification.usecase'
 
 @Controller('v2/executions')
 export class ExecutionsController {
   constructor(
-    private receiveNotificationUseCase: ReceiveNotificationUseCase,
     private paginatedExecutionsUseCase: PaginatedExecutionsUseCase
   ) { }
 
@@ -20,13 +16,4 @@ export class ExecutionsController {
   ): Promise<PaginatedExecutions> {
     return await this.paginatedExecutionsUseCase.execute(params)
   }
-
-  @Post('/:id/notify')
-  @UsePipes(new ValidationPipe({ transform: true }))
-  public async receiveNotification(
-    @Param('id') executionId: string,
-    @Body() deploymentNotification: DeploymentNotificationRequestDto,
-  ): Promise<Execution> {
-    return await this.receiveNotificationUseCase.execute(executionId, deploymentNotification)
-  }
 }

butler/src/app/v2/api/deployments/deployments.module.ts

@@ -18,26 +18,18 @@ import { HttpModule, Module } from '@nestjs/common'
 import { TypeOrmModule } from '@nestjs/typeorm'
 import { CdConfigurationEntity } from '../configurations/entity'
 import { CdConfigurationsRepository } from '../configurations/repository'
-import { SpinnakerApiService } from '../../core/integrations/spinnaker/spinnaker-api.service'
 import { MooveService } from '../../core/integrations/moove'
 import { DeploymentsController } from './controller/deployments.controller'
 import { DeploymentEntityV2 as DeploymentEntity } from './entity/deployment.entity'
 import { Execution } from './entity/execution.entity'
-import { PgBossWorker } from './jobs/pgboss.worker'
-import { DeploymentCleanupHandler } from './use-cases/deployment-cleanup-handler'
-import { DeploymentHandlerUseCase } from './use-cases/deployment-handler.usecase'
 import { ReceiveNotificationUseCase } from './use-cases/receive-notification.usecase'
-import { SpinnakerConnector } from '../../core/integrations/spinnaker/connector'
 import { ComponentsRepositoryV2 } from './repository'
 import { CreateDeploymentUseCase } from './use-cases/create-deployment.usecase'
 import { CreateUndeploymentUseCase } from './use-cases/create-undeployment.usecase'
 import { DeploymentRepositoryV2 } from './repository/deployment.repository'
 import { ExecutionRepository } from './repository/execution.repository'
 import { ExecutionsController } from './controller/executions.controller'
 import { PaginatedExecutionsUseCase } from './use-cases/paginated-executions.usecase'
-import { CdStrategyFactory } from '../../core/integrations/cd-strategy-factory'
-import { OctopipeConnector } from '../../core/integrations/octopipe/connector'
-import { OctopipeApi } from '../../core/integrations/octopipe/octopipe-api'
 import { HelmManifest } from '../../core/manifests/helm/helm-manifest'
 import { GitHubRepository } from '../../core/integrations/github/github-repository'
 import { GitLabRepository } from '../../core/integrations/gitlab/gitlab-repository'
@@ -63,20 +55,12 @@ import { ConsoleLoggerService } from '../../core/logs/console/console-logger.ser
     ExecutionsController
   ],
   providers: [
-    PgBossWorker,
     CreateDeploymentUseCase,
     CreateUndeploymentUseCase,
     ReceiveNotificationUseCase,
-    DeploymentHandlerUseCase,
     PaginatedExecutionsUseCase,
     MooveService,
-    DeploymentCleanupHandler,
     ConsoleLoggerService,
-    SpinnakerConnector,
-    SpinnakerApiService,
-    CdStrategyFactory,
-    OctopipeConnector,
-    OctopipeApi,
     GitHubRepository,
     GitLabRepository,
     RepositoryStrategyFactory,

butler/src/app/v2/api/deployments/dto/execution/paginated-execution-query.dto.ts

@@ -36,11 +36,11 @@ export class ExecutionQuery {
 
   @ApiProperty()
   @IsBooleanString()
-  public active: boolean
+  public current: boolean
 
-  constructor(size: number, page: number, active: boolean) {
+  constructor(size: number, page: number, current: boolean) {
     this.size = size
     this.page = page
-    this.active = active
+    this.current = current
   }
 }

butler/src/app/v2/api/deployments/entity/deployment.entity.ts

@@ -50,9 +50,18 @@ export class DeploymentEntityV2 implements Deployment {
   @Column({ name: 'circle_id', nullable: false, type: 'varchar' })
   public circleId!: string
 
+  @Column({ name: 'previous_deployment_id', nullable: false, type: 'varchar' })
+  public previousDeploymentId!: string | null
 
-  @Column({ name: 'active' })
-  public active!: boolean
+
+  @Column({ name: 'current' })
+  public current!: boolean
+
+  @Column({ name: 'healthy' })
+  public healthy!: boolean
+
+  @Column({ name: 'routed' })
+  public routed!: boolean
 
   @OneToMany(() => ComponentEntity, component => component.deployment, { cascade: ['insert', 'update'] })
   public components!: ComponentEntity[]

butler/src/app/v2/api/deployments/pipes/index.ts

@@ -15,9 +15,7 @@
  */
 
 import { CdConfigurationExistencePipe } from './cd-configuration-existence-pipe'
-import { SimultaneousDeploymentValidationPipe } from './simultaneous-deployment-validation.pipe'
 
 export {
-  CdConfigurationExistencePipe,
-  SimultaneousDeploymentValidationPipe
+  CdConfigurationExistencePipe
 }