diff --git a/helm/aws-auth/values.yaml b/helm/aws-auth/values.yaml deleted file mode 100644 index 78f718c..0000000 --- a/helm/aws-auth/values.yaml +++ /dev/null @@ -1,31 +0,0 @@ -# configmap: -# enabled: true -# name: aws-auth -# data: -# mapAccounts: | -# - "755521597925" -# mapRoles: | -# - "groups": -# - "system:bootstrappers" -# - "system:nodes" -# "rolearn": "arn:aws:iam::755521597925:role/env-eksworker" -# "username": "system:node:{{EC2PrivateDNSName}}" - -configmap: - enabled: true - name: aws-auth -data: - mapAccounts: | - - "755521597925" - mapRoles: | - - "groups": - - "system:bootstrappers" - - "system:nodes" - "rolearn": "arn:aws:iam::755521597925:role/env-eksworker" - "username": "system:node:{{EC2PrivateDNSName}}" - mapUsers: | - - "groups": - - "system:masters" - "userarn": "arn:aws:iam::755521597925:user/deploy-eks" - "username": "deploy-eks" - \ No newline at end of file diff --git a/helm/aws-auth/Chart.yaml b/operations/deployment/helm/aws-auth/Chart.yaml similarity index 100% rename from helm/aws-auth/Chart.yaml rename to operations/deployment/helm/aws-auth/Chart.yaml diff --git a/operations/deployment/helm/aws-auth/example.bitops.config.yaml b/operations/deployment/helm/aws-auth/example.bitops.config.yaml new file mode 100644 index 0000000..eddb4b4 --- /dev/null +++ b/operations/deployment/helm/aws-auth/example.bitops.config.yaml @@ -0,0 +1,15 @@ +helm: + cli: + namespace: kube-system + timeout: 200s + debug: true + atomic: false + force: false + dry-run: false + options: + release-name: aws-auth + skip-deploy: false + k8s: + fetch: + kubeconfig: true + cluster-name: prod-ekscluster \ No newline at end of file diff --git a/helm/aws-auth/templates/aws-auth.yaml b/operations/deployment/helm/aws-auth/templates/aws-auth.yaml similarity index 100% rename from helm/aws-auth/templates/aws-auth.yaml rename to operations/deployment/helm/aws-auth/templates/aws-auth.yaml diff --git a/operations/deployment/helm/aws-auth/values.yaml b/operations/deployment/helm/aws-auth/values.yaml new file mode 100644 index 0000000..88a6eb5 --- /dev/null +++ b/operations/deployment/helm/aws-auth/values.yaml @@ -0,0 +1,21 @@ +configmap: + enabled: true + name: aws-auth +data: + + # account number + mapAccounts: | + - "000000000000" + + # add eksworkers to nodes and bootstrappers + # ensure accounts match + # add sso and other users to masters as necessry + mapRoles: | + - "groups": + - "system:bootstrappers" + - "system:nodes" + "rolearn": "arn:aws:iam::000000000000:role/prod-eksworker" + "username": "system:node:{{EC2PrivateDNSName}}" + - "groups": + - "system:masters" + "rolearn": "arn:aws:iam::000000000000:role/AWSReservedSSO_AdministratorAccess_11111111111" \ No newline at end of file diff --git a/terraform/.terraform.lock.hcl b/operations/deployment/terraform/.terraform.lock.hcl similarity index 100% rename from terraform/.terraform.lock.hcl rename to operations/deployment/terraform/.terraform.lock.hcl diff --git a/terraform/local.tf b/operations/deployment/terraform/local.tf similarity index 100% rename from terraform/local.tf rename to operations/deployment/terraform/local.tf diff --git a/terraform/main.tf b/operations/deployment/terraform/main.tf similarity index 100% rename from terraform/main.tf rename to operations/deployment/terraform/main.tf diff --git a/terraform/modules/eks-master/eks-master-vars.tf b/operations/deployment/terraform/modules/eks-master/eks-master-vars.tf similarity index 100% rename from terraform/modules/eks-master/eks-master-vars.tf rename to operations/deployment/terraform/modules/eks-master/eks-master-vars.tf diff --git a/terraform/modules/eks-master/eks-master.tf b/operations/deployment/terraform/modules/eks-master/eks-master.tf similarity index 100% rename from terraform/modules/eks-master/eks-master.tf rename to operations/deployment/terraform/modules/eks-master/eks-master.tf diff --git a/terraform/modules/eks-nodes/eks-nodes-vars.tf b/operations/deployment/terraform/modules/eks-nodes/eks-nodes-vars.tf similarity index 100% rename from terraform/modules/eks-nodes/eks-nodes-vars.tf rename to operations/deployment/terraform/modules/eks-nodes/eks-nodes-vars.tf diff --git a/terraform/modules/eks-nodes/eks-nodes.tf b/operations/deployment/terraform/modules/eks-nodes/eks-nodes.tf similarity index 100% rename from terraform/modules/eks-nodes/eks-nodes.tf rename to operations/deployment/terraform/modules/eks-nodes/eks-nodes.tf diff --git a/terraform/modules/iaminstanceprofile/iaminstanceprofile.tf b/operations/deployment/terraform/modules/iaminstanceprofile/iaminstanceprofile.tf similarity index 100% rename from terraform/modules/iaminstanceprofile/iaminstanceprofile.tf rename to operations/deployment/terraform/modules/iaminstanceprofile/iaminstanceprofile.tf diff --git a/terraform/modules/iaminstanceprofile/iaminstanceprofile_vars.tf b/operations/deployment/terraform/modules/iaminstanceprofile/iaminstanceprofile_vars.tf similarity index 100% rename from terraform/modules/iaminstanceprofile/iaminstanceprofile_vars.tf rename to operations/deployment/terraform/modules/iaminstanceprofile/iaminstanceprofile_vars.tf diff --git a/terraform/modules/iamrole/iamrole.tf b/operations/deployment/terraform/modules/iamrole/iamrole.tf similarity index 100% rename from terraform/modules/iamrole/iamrole.tf rename to operations/deployment/terraform/modules/iamrole/iamrole.tf diff --git a/terraform/modules/iamrole/iamrole_vars.tf b/operations/deployment/terraform/modules/iamrole/iamrole_vars.tf similarity index 100% rename from terraform/modules/iamrole/iamrole_vars.tf rename to operations/deployment/terraform/modules/iamrole/iamrole_vars.tf diff --git a/terraform/modules/securitygroup/securitygroup.tf b/operations/deployment/terraform/modules/securitygroup/securitygroup.tf similarity index 100% rename from terraform/modules/securitygroup/securitygroup.tf rename to operations/deployment/terraform/modules/securitygroup/securitygroup.tf diff --git a/terraform/modules/securitygroup/securitygroup_vars.tf b/operations/deployment/terraform/modules/securitygroup/securitygroup_vars.tf similarity index 100% rename from terraform/modules/securitygroup/securitygroup_vars.tf rename to operations/deployment/terraform/modules/securitygroup/securitygroup_vars.tf diff --git a/terraform/modules/securitygroupidrule/securitygrpidrule.tf b/operations/deployment/terraform/modules/securitygroupidrule/securitygrpidrule.tf similarity index 100% rename from terraform/modules/securitygroupidrule/securitygrpidrule.tf rename to operations/deployment/terraform/modules/securitygroupidrule/securitygrpidrule.tf diff --git a/terraform/modules/securitygroupidrule/securitygrpidrule_vars.tf b/operations/deployment/terraform/modules/securitygroupidrule/securitygrpidrule_vars.tf similarity index 100% rename from terraform/modules/securitygroupidrule/securitygrpidrule_vars.tf rename to operations/deployment/terraform/modules/securitygroupidrule/securitygrpidrule_vars.tf diff --git a/terraform/modules/securitygrouprule/securitygrprule.tf b/operations/deployment/terraform/modules/securitygrouprule/securitygrprule.tf similarity index 100% rename from terraform/modules/securitygrouprule/securitygrprule.tf rename to operations/deployment/terraform/modules/securitygrouprule/securitygrprule.tf diff --git a/terraform/modules/securitygrouprule/securitygrprule_vars.tf b/operations/deployment/terraform/modules/securitygrouprule/securitygrprule_vars.tf similarity index 100% rename from terraform/modules/securitygrouprule/securitygrprule_vars.tf rename to operations/deployment/terraform/modules/securitygrouprule/securitygrprule_vars.tf diff --git a/terraform/modules/vpc/vpc.tf b/operations/deployment/terraform/modules/vpc/vpc.tf similarity index 100% rename from terraform/modules/vpc/vpc.tf rename to operations/deployment/terraform/modules/vpc/vpc.tf diff --git a/terraform/modules/vpc/vpc_vars.tf b/operations/deployment/terraform/modules/vpc/vpc_vars.tf similarity index 100% rename from terraform/modules/vpc/vpc_vars.tf rename to operations/deployment/terraform/modules/vpc/vpc_vars.tf diff --git a/terraform/output.tf b/operations/deployment/terraform/output.tf similarity index 100% rename from terraform/output.tf rename to operations/deployment/terraform/output.tf diff --git a/terraform/policies/assumerole-eksmaster-policy.json b/operations/deployment/terraform/policies/assumerole-eksmaster-policy.json similarity index 100% rename from terraform/policies/assumerole-eksmaster-policy.json rename to operations/deployment/terraform/policies/assumerole-eksmaster-policy.json diff --git a/terraform/policies/assumerole-eksmaster-trusted-entities.json b/operations/deployment/terraform/policies/assumerole-eksmaster-trusted-entities.json similarity index 100% rename from terraform/policies/assumerole-eksmaster-trusted-entities.json rename to operations/deployment/terraform/policies/assumerole-eksmaster-trusted-entities.json diff --git a/terraform/policies/assumerole-eksworker-policy.json b/operations/deployment/terraform/policies/assumerole-eksworker-policy.json similarity index 100% rename from terraform/policies/assumerole-eksworker-policy.json rename to operations/deployment/terraform/policies/assumerole-eksworker-policy.json diff --git a/terraform/policies/assumerole-eksworker-trusted-entities.json b/operations/deployment/terraform/policies/assumerole-eksworker-trusted-entities.json similarity index 100% rename from terraform/policies/assumerole-eksworker-trusted-entities.json rename to operations/deployment/terraform/policies/assumerole-eksworker-trusted-entities.json diff --git a/terraform/provider.tf b/operations/deployment/terraform/provider.tf old mode 100755 new mode 100644 similarity index 100% rename from terraform/provider.tf rename to operations/deployment/terraform/provider.tf diff --git a/terraform/terraform.auto.tfvars b/operations/deployment/terraform/terraform.auto.tfvars similarity index 100% rename from terraform/terraform.auto.tfvars rename to operations/deployment/terraform/terraform.auto.tfvars diff --git a/terraform/variables.tf b/operations/deployment/terraform/variables.tf similarity index 100% rename from terraform/variables.tf rename to operations/deployment/terraform/variables.tf