Skip to content
This repository has been archived by the owner on Oct 7, 2021. It is now read-only.

Commit

Permalink
Update to latest
Browse files Browse the repository at this point in the history
  • Loading branch information
aknysh committed Nov 16, 2020
1 parent 28dcc61 commit 529af64
Show file tree
Hide file tree
Showing 13 changed files with 39 additions and 32 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ ARG CLI_NAME
COPY --from=cli /usr/cli/$CLI_NAME /usr/local/bin

COPY rootfs/ /
COPY config/ /config/
COPY vendir.yml /vendir.yml
COPY stacks/ /stacks/
COPY vendor/ /vendor/

WORKDIR /
23 changes: 15 additions & 8 deletions cli/main.variant
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ option "cluster-name-pattern" {
type = string
}

option "project-dir" {
option "terraform-dir" {
default = "./components/terraform"
description = "Terraform components directory"
type = string
Expand All @@ -49,12 +49,19 @@ option "config-dir" {
type = string
}

option "vendor-config-path" {
default = "./vendor"
description = "Path to the vendor configuration file"
type = string
}

imports = [
"git::https://git@github.com/cloudposse/atmos@modules/shell?ref=tags/0.2.1",
"git::https://git@github.com/cloudposse/atmos@modules/kubeconfig?ref=tags/0.2.1",
"git::https://git@github.com/cloudposse/atmos@modules/terraform?ref=tags/0.2.1",
"git::https://git@github.com/cloudposse/atmos@modules/helmfile?ref=tags/0.2.1",
"git::https://git@github.com/cloudposse/atmos@modules/helm?ref=tags/0.2.1",
"git::https://git@github.com/cloudposse/atmos@modules/workflow?ref=tags/0.2.1",
"git::https://git@github.com/cloudposse/atmos@modules/istio?ref=tags/0.2.1"
"git::https://git@github.com/cloudposse/atmos@modules/shell?ref=tags/0.3.0",
"git::https://git@github.com/cloudposse/atmos@modules/kubeconfig?ref=tags/0.3.0",
"git::https://git@github.com/cloudposse/atmos@modules/terraform?ref=tags/0.3.0",
"git::https://git@github.com/cloudposse/atmos@modules/helmfile?ref=tags/0.3.0",
"git::https://git@github.com/cloudposse/atmos@modules/helm?ref=tags/0.3.0",
"git::https://git@github.com/cloudposse/atmos@modules/workflow?ref=tags/0.3.0",
"git::https://git@github.com/cloudposse/atmos@modules/istio?ref=tags/0.3.0",
"git::https://git@github.com/cloudposse/atmos@modules/vendor?ref=tags/0.3.0"
]
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
44 changes: 22 additions & 22 deletions vendir.yml → vendor/vendir.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,171 +4,171 @@ kind: Config
directories:

# Terraform components
- path: components/terraform
- path: ../components/terraform
contents:

- path: account-map
git:
url: https://github.com/cloudposse/terraform-aws-components
ref: 0.135.0
ref: 0.136.0
newRootPath: modules/account-map
includePaths:
- modules/account-map/**/*

- path: account-settings
git:
url: https://github.com/cloudposse/terraform-aws-components
ref: 0.135.0
ref: 0.136.0
newRootPath: modules/account-settings
includePaths:
- modules/account-settings/**/*

- path: account
git:
url: https://github.com/cloudposse/terraform-aws-components
ref: 0.135.0
ref: 0.136.0
newRootPath: modules/account
includePaths:
- modules/account/**/*

- path: cloudtrail-bucket
git:
url: https://github.com/cloudposse/terraform-aws-components
ref: 0.135.0
ref: 0.136.0
newRootPath: modules/cloudtrail-bucket
includePaths:
- modules/cloudtrail-bucket/**/*

- path: cloudtrail
git:
url: https://github.com/cloudposse/terraform-aws-components
ref: 0.135.0
ref: 0.136.0
newRootPath: modules/cloudtrail
includePaths:
- modules/cloudtrail/**/*

- path: datadog-aws-integration
git:
url: https://github.com/cloudposse/terraform-aws-components
ref: 0.135.0
ref: 0.136.0
newRootPath: modules/datadog-aws-integration
includePaths:
- modules/datadog-aws-integration/**/*

- path: datadog-monitor
git:
url: https://github.com/cloudposse/terraform-aws-components
ref: 0.135.0
ref: 0.136.0
newRootPath: modules/datadog-monitor
includePaths:
- modules/datadog-monitor/**/*

- path: dns-delegated
git:
url: https://github.com/cloudposse/terraform-aws-components
ref: 0.135.0
ref: 0.136.0
newRootPath: modules/dns-delegated
includePaths:
- modules/dns-delegated/**/*

- path: dns-primary
git:
url: https://github.com/cloudposse/terraform-aws-components
ref: 0.135.0
ref: 0.136.0
newRootPath: modules/dns-primary
includePaths:
- modules/dns-primary/**/*

- path: ecr
git:
url: https://github.com/cloudposse/terraform-aws-components
ref: 0.135.0
ref: 0.136.0
newRootPath: modules/ecr
includePaths:
- modules/ecr/**/*

- path: efs
git:
url: https://github.com/cloudposse/terraform-aws-components
ref: 0.135.0
ref: 0.136.0
newRootPath: modules/efs
includePaths:
- modules/efs/**/*

- path: eks-iam
git:
url: https://github.com/cloudposse/terraform-aws-components
ref: 0.135.0
ref: 0.136.0
newRootPath: modules/eks-iam
includePaths:
- modules/eks-iam/**/*

- path: eks
git:
url: https://github.com/cloudposse/terraform-aws-components
ref: 0.135.0
ref: 0.136.0
newRootPath: modules/eks
includePaths:
- modules/eks/**/*

- path: iam-delegated-roles
git:
url: https://github.com/cloudposse/terraform-aws-components
ref: 0.135.0
ref: 0.136.0
newRootPath: modules/iam-delegated-roles
includePaths:
- modules/iam-delegated-roles/**/*

- path: iam-primary-roles
git:
url: https://github.com/cloudposse/terraform-aws-components
ref: 0.135.0
ref: 0.136.0
newRootPath: modules/iam-primary-roles
includePaths:
- modules/iam-primary-roles/**/*

- path: opsgenie
git:
url: https://github.com/cloudposse/terraform-aws-components
ref: 0.135.0
ref: 0.136.0
newRootPath: modules/opsgenie
includePaths:
- modules/opsgenie/**/*

- path: sso
git:
url: https://github.com/cloudposse/terraform-aws-components
ref: 0.135.0
ref: 0.136.0
newRootPath: modules/sso
includePaths:
- modules/sso/**/*

- path: tfstate-backend
git:
url: https://github.com/cloudposse/terraform-aws-components
ref: 0.135.0
ref: 0.136.0
newRootPath: modules/tfstate-backend
includePaths:
- modules/tfstate-backend/**/*

- path: transit-gateway
git:
url: https://github.com/cloudposse/terraform-aws-components
ref: 0.135.0
ref: 0.136.0
newRootPath: modules/transit-gateway
includePaths:
- modules/transit-gateway/**/*

- path: vpc
git:
url: https://github.com/cloudposse/terraform-aws-components
ref: 0.135.0
ref: 0.136.0
newRootPath: modules/vpc
includePaths:
- modules/vpc/**/*

# Helmfile components
- path: components/helmfiles
- path: ../components/helmfiles
contents:

- path: autoscaler
Expand Down

0 comments on commit 529af64

Please sign in to comment.