Refactor project resources by namespace

garystafford · Jun 12, 2021 · 63e7108 · 63e7108
1 parent 1cd8912
commit 63e7108
Show file tree

Hide file tree

Showing 24 changed files with 26 additions and 28 deletions.
diff --git a/resources/other/prometheus-eks.yaml → ...ces/amazon-cloudwatch/prometheus-eks.yaml b/resources/other/prometheus-eks.yaml → ...ces/amazon-cloudwatch/prometheus-eks.yaml
diff --git a/resources/aws/trust-eks-policy-internal.json b/resources/aws/trust-eks-policy-internal.json
diff --git a/resources/aws/trust-eks-policy.json b/resources/aws/trust-eks-policy.json
@@ -4,7 +4,7 @@
       {
          "Effect":"Allow",
          "Principal":{
-            "Federated":"arn:aws:iam::676164205626:oidc-provider/oidc.eks.us-east-1.amazonaws.com/id/F91B063F4B2E8BDFED054DD64DAB4368"
+            "Federated":"arn:aws:iam::1234567890:oidc-provider/oidc.eks.us-east-1.amazonaws.com/id/F91B063F4B2E8BDFED054DD64DAB4368"
          },
          "Action":"sts:AssumeRoleWithWebIdentity",
          "Condition":{

diff --git a/resources/istio/destination-rules.yaml → resources/dev/istio/destination-rules.yaml b/resources/istio/destination-rules.yaml → resources/dev/istio/destination-rules.yaml
@@ -2,6 +2,7 @@ apiVersion: networking.istio.io/v1beta1
 kind: DestinationRule
 metadata:
   name: angular-ui
+  namespace: dev
 spec:
   host: angular-ui.dev.svc.cluster.local
   subsets:
@@ -13,6 +14,7 @@ apiVersion: networking.istio.io/v1beta1
 kind: DestinationRule
 metadata:
   name: service-a
+  namespace: dev
 spec:
   host: service-a.dev.svc.cluster.local
   subsets:
@@ -24,6 +26,7 @@ apiVersion: networking.istio.io/v1beta1
 kind: DestinationRule
 metadata:
   name: service-b
+  namespace: dev
 spec:
   host: service-b.dev.svc.cluster.local
   subsets:
@@ -35,6 +38,7 @@ apiVersion: networking.istio.io/v1beta1
 kind: DestinationRule
 metadata:
   name: service-c
+  namespace: dev
 spec:
   host: service-c.dev.svc.cluster.local
   subsets:
@@ -46,6 +50,7 @@ apiVersion: networking.istio.io/v1beta1
 kind: DestinationRule
 metadata:
   name: service-d
+  namespace: dev
 spec:
   host: service-d.dev.svc.cluster.local
   subsets:
@@ -57,6 +62,7 @@ apiVersion: networking.istio.io/v1beta1
 kind: DestinationRule
 metadata:
   name: service-e
+  namespace: dev
 spec:
   host: service-e.dev.svc.cluster.local
   subsets:
@@ -68,6 +74,7 @@ apiVersion: networking.istio.io/v1beta1
 kind: DestinationRule
 metadata:
   name: service-f
+  namespace: dev
 spec:
   host: service-f.dev.svc.cluster.local
   subsets:
@@ -79,6 +86,7 @@ apiVersion: networking.istio.io/v1beta1
 kind: DestinationRule
 metadata:
   name: service-g
+  namespace: dev
 spec:
   host: service-g.dev.svc.cluster.local
   subsets:
@@ -90,6 +98,7 @@ apiVersion: networking.istio.io/v1beta1
 kind: DestinationRule
 metadata:
   name: service-h
+  namespace: dev
 spec:
   host: service-h.dev.svc.cluster.local
   subsets:

diff --git a/resources/istio/external-mesh-amazon-mq.yaml → ...es/dev/istio/external-mesh-amazon-mq.yaml b/resources/istio/external-mesh-amazon-mq.yaml → ...es/dev/istio/external-mesh-amazon-mq.yaml
@@ -2,6 +2,7 @@ apiVersion: networking.istio.io/v1alpha3
 kind: ServiceEntry
 metadata:
   name: amazon-mq-external-mesh
+  namespace: dev
 spec:
   hosts:
     - {{ your_amazon_mq_hostname }}

diff --git a/...rces/istio/external-mesh-document-db.yaml → .../dev/istio/external-mesh-document-db.yaml b/...rces/istio/external-mesh-document-db.yaml → .../dev/istio/external-mesh-document-db.yaml
@@ -2,6 +2,7 @@ apiVersion: networking.istio.io/v1alpha3
 kind: ServiceEntry
 metadata:
   name: docdb-external-mesh
+  namespace: dev
 spec:
   hosts:
     - {{ your_document_db_hostname }}

diff --git a/resources/istio/gateway.yaml → resources/dev/istio/gateway.yaml b/resources/istio/gateway.yaml → resources/dev/istio/gateway.yaml
@@ -2,6 +2,7 @@ apiVersion: networking.istio.io/v1beta1
 kind: Gateway
 metadata:
   name: istio-gateway
+  namespace: dev
 spec:
   selector:
     istio: ingressgateway # use istio default controller

diff --git a/resources/istio/virtualservices.yaml → resources/dev/istio/virtualservices.yaml b/resources/istio/virtualservices.yaml → resources/dev/istio/virtualservices.yaml
@@ -2,6 +2,7 @@ apiVersion: networking.istio.io/v1beta1
 kind: VirtualService
 metadata:
   name: angular-ui
+  namespace: dev
 spec:
   hosts:
     - {{ your_ui_hostname }}
@@ -22,6 +23,7 @@ apiVersion: networking.istio.io/v1beta1
 kind: VirtualService
 metadata:
   name: service-a
+  namespace: dev
 spec:
   hosts:
     - {{ your_api_hostname }}

diff --git a/resources/dev/secrets/secrets.yaml b/resources/dev/secrets/secrets.yaml
@@ -0,0 +1,9 @@
+apiVersion: v1
+kind: Secret
+metadata:
+  name: go-srv-config
+  namespace: dev
+type: Opaque
+data:
+  mongodb.conn: {{ your_base64_encoded_secret }}
+  rabbitmq.conn: {{ your_base64_encoded_secret }}
diff --git a/resources/services/angular-ui.yaml → resources/dev/services/angular-ui.yaml b/resources/services/angular-ui.yaml → resources/dev/services/angular-ui.yaml
diff --git a/resources/services/service-a.yaml → resources/dev/services/service-a.yaml b/resources/services/service-a.yaml → resources/dev/services/service-a.yaml
diff --git a/resources/services/service-b.yaml → resources/dev/services/service-b.yaml b/resources/services/service-b.yaml → resources/dev/services/service-b.yaml
diff --git a/resources/services/service-c.yaml → resources/dev/services/service-c.yaml b/resources/services/service-c.yaml → resources/dev/services/service-c.yaml
diff --git a/resources/services/service-d.yaml → resources/dev/services/service-d.yaml b/resources/services/service-d.yaml → resources/dev/services/service-d.yaml
diff --git a/resources/services/service-e.yaml → resources/dev/services/service-e.yaml b/resources/services/service-e.yaml → resources/dev/services/service-e.yaml
diff --git a/resources/services/service-f.yaml → resources/dev/services/service-f.yaml b/resources/services/service-f.yaml → resources/dev/services/service-f.yaml
diff --git a/resources/services/service-g.yaml → resources/dev/services/service-g.yaml b/resources/services/service-g.yaml → resources/dev/services/service-g.yaml
diff --git a/resources/services/service-h.yaml → resources/dev/services/service-h.yaml b/resources/services/service-h.yaml → resources/dev/services/service-h.yaml
diff --git a/resources/other/alb-ingress.yaml → resources/istio-system/alb-ingress.yaml b/resources/other/alb-ingress.yaml → resources/istio-system/alb-ingress.yaml
diff --git a/resources/istio/prometheus.yaml → resources/istio-system/prometheus.yaml b/resources/istio/prometheus.yaml → resources/istio-system/prometheus.yaml
diff --git a/...ws-load-balancer-controller-v220-all.yaml → ...ws-load-balancer-controller-v220-all.yaml b/...ws-load-balancer-controller-v220-all.yaml → ...ws-load-balancer-controller-v220-all.yaml
diff --git a/resources/aws/eks-admin-service-account.yaml → ...ube-system/eks-admin-service-account.yaml b/resources/aws/eks-admin-service-account.yaml → ...ube-system/eks-admin-service-account.yaml
diff --git a/resources/secrets/secrets.yaml → resources/mongo-express/secrets/secrets.yaml b/resources/secrets/secrets.yaml → resources/mongo-express/secrets/secrets.yaml
@@ -1,15 +1,5 @@
 apiVersion: v1
 kind: Secret
-metadata:
-  name: go-srv-config
-  namespace: dev
-type: Opaque
-data:
-  mongodb.conn: {{ your_base64_encoded_secret }}
-  rabbitmq.conn: {{ your_base64_encoded_secret }}
----
-apiVersion: v1
-kind: Secret
 metadata:
   name: mongo-express-config
   namespace: mongo-express

diff --git a/resources/services/mongo-express.yaml → ...mongo-express/services/mongo-express.yaml b/resources/services/mongo-express.yaml → ...mongo-express/services/mongo-express.yaml
@@ -2,6 +2,7 @@ apiversion: v1
 kind: Service
 metadata:
   name: mongo-express
+  namespace: mongo-express
   labels:
     app: mongo-express
 spec:
@@ -16,6 +17,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: mongo-express
+  namespace: mongo-express
   labels:
     app: mongo-express
 spec: