-
Notifications
You must be signed in to change notification settings - Fork 1.4k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' of github.com:aws-ia/terraform-aws-eks-blueprints…
… into feat/example-update
- Loading branch information
Showing
35 changed files
with
1,018 additions
and
607 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -41,14 +41,14 @@ jobs: | |
| egress-policy: audit | ||
|
|
||
| - name: Checkout | ||
| uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac | ||
| uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 | ||
|
|
||
| - name: Setup backend | ||
| # Un-comment remote backend for use in workflow | ||
| run: sed -i "s/# //g" ${{ matrix.example_path }}/versions.tf | ||
|
|
||
| - name: Auth AWS | ||
| uses: aws-actions/[email protected].0 | ||
| uses: aws-actions/[email protected].1 | ||
| with: | ||
| role-to-assume: ${{ secrets.ROLE_TO_ASSUME }} | ||
| aws-region: us-west-2 | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -32,10 +32,10 @@ jobs: | |
| egress-policy: audit | ||
|
|
||
| - name: Checkout | ||
| uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac | ||
| uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 | ||
|
|
||
| - name: Auth AWS | ||
| uses: aws-actions/[email protected].0 | ||
| uses: aws-actions/[email protected].1 | ||
| with: | ||
| role-to-assume: ${{ secrets.ROLE_TO_ASSUME }} | ||
| aws-region: us-west-2 | ||
|
|
@@ -74,14 +74,14 @@ jobs: | |
| egress-policy: audit | ||
|
|
||
| - name: Checkout | ||
| uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac | ||
| uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 | ||
|
|
||
| - name: Setup backend | ||
| # Un-comment remote backend for use in workflow | ||
| run: sed -i "s/# //g" ${{ matrix.example_path }}/versions.tf | ||
|
|
||
| - name: Auth AWS | ||
| uses: aws-actions/[email protected].0 | ||
| uses: aws-actions/[email protected].1 | ||
| with: | ||
| role-to-assume: ${{ secrets.ROLE_TO_ASSUME }} | ||
| aws-region: us-west-2 | ||
|
|
@@ -164,10 +164,10 @@ jobs: | |
| egress-policy: audit | ||
|
|
||
| - name: Checkout | ||
| uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac | ||
| uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 | ||
|
|
||
| - name: Configure AWS credentials from Test account | ||
| uses: aws-actions/[email protected].0 | ||
| uses: aws-actions/[email protected].1 | ||
| with: | ||
| role-to-assume: ${{ secrets.ROLE_TO_ASSUME }} | ||
| aws-region: us-west-2 | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -32,7 +32,7 @@ jobs: | |
| egress-policy: audit | ||
|
|
||
| - name: Checkout | ||
| uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac | ||
| uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 | ||
|
|
||
| - name: Get Terraform directories for evaluation | ||
| id: dirs | ||
|
|
@@ -67,13 +67,13 @@ jobs: | |
|
|
||
| - name: checkout-merge | ||
| if: "contains(github.event_name, 'pull_request')" | ||
| uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac | ||
| uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 | ||
| with: | ||
| ref: refs/pull/${{github.event.pull_request.number}}/merge | ||
|
|
||
| - name: checkout | ||
| if: "!contains(github.event_name, 'pull_request')" | ||
| uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac | ||
| uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 | ||
|
|
||
| - uses: dorny/paths-filter@v2 | ||
| id: changes | ||
|
|
@@ -88,7 +88,7 @@ jobs: | |
| - '*.tf' | ||
| - name: Configure AWS credentials from Test account | ||
| uses: aws-actions/[email protected].0 | ||
| uses: aws-actions/[email protected].1 | ||
| if: steps.changes.outputs.src== 'true' | ||
| with: | ||
| role-to-assume: ${{ secrets.ROLE_TO_ASSUME }} | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,32 @@ | ||
| apiVersion: argoproj.io/v1alpha1 | ||
| kind: ApplicationSet | ||
| metadata: | ||
| name: bootstrap-addons | ||
| namespace: argocd | ||
| spec: | ||
| syncPolicy: | ||
| preserveResourcesOnDeletion: true | ||
| generators: | ||
| - clusters: | ||
| selector: | ||
| matchExpressions: | ||
| - key: akuity.io/argo-cd-cluster-name | ||
| operator: NotIn | ||
| values: [in-cluster] | ||
| template: | ||
| metadata: | ||
| name: 'bootstrap-addons' | ||
| spec: | ||
| project: default | ||
| source: | ||
| repoURL: '{{metadata.annotations.addons_repo_url}}' | ||
| path: '{{metadata.annotations.addons_repo_path}}' | ||
| targetRevision: '{{metadata.annotations.addons_repo_revision}}' | ||
| directory: | ||
| recurse: true | ||
| exclude: exclude/* | ||
| destination: | ||
| namespace: 'argocd' | ||
| name: '{{name}}' | ||
| syncPolicy: | ||
| automated: {} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,67 @@ | ||
| apiVersion: argoproj.io/v1alpha1 | ||
| kind: ApplicationSet | ||
| metadata: | ||
| name: bootstrap-workloads | ||
| namespace: argocd | ||
| spec: | ||
| goTemplate: true | ||
| syncPolicy: | ||
| preserveResourcesOnDeletion: true | ||
| generators: | ||
| - matrix: | ||
| generators: | ||
| - clusters: | ||
| selector: | ||
| matchExpressions: | ||
| - key: akuity.io/argo-cd-cluster-name | ||
| operator: NotIn | ||
| values: | ||
| - in-cluster | ||
| - git: | ||
| repoURL: '{{.metadata.annotations.gitops_workloads_url}}' | ||
| revision: '{{.metadata.annotations.gitops_workloads_revision}}' | ||
| directories: | ||
| - path: '{{.metadata.annotations.gitops_workloads_path}}/*' | ||
| template: | ||
| metadata: | ||
| name: 'bootstrap-workloads-{{.name}}' | ||
| spec: | ||
| project: default | ||
| sources: | ||
| - repoURL: '{{.metadata.annotations.gitops_workloads_url}}' | ||
| targetRevision: '{{.metadata.annotations.gitops_workloads_revision}}' | ||
| ref: values | ||
| path: '{{.metadata.annotations.gitops_workloads_path}}' | ||
| helm: | ||
| releaseName: 'bootstrap-workloads-{{.name}}' | ||
| ignoreMissingValueFiles: true | ||
| values: | | ||
| "account": "{{.metadata.annotations.aws_account_id}}" | ||
| "clusterName": "{{.metadata.annotations.cluster_name}}" | ||
| "labels": | ||
| "env": "{{.metadata.annotations.env}}" | ||
| "region": "{{.metadata.annotations.aws_region}}" | ||
| "repoUrl": "{{.metadata.annotations.gitops_workloads_url}}" | ||
| "spec": | ||
| "source": | ||
| "repoURL": "{{.metadata.annotations.gitops_workloads_url}}" | ||
| "targetRevision": "{{.metadata.annotations.gitops_workloads_revision}}" | ||
| "blueprint": "terraform" | ||
| "clusterName": "{{.metadata.annotations.cluster_name}}" | ||
| "env": "{{.metadata.annotations.env}}" | ||
| "ingress": | ||
| "route53_weight": {{default "0" .metadata.annotations.route53_weight}} | ||
| "argocd_route53_weight": {{default "0" .metadata.annotations.argocd_route53_weight}} | ||
| "ecsfrontend_route53_weight": {{default "0" .metadata.annotations.ecsfrontend_route53_weight}} | ||
| "host": {{ default "" .metadata.annotations.eks_cluster_domain }} | ||
| "type": "{{.metadata.annotations.ingress_type}}" | ||
| "karpenterInstanceProfile": "{{.metadata.annotations.karpenter_node_instance_profile_name}}" | ||
| "target_group_arn": {{ default "" .metadata.annotations.target_group_arn }} | ||
| "external_lb_url": {{ if index .metadata.annotations "external_lb_dns" }} http://{{ .metadata.annotations.external_lb_dns }}{{ else }}{{ end }} | ||
| destination: | ||
| name: '{{.name}}' | ||
| syncPolicy: | ||
| automated: {} | ||
| syncOptions: | ||
| - CreateNamespace=true | ||
| - ServerSideApply=true # Big CRDs. |
Oops, something went wrong.