Skip to content

[WIP] Support deployments using new AWS Shell and Vivado 2018.2 #319

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
CampGareth wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[WIP] Support deployments using new AWS Shell and Vivado 2018.2 #319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions k8s/production/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ data:
RECO_DEPLOY_LOG_GROUP: "/reconfigureio/deployments"
GIN_MODE: release
RECO_ENV: production
RECO_DEPLOY_IMAGE: "reconfigureio/docker-aws-fpga-runtime:latest"
RECO_DEPLOY_IMAGE: "reconfigureio/build-framework/sdaccel-builder:v0.18.7-dirty"
RECO_FEATURE_INTERCOM: "1"
PORT: '80'
RECO_DEPLOY_AMI: ami-43338239
RECO_DEPLOY_AMI: ami-0bf310a6858243a7c
Copy link
Contributor Author

@CampGareth CampGareth Jan 24, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This AMI is the same one used by the compiler and I don't think that's going to work. The 'normal' deployment container has config to make scripts run on startup. We could however build a deployment container based on the compiler one ensuring libraries and whatnot are kept the same.

RECO_DEPLOY_BUCKET: "reconfigureio-builds"
RECO_DEPLOY_SUBNET: subnet-b0ca3aed
RECO_DEPLOY_SG: sg-b03e38c2
Expand Down
6 changes: 3 additions & 3 deletions service/deployment/deployment.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ type service struct {

type ServiceConfig struct {
LogGroup string `env:"RECO_DEPLOY_LOG_GROUP" envDefault:"/reconfigureio/deployments"`
Image string `env:"RECO_DEPLOY_IMAGE" envDefault:"reconfigureio/docker-aws-fpga-runtime:latest"`
Image string `env:"RECO_DEPLOY_IMAGE" envDefault:"reconfigureio/build-framework/sdaccel-builder:v0.18.7-dirty"`
AMI string `env:"RECO_DEPLOY_AMI"`
Bucket string `env:"RECO_DEPLOY_BUCKET" envDefault:"reconfigureio-builds"`
Subnet string `env:"RECO_DEPLOY_SUBNET" envDefault:"subnet-fa2a9c9e"`
Expand Down Expand Up @@ -156,8 +156,8 @@ func (s *service) runInstance(ctx context.Context, encodedConfig string, dryRun
ec2Session := ec2.New(s.session)

cfg := ec2.RunInstancesInput{
DryRun: aws.Bool(dryRun),
ImageId: aws.String(s.Conf.AMI),
DryRun: aws.Bool(dryRun),
ImageId: aws.String(s.Conf.AMI),
InstanceInitiatedShutdownBehavior: aws.String("terminate"),
InstanceType: aws.String("f1.2xlarge"),
MaxCount: aws.Int64(1),
Expand Down