Merge pull request #307 from alwinsimon/main

Update to accommodate changes made to infra directory.
alwinsimon · Nov 2, 2023 · fa2488c · fa2488c
2 parents c8ec3c7 + 363b3f3
commit fa2488c
Show file tree

Hide file tree

Showing 16 changed files with 4 additions and 3 deletions.
diff --git a/.github/workflows/CD - Deploy - Manifests.yml b/.github/workflows/CD - Deploy - Manifests.yml
@@ -19,4 +19,4 @@ jobs:
         with:
           token: ${{ secrets.DIGITALOCEAN_ACCESS_TOKEN }}
       - run: doctl kubernetes cluster kubeconfig save ${{ secrets.DIGITALOCEAN_CLUSTER_ID }}
-      - run: kubectl apply -f infra/k8s && kubectl apply -f infra/k8s-prod
+      - run: kubectl apply -f infra/ingress-nginx/prod && kubectl apply -f infra/statefull && kubectl apply -f infra/stateless
diff --git a/infra/k8s-dev/ingress-srv.yaml → infra/ingress-nginx/dev/dev-ingress-srv.yaml b/infra/k8s-dev/ingress-srv.yaml → infra/ingress-nginx/dev/dev-ingress-srv.yaml
diff --git a/infra/k8s-prod/ingress-srv.yaml → .../ingress-nginx/prod/prod-ingress-srv.yaml b/infra/k8s-prod/ingress-srv.yaml → .../ingress-nginx/prod/prod-ingress-srv.yaml
diff --git a/infra/k8s/auth-mongo-depl.yaml → infra/statefull/auth-mongo-depl.yaml b/infra/k8s/auth-mongo-depl.yaml → infra/statefull/auth-mongo-depl.yaml
diff --git a/infra/k8s/expiration-redis-depl.yaml → infra/statefull/expiration-redis-depl.yaml b/infra/k8s/expiration-redis-depl.yaml → infra/statefull/expiration-redis-depl.yaml
diff --git a/infra/k8s/nats-depl.yaml → infra/statefull/nats-depl.yaml b/infra/k8s/nats-depl.yaml → infra/statefull/nats-depl.yaml
diff --git a/infra/k8s/orders-mongo-depl.yaml → infra/statefull/orders-mongo-depl.yaml b/infra/k8s/orders-mongo-depl.yaml → infra/statefull/orders-mongo-depl.yaml
diff --git a/infra/k8s/payments-mongo-depl.yaml → infra/statefull/payments-mongo-depl.yaml b/infra/k8s/payments-mongo-depl.yaml → infra/statefull/payments-mongo-depl.yaml
diff --git a/infra/k8s/tickets-mongo-depl.yaml → infra/statefull/tickets-mongo-depl.yaml b/infra/k8s/tickets-mongo-depl.yaml → infra/statefull/tickets-mongo-depl.yaml
diff --git a/infra/k8s/auth-depl.yaml → infra/stateless/auth-depl.yaml b/infra/k8s/auth-depl.yaml → infra/stateless/auth-depl.yaml
diff --git a/infra/k8s/client-depl.yaml → infra/stateless/client-depl.yaml b/infra/k8s/client-depl.yaml → infra/stateless/client-depl.yaml
diff --git a/infra/k8s/expiration-depl.yaml → infra/stateless/expiration-depl.yaml b/infra/k8s/expiration-depl.yaml → infra/stateless/expiration-depl.yaml
diff --git a/infra/k8s/orders-depl.yaml → infra/stateless/orders-depl.yaml b/infra/k8s/orders-depl.yaml → infra/stateless/orders-depl.yaml
diff --git a/infra/k8s/payments-depl.yaml → infra/stateless/payments-depl.yaml b/infra/k8s/payments-depl.yaml → infra/stateless/payments-depl.yaml
diff --git a/infra/k8s/tickets-depl.yaml → infra/stateless/tickets-depl.yaml b/infra/k8s/tickets-depl.yaml → infra/stateless/tickets-depl.yaml
diff --git a/skaffold.yaml b/skaffold.yaml
@@ -3,8 +3,9 @@ kind: Config
 deploy:
   kubectl:
     manifests:
-      - ./infra/k8s/*
-      - ./infra/k8s-dev/*
+      - ./infra/ingress-nginx/dev/*
+      - ./infra/statefull/*
+      - ./infra/stateless/*
 build:
   local:
     push: true