Merge branch 'main' into update_prometheus

cloudnativedaysjp · Nov 29, 2021 · c1999f2 · c1999f2
2 parents 8bb35df + 8ac2399
commit c1999f2
Show file tree

Hide file tree

Showing 113 changed files with 1,139 additions and 2,476 deletions.
diff --git a/cfn/sqs.yaml b/cfn/sqs.yaml
@@ -15,11 +15,19 @@ Resources:
 #  SQS
 # ------------------------------------------------------------#
 # SQS Create
-  SQS:
+  DeplecatedSQS:
     Type: AWS::SQS::Queue
     Properties:
       ContentBasedDeduplication: False
       DelaySeconds: 10
       FifoQueue: True
       MessageRetentionPeriod: 60
       QueueName: !Sub "${PJPrefix}MailQueue.fifo"
+  SQS:
+    Type: AWS::SQS::Queue
+    Properties:
+      ContentBasedDeduplication: False
+      DelaySeconds: 10
+      FifoQueue: True
+      MessageRetentionPeriod: 60
+      QueueName: !Sub "${PJPrefix}FifoQueue.fifo"
diff --git a/manifests/app/argocd-apps/development/dreamkast-api-mock.yaml b/manifests/app/argocd-apps/development/dreamkast-api-mock.yaml
@@ -9,7 +9,7 @@ spec:
   destination:
     namespace: dreamkast-api-mock
     server: https://kubernetes.default.svc
-  project: default
+  project: app
   source:
     path: manifests/app/dreamkast-api-mock/base
     repoURL: https://github.com/cloudnativedaysjp/dreamkast-infra.git

diff --git a/manifests/app/argocd-apps/development/dreamkast-dk-1013.yaml b/manifests/app/argocd-apps/development/dreamkast-dk-1013.yaml
diff --git a/manifests/app/argocd-apps/development/dreamkast-dk-1014.yaml b/manifests/app/argocd-apps/development/dreamkast-dk-1014.yaml
diff --git a/manifests/app/argocd-apps/development/dreamkast-dk-1018.yaml b/manifests/app/argocd-apps/development/dreamkast-dk-1018.yaml
@@ -13,7 +13,7 @@ spec:
   destination:
     namespace: dreamkast-dk-1018
     server: https://kubernetes.default.svc
-  project: default
+  project: app
   source:
     path: manifests/app/dreamkast/overlays/development/dk-1018
     repoURL: https://github.com/cloudnativedaysjp/dreamkast-infra

diff --git a/manifests/app/argocd-apps/development/dreamkast-dk-1029.yaml b/manifests/app/argocd-apps/development/dreamkast-dk-1029.yaml
diff --git a/...d-apps/development/dreamkast-dk-1012.yaml → ...d-apps/development/dreamkast-dk-1035.yaml b/...d-apps/development/dreamkast-dk-1012.yaml → ...d-apps/development/dreamkast-dk-1035.yaml
@@ -2,20 +2,20 @@ apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
   annotations:
-    dreamkast.cloudnativedays.jp/app-commit-hash: 0142db69289446f82376178569a9ffe0d029fc6e
+    dreamkast.cloudnativedays.jp/app-commit-hash: a6d077a452f83b8f2435ea4b8336c6387923a4cf
     dreamkast.cloudnativedays.jp/app-organization: cloudnativedaysjp
     dreamkast.cloudnativedays.jp/app-repository: dreamkast
   finalizers:
   - resources-finalizer.argocd.argoproj.io
-  name: dreamkast-development-dk-1012
+  name: dreamkast-development-dk-1035
   namespace: argocd
 spec:
   destination:
-    namespace: dreamkast-dk-1012
+    namespace: dreamkast-dk-1035
     server: https://kubernetes.default.svc
-  project: default
+  project: app
   source:
-    path: manifests/app/dreamkast/overlays/development/dk-1012
+    path: manifests/app/dreamkast/overlays/development/dk-1035
     repoURL: https://github.com/cloudnativedaysjp/dreamkast-infra
     targetRevision: main
   syncPolicy:

diff --git a/manifests/app/argocd-apps/development/dreamkast-staging.yaml b/manifests/app/argocd-apps/development/dreamkast-staging.yaml
@@ -17,7 +17,7 @@ spec:
   destination:
     namespace: dreamkast-staging
     server: https://kubernetes.default.svc
-  project: default
+  project: app
   source:
     path: manifests/app/dreamkast/overlays/staging/main
     repoURL: https://github.com/cloudnativedaysjp/dreamkast-infra.git

diff --git a/manifests/app/argocd-apps/development/dreamkast-ui-194.yaml b/manifests/app/argocd-apps/development/dreamkast-ui-194.yaml
diff --git a/manifests/app/argocd-apps/production/dreamkast-main.yaml b/manifests/app/argocd-apps/production/dreamkast-main.yaml
@@ -9,7 +9,7 @@ spec:
   destination:
     namespace: dreamkast
     server: https://kubernetes.default.svc
-  project: default
+  project: app
   source:
     path: manifests/app/dreamkast/overlays/production/main
     repoURL: https://github.com/cloudnativedaysjp/dreamkast-infra.git

diff --git a/manifests/app/argocd-apps/production/dreamkast-maintenance.yaml b/manifests/app/argocd-apps/production/dreamkast-maintenance.yaml
@@ -9,7 +9,7 @@ spec:
   destination:
     namespace: dreamkast
     server: https://kubernetes.default.svc
-  project: default
+  project: app
   source:
     path: manifests/app/maintenance
     repoURL: https://github.com/cloudnativedaysjp/dreamkast-infra.git

diff --git a/manifests/app/argocd-apps/production/dreamkast-releasebot.yaml b/manifests/app/argocd-apps/production/dreamkast-releasebot.yaml
@@ -10,7 +10,7 @@ spec:
   destination:
     namespace: dreamkast-releasebot
     server: https://kubernetes.default.svc
-  project: default
+  project: cd
   source:
     path: manifests/app/dreamkast-releasebot/overlays/production
     repoURL: https://github.com/cloudnativedaysjp/dreamkast-infra.git

diff --git a/manifests/app/argocd-apps/template/dreamkast.yaml b/manifests/app/argocd-apps/template/dreamkast.yaml
diff --git a/manifests/app/dreamkast-api-mock/base/kustomization.yaml b/manifests/app/dreamkast-api-mock/base/kustomization.yaml
@@ -7,7 +7,7 @@ resources:
 - service.yaml
 images:
 - name: 607167088920.dkr.ecr.ap-northeast-1.amazonaws.com/dreamkast-api-mock
-  newTag: 185772dc762dd87be3c027c71acd760770b0c778
+  newTag: b9bd18ca8052a9d72f4bca53339c7899dbeb0a37
 - name: dreamkast-api-mock
   newName: 607167088920.dkr.ecr.ap-northeast-1.amazonaws.com/dreamkast-api-mock
   newTag: 329df4c0aa0cb53796a112aae00dcf7530b5b26e
diff --git a/manifests/app/dreamkast/overlays/development/dk-1012/ingress.yaml b/manifests/app/dreamkast/overlays/development/dk-1012/ingress.yaml