bitovi · LeoDiazL · Jun 8, 2023 · Jun 7, 2023
diff --git a/helm/aws-auth/values.yaml b/helm/aws-auth/values.yaml
diff --git a/helm/aws-auth/Chart.yaml → ...tions/deployment/helm/aws-auth/Chart.yaml b/helm/aws-auth/Chart.yaml → ...tions/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
@@ -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
diff --git a/helm/aws-auth/templates/aws-auth.yaml → ...ent/helm/aws-auth/templates/aws-auth.yaml b/helm/aws-auth/templates/aws-auth.yaml → ...ent/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
@@ -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"
diff --git a/terraform/.terraform.lock.hcl → .../deployment/terraform/.terraform.lock.hcl b/terraform/.terraform.lock.hcl → .../deployment/terraform/.terraform.lock.hcl
diff --git a/terraform/local.tf → operations/deployment/terraform/local.tf b/terraform/local.tf → operations/deployment/terraform/local.tf
diff --git a/terraform/main.tf → operations/deployment/terraform/main.tf b/terraform/main.tf → operations/deployment/terraform/main.tf
diff --git a/...orm/modules/eks-master/eks-master-vars.tf → ...orm/modules/eks-master/eks-master-vars.tf b/...orm/modules/eks-master/eks-master-vars.tf → ...orm/modules/eks-master/eks-master-vars.tf
diff --git a/terraform/modules/eks-master/eks-master.tf → ...erraform/modules/eks-master/eks-master.tf b/terraform/modules/eks-master/eks-master.tf → ...erraform/modules/eks-master/eks-master.tf
diff --git a/...aform/modules/eks-nodes/eks-nodes-vars.tf → ...aform/modules/eks-nodes/eks-nodes-vars.tf b/...aform/modules/eks-nodes/eks-nodes-vars.tf → ...aform/modules/eks-nodes/eks-nodes-vars.tf
diff --git a/terraform/modules/eks-nodes/eks-nodes.tf → .../terraform/modules/eks-nodes/eks-nodes.tf b/terraform/modules/eks-nodes/eks-nodes.tf → .../terraform/modules/eks-nodes/eks-nodes.tf
diff --git a/.../iaminstanceprofile/iaminstanceprofile.tf → .../iaminstanceprofile/iaminstanceprofile.tf b/.../iaminstanceprofile/iaminstanceprofile.tf → .../iaminstanceprofile/iaminstanceprofile.tf
diff --git a/...nstanceprofile/iaminstanceprofile_vars.tf → ...nstanceprofile/iaminstanceprofile_vars.tf b/...nstanceprofile/iaminstanceprofile_vars.tf → ...nstanceprofile/iaminstanceprofile_vars.tf
diff --git a/terraform/modules/iamrole/iamrole.tf → ...ment/terraform/modules/iamrole/iamrole.tf b/terraform/modules/iamrole/iamrole.tf → ...ment/terraform/modules/iamrole/iamrole.tf
diff --git a/terraform/modules/iamrole/iamrole_vars.tf → ...terraform/modules/iamrole/iamrole_vars.tf b/terraform/modules/iamrole/iamrole_vars.tf → ...terraform/modules/iamrole/iamrole_vars.tf
diff --git a/...rm/modules/securitygroup/securitygroup.tf → ...rm/modules/securitygroup/securitygroup.tf b/...rm/modules/securitygroup/securitygroup.tf → ...rm/modules/securitygroup/securitygroup.tf
diff --git a/...dules/securitygroup/securitygroup_vars.tf → ...dules/securitygroup/securitygroup_vars.tf b/...dules/securitygroup/securitygroup_vars.tf → ...dules/securitygroup/securitygroup_vars.tf
diff --git a/.../securitygroupidrule/securitygrpidrule.tf → .../securitygroupidrule/securitygrpidrule.tf b/.../securitygroupidrule/securitygrpidrule.tf → .../securitygroupidrule/securitygrpidrule.tf
diff --git a/...ritygroupidrule/securitygrpidrule_vars.tf → ...ritygroupidrule/securitygrpidrule_vars.tf b/...ritygroupidrule/securitygrpidrule_vars.tf → ...ritygroupidrule/securitygrpidrule_vars.tf
diff --git a/...ules/securitygrouprule/securitygrprule.tf → ...ules/securitygrouprule/securitygrprule.tf b/...ules/securitygrouprule/securitygrprule.tf → ...ules/securitygrouprule/securitygrprule.tf
diff --git a/...securitygrouprule/securitygrprule_vars.tf → ...securitygrouprule/securitygrprule_vars.tf b/...securitygrouprule/securitygrprule_vars.tf → ...securitygrouprule/securitygrprule_vars.tf
diff --git a/terraform/modules/vpc/vpc.tf → ...s/deployment/terraform/modules/vpc/vpc.tf b/terraform/modules/vpc/vpc.tf → ...s/deployment/terraform/modules/vpc/vpc.tf
diff --git a/terraform/modules/vpc/vpc_vars.tf → ...loyment/terraform/modules/vpc/vpc_vars.tf b/terraform/modules/vpc/vpc_vars.tf → ...loyment/terraform/modules/vpc/vpc_vars.tf
diff --git a/terraform/output.tf → operations/deployment/terraform/output.tf b/terraform/output.tf → operations/deployment/terraform/output.tf
diff --git a/...policies/assumerole-eksmaster-policy.json → ...policies/assumerole-eksmaster-policy.json b/...policies/assumerole-eksmaster-policy.json → ...policies/assumerole-eksmaster-policy.json
diff --git a/...ssumerole-eksmaster-trusted-entities.json → ...ssumerole-eksmaster-trusted-entities.json b/...ssumerole-eksmaster-trusted-entities.json → ...ssumerole-eksmaster-trusted-entities.json
diff --git a/...policies/assumerole-eksworker-policy.json → ...policies/assumerole-eksworker-policy.json b/...policies/assumerole-eksworker-policy.json → ...policies/assumerole-eksworker-policy.json
diff --git a/...ssumerole-eksworker-trusted-entities.json → ...ssumerole-eksworker-trusted-entities.json b/...ssumerole-eksworker-trusted-entities.json → ...ssumerole-eksworker-trusted-entities.json
diff --git a/terraform/provider.tf → operations/deployment/terraform/provider.tf b/terraform/provider.tf → operations/deployment/terraform/provider.tf
diff --git a/terraform/terraform.auto.tfvars → ...eployment/terraform/terraform.auto.tfvars b/terraform/terraform.auto.tfvars → ...eployment/terraform/terraform.auto.tfvars
diff --git a/terraform/variables.tf → operations/deployment/terraform/variables.tf b/terraform/variables.tf → operations/deployment/terraform/variables.tf