diff --git a/.docker/supervisor-app.conf b/.docker/supervisor-app.conf index 378a3c41..a334be6a 100644 --- a/.docker/supervisor-app.conf +++ b/.docker/supervisor-app.conf @@ -1,5 +1,5 @@ [program:gunicorn] -command=gunicorn -b 0.0.0.0:9000 -w 3 --timeout 120 ara.wsgi:application +command=gunicorn -b 0.0.0.0:9000 -w 8 --timeout 120 ara.wsgi:application stdout_logfile=/dev/stdout stdout_logfile_maxbytes=0 stderr_logfile=/dev/stderr diff --git a/.docker/supervisor-celery-worker.conf b/.docker/supervisor-celery-worker.conf index aacc17be..1befae56 100644 --- a/.docker/supervisor-celery-worker.conf +++ b/.docker/supervisor-celery-worker.conf @@ -1,5 +1,6 @@ [program:celery-worker] -command=celery -A ara worker -l info +command=celery -A ara worker -l info --concurrency=1 directory=/newara/www stdout_logfile=/var/log/newara/celery-worker.log stderr_logfile=/var/log/newara/celery-worker.log +numprocs=1 diff --git a/deployment/.gitignore b/deployment/.gitignore deleted file mode 100644 index d37e42ce..00000000 --- a/deployment/.gitignore +++ /dev/null @@ -1 +0,0 @@ -**/secret.yaml \ No newline at end of file diff --git a/deployment/README.md b/deployment/README.md deleted file mode 100644 index 6a48e38c..00000000 --- a/deployment/README.md +++ /dev/null @@ -1,29 +0,0 @@ -# Deployment Resource Definitions for Taxi Backend Service - -### directories -``` -├── README.md -├── base -│ ├── kustomization.yaml -│ └── server -│ ├── configmap.yaml -│ ├── deployment.yaml -│ ├── ingress.yaml -│ ├── sealed-secret.yaml -│ ├── secret-template.yaml -│ ├── secret.yaml -│ └── service.yaml -└── overlays - └── dev - └── kustomization.yaml -``` - -*under base folder* -- shared resource definitions for all environments - -*under overlay folder* -- environment specific settings -- you can add more environments - -### Using kubeseal -[Document Notion Link](https://www.notion.so/sparcs/K8S-Sealed-Secret-kubeseal-c3e315e429c442bebf8998b048404e17) [sparcs only] \ No newline at end of file diff --git a/deployment/base/celery/deployment.yaml b/deployment/base/celery/deployment.yaml deleted file mode 100644 index ac1f32ca..00000000 --- a/deployment/base/celery/deployment.yaml +++ /dev/null @@ -1,53 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: ara-celery - labels: - app: ara-celery -spec: - replicas: 1 - selector: - matchLabels: - app: ara-celery - template: - metadata: - labels: - app: ara-celery - spec: - containers: - - name: ara-celery - image: 666583083672.dkr.ecr.ap-northeast-2.amazonaws.com/newara:v3.4.3 - command: ["/newara/www/.docker/run-celery.sh"] - envFrom: - - secretRef: - name: ara-secret - env: - - name: SSO_CLIENT_ID - valueFrom: - configMapKeyRef: - name: ara-env - key: SSO_CLIENT_ID - - name: DJANGO_ENV - valueFrom: - configMapKeyRef: - name: ara-env - key: DJANGO_ENV - - name: AWS_BUCKET_NAME - valueFrom: - configMapKeyRef: - name: ara-env - key: AWS_BUCKET_NAME - - name: AWS_BUCKET_NAME_STATIC - valueFrom: - configMapKeyRef: - name: ara-env - key: AWS_BUCKET_NAME_STATIC - - name: AWS_ACCESS_KEY_ID - valueFrom: - configMapKeyRef: - name: ara-env - key: AWS_ACCESS_KEY_ID - - name: NEWARA_REDIS_ADDRESS - value: "ara-redis-service" - - name: C_FORCE_ROOT - value: "true" \ No newline at end of file diff --git a/deployment/base/kustomization.yaml b/deployment/base/kustomization.yaml deleted file mode 100644 index 7a9c7e63..00000000 --- a/deployment/base/kustomization.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -resources: -- ./server/deployment.yaml -- ./server/configmap.yaml -- ./server/service.yaml -- ./server/ingress.yaml -- ./server/sealed-secret.yaml -- ./redis/deployment.yaml -- ./redis/service.yaml -- ./celery/deployment.yaml \ No newline at end of file diff --git a/deployment/base/redis/deployment.yaml b/deployment/base/redis/deployment.yaml deleted file mode 100644 index 691aac24..00000000 --- a/deployment/base/redis/deployment.yaml +++ /dev/null @@ -1,22 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: ara-redis - labels: - app: ara-redis -spec: - replicas: 1 - selector: - matchLabels: - app: ara-redis - template: - metadata: - labels: - app: ara-redis - spec: - containers: - - name: ara-redis - image: redis:6-alpine - ports: - - containerPort: 6379 - name: ara-redis-port \ No newline at end of file diff --git a/deployment/base/redis/service.yaml b/deployment/base/redis/service.yaml deleted file mode 100644 index c77cd774..00000000 --- a/deployment/base/redis/service.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: ara-redis-service -spec: - selector: - app: ara-redis - ports: - - name: ara-redis-service-port - protocol: TCP - port: 6379 - targetPort: ara-redis-port diff --git a/deployment/base/server/configmap.yaml b/deployment/base/server/configmap.yaml deleted file mode 100644 index d645f8ad..00000000 --- a/deployment/base/server/configmap.yaml +++ /dev/null @@ -1,11 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: ara-env -data: - SSO_CLIENT_ID: "newara" - DJANGO_ENV: "development" - C_FORCE_ROOT: "true" - AWS_BUCKET_NAME: "sparcs-newara" - AWS_BUCKET_NAME_STATIC: "sparcs-newara-static" - AWS_ACCESS_KEY_ID: "AKIAZWM3SVKMLLZANWPC" diff --git a/deployment/base/server/deployment.yaml b/deployment/base/server/deployment.yaml deleted file mode 100644 index 2b5f0616..00000000 --- a/deployment/base/server/deployment.yaml +++ /dev/null @@ -1,53 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - name: ara-server - labels: - app: ara-server -spec: - replicas: 2 - selector: - matchLabels: - app: ara-server - template: - metadata: - labels: - app: ara-server - spec: - containers: - - name: ara-server - image: 666583083672.dkr.ecr.ap-northeast-2.amazonaws.com/newara:v3.4.3 - command: ["/newara/www/.docker/run.sh"] - ports: - - containerPort: 9000 - envFrom: - - secretRef: - name: ara-secret - env: - - name: SSO_CLIENT_ID - valueFrom: - configMapKeyRef: - name: ara-env - key: SSO_CLIENT_ID - - name: DJANGO_ENV - valueFrom: - configMapKeyRef: - name: ara-env - key: DJANGO_ENV - - name: AWS_BUCKET_NAME - valueFrom: - configMapKeyRef: - name: ara-env - key: AWS_BUCKET_NAME - - name: AWS_BUCKET_NAME_STATIC - valueFrom: - configMapKeyRef: - name: ara-env - key: AWS_BUCKET_NAME_STATIC - - name: AWS_ACCESS_KEY_ID - valueFrom: - configMapKeyRef: - name: ara-env - key: AWS_ACCESS_KEY_ID - - name: NEWARA_REDIS_ADDRESS - value: "ara-redis-service" diff --git a/deployment/base/server/ingress.yaml b/deployment/base/server/ingress.yaml deleted file mode 100644 index a77f71a6..00000000 --- a/deployment/base/server/ingress.yaml +++ /dev/null @@ -1,35 +0,0 @@ -apiVersion: networking.k8s.io/v1 -kind: Ingress -metadata: - annotations: - alb.ingress.kubernetes.io/backend-protocol: HTTP - alb.ingress.kubernetes.io/listen-ports: '[{"HTTP": 80}, {"HTTPS":443}]' - alb.ingress.kubernetes.io/ssl-redirect: "443" - alb.ingress.kubernetes.io/scheme: internet-facing - alb.ingress.kubernetes.io/healthcheck-path: /api/status - alb.ingress.kubernetes.io/target-type: "instance" - alb.ingress.kubernetes.io/certificate-arn: arn:aws:acm:ap-northeast-2:666583083672:certificate/2f5020e0-01dd-43dd-aa7e-0699015d6b89 - alb.ingress.kubernetes.io/ssl-policy: ELBSecurityPolicy-2016-08 - alb.ingress.kubernetes.io/group.name: sparcs-prod-external - name: ara-ingress - namespace: ara - finalizers: - - ingress.k8s.aws/resources - labels: - app: ara-ingress -spec: - ingressClassName: alb - rules: - - host: newara.sparcs.org - http: - paths: - - path: / - backend: - service: - name: ara-svc - port: - number: 9000 - pathType: Prefix - tls: - - hosts: - - newara.sparcs.org diff --git a/deployment/base/server/seal.py b/deployment/base/server/seal.py deleted file mode 100644 index 7ea02b4d..00000000 --- a/deployment/base/server/seal.py +++ /dev/null @@ -1,61 +0,0 @@ -from pathlib import Path -from base64 import b64encode, b64decode -from os import system -import yaml - -def encrypt(path: Path, certurl: str = None): - if not certurl: certurl = input("cert url > ") - - target = path.resolve() - b64target = (target.parent / f"b64-{target.stem}.yaml").resolve() - sealedtarget = (target.parent / f"sealed-{target.stem}.yaml").resolve() - - - if not target.exists(): raise FileNotFoundError("File not found.") - if not target.is_file(): raise FileNotFoundError("It is not a file.") - if not target.suffix == ".yaml": raise TypeError("File must be a YAML file.") - - thisyaml = yaml.safe_load(target.read_text()) - - if not thisyaml["apiVersion"] == "v1": raise TypeError("File must be a Kubernetes YAML file.") - for onedata in thisyaml["data"]: - if not thisyaml["data"][onedata]: - thisyaml["data"].pop(onedata) - thisyaml["data"][onedata] = b64encode(str(thisyaml["data"][onedata]).encode()).decode() - - b64target.write_text(yaml.dump(thisyaml)) - if Path("kubeseal").exists(): - kubeseal = "./kubeseal" - else: - kubeseal = "kubeseal" - rtn = system(f"{kubeseal} --cert {certurl} < {b64target} > {sealedtarget}") - b64target.unlink() - if rtn != 0: - sealedtarget.unlink() - raise RuntimeError("Failed to encrypt. Please check that kubeseal is installed.") - - print("Successfully encrypted.") - return - -def dec(path): - path = Path(path).resolve() - if not path.exists(): raise FileNotFoundError("File not found.") - if not path.is_file(): raise FileNotFoundError("It is not a file.") - if not path.suffix == ".yaml": raise TypeError("File must be a YAML file.") - - thisyaml = yaml.safe_load(path.read_text()) - - if not thisyaml["apiVersion"] == "v1": raise TypeError("File must be a Kubernetes YAML file.") - for onedata in thisyaml["data"]: - thisyaml["data"][onedata] = b64decode(str(thisyaml["data"][onedata]).encode()).decode() - - path.write_text(yaml.dump(thisyaml)) - print(yaml.dump(thisyaml)) - - return - - -if __name__ == "__main__": - certurl = "https://s3.ap-northeast-2.amazonaws.com/wheel.sparcs.org/public/secret-seal.pem" - encrypt(Path("secret.yaml"), certurl) - diff --git a/deployment/base/server/sealed-secret.yaml b/deployment/base/server/sealed-secret.yaml deleted file mode 100644 index aabf0e2d..00000000 --- a/deployment/base/server/sealed-secret.yaml +++ /dev/null @@ -1,35 +0,0 @@ -{ - "kind": "SealedSecret", - "apiVersion": "bitnami.com/v1alpha1", - "metadata": { - "name": "ara-secret", - "namespace": "ara", - "creationTimestamp": null - }, - "spec": { - "template": { - "metadata": { - "name": "ara-secret", - "namespace": "ara", - "creationTimestamp": null - }, - "type": "Opaque" - }, - "encryptedData": { - "AWS_SECRET_ACCESS_KEY": "AgCOQNdcUSSqwqeNeckNWUSWwPmZQXxYvE2iP8sQTx0n6t8X96iCS8zoLGUtcBCI2yH7YpMIW1aKs2qjU1VsSMMWIy1SeJdADYIGTR0HZ6WA0fuYdDjXxC4WXNHFM/UPlc+urvgGkfXQGe8w7hwFTw4UpmxnGh06dtauQKjGEOFIrHxBh8uN9flwJErT/U3CSm1sMtWl/e2yhqYMPoiT2bCQaIPrs2y0dnJEq2uLZPJ0ZGsa+TOJmSNq5sUIeI5WUl9sspaAtgFEid2la9xx6HnG8FKHpXWeFtqApyIjRVKOpMTzPKv2Sx0mCY3VoD4dg6wVSQaO++/rjTy9jW+5ZcmMR89YeKnag2PeL7McOVtF1S1VL8gvzcTF5nKUZYApeXv2rlmjwdBp6gQ3hyBI50XHnzUupP4q5Vn0+VXcpkwfPORKH+6VU/hCdZisFMGHCxwrmuVsbBwm13qtkytvROg6STt8Vl+kaT4Z9Udi7lfuFQnx8yqcb/BYTCZxMJtDyXD39SF0pWCsoPuAheyGicY4JwuoJkpb85YxJnLR4ecaKvwo8Xbi+CC3VjXfhbHRQYqD0G+P+cHzqeEILYTicAXiWEeoCcWYNTP49ViMGYI8Y8McVXK+WQ5shBXOKKlpxyWx48LUMFyeQh6yM8wx37JHsiQahItHuKqm3CbPNGdTf9wVLEsmWxfMdR6OWGKbIazkZ7Xd005ToJz+5P2STNkiF+vvApewgCy0rUwb2lxxn2AESFA35ELr", - "HASH_SECRET_VALUE": "AgB9540dQKbOJbq6TKbBBhxk6qdWoJI4b+9IzAjJhhcmvnBKafo2YzAb0+t7/PwsguPsWhOnk7U5Iv2+HxWfNj37IBxcH87Byfx/h9wGLZeYtHyOWZm4lS4Un6P1MniHMWsynEfJK/N6XyOE543UdFSwEVrOBxE7xYY4xB5MaWHG6MWjhvp1/D0fBR0AVV4JeLDzenvzVlDcbDVwAqzihlgTtX2VvOjYbUWbqUjS5+AX4MC7jslNIJigoA4gDF3Mw9+7jOSTmuHe+8ryGg3JKWpcX5gJojB8Ned2mBxTD2OCRGKziK5LMv1D9ZhJtwiMA4st1WZ2bGcZRfDGJL0PsaG4Q8K5Id4OlUHwQxl29ush6oDT81R8GyCHd1yS8dqIoA0Ng+UNqkGZ5dvsjNq49Lo3xbggGaCQHtmwM6NA6O4N3QWJmoPHa4FZ24gYLsXeRejT8MEHqLABGqi5OjT3xl3Auzja5Yvnx6rcFRppSPu6ubhOrsxSCtaaeIVc7NT+qwaXpp/JrSIznWjcboHaDLAiLOoPJl7tUs20ixBBwNBKhCI4yueZN7dNMv/0qXS925Yfq0HTQc132YL+cFNHxK4ny5cqsIsfia+zS3jIxdnsGu9d8uSDFVJz2jteZ3WHU5OeTxFbZRCj4Z0ac0T0ZXKKBPznZitaqmoRieUy+2n9L5diB8eBAHc8/RpxHXwIjTKw4AOZwpLiKgzc1JgVxA==", - "NEWARA_DB_HOST": "AgAD2/EMuny1GGgwCQV2FSvKLT6y+HOSudrwwNJlRzgbmKUwyTjQ/PaIxeGJ4MHi4dTXV1+cIKxHsd8v3fCTTDo0VQo+W0oH1H46FEuCyomDO0Ucd3/t+Il3BJ6QrKVNW40e5AfSC316IOok9tX/W3UV/UtTVtcGBFjrBVWpA27yxRgi2EKSX0yDR2UBo56YPdItZ5e2VnDPDfwqUGb2fukKpUIKUmTftLVJk85vvp6uaA4MzDiws2etWXV8Xv13lk0971+9nZSBx6rcmRaKbYh6rQsSnzfhrCpndSC0Hah26bbIvIuVgpXZ44GrJRohUZX+8BAAylLCtAQqTviIwYWVcUmCUqU9FenwHvvoiIEiXUm4wLo0LEs+AvuZ3yoekh+uQJsEGlsrbN7MYQ2Q5lN6ffElIRTUyJN08aQ4vpVHj933nPYkQfG03HhzzqF/UsczWtm6q+ANbV6ra21mp1dpOCxZGJ+KRVpy0B66oaVJzNrGmT3aei3B1oO7Mw+OE4d5gMbHvo5V94bjrVH8kzawIDAVmOC7ON+WrFihm7f+/fQexfTYbjL3B4Xo0ig3xeFfulefxe8vye2vwum1IeOKQ4AKWftkLkm+eHlaWTsY8teD5r093BjHAJiYpHYpdvHpjt4uMOWsiKyWC25iXchqSPY+Ftp6PKqmW22i3CCBPhf1yBTmh6275x8LCNTJtir9A7ecQ0nSxg8chxTGX/wZUa6vEcQf1U9A5agJGkEoqx+EaQsB6S3MHmTXW3g2ENe586KEQDxwOVk=", - "NEWARA_DB_NAME": "AgAJMs0aG2jCS014nCf5JekdhnkL0V2oqi1wxFhHnS03qD83CWSIEtD+z66rFqiDxn+w/eKUDy7vNynuAOtAyd4lsACVaKaz/tBmW3EO6G7/sgr2jFBbFmjvUfLvl0GTogR3mAco5xlCq3P2DdnoiGcywtyF0zM75F9BRjiN0d7MntuLmWve1voJFJpfaBrCiSZLoHm8scKBzl1P0POZ5JjOFWkBezqLhGvX/0/ySGQadyCElnvpanzAuLCDyTrXBpkqpyh94EGTqVPkR35Wm0Y3R0LqiKh85kt52HZD5HNWp7ET06V7l6h317WeMUgHg2/chmhAOgKyvGI3gJA/o1lkuXIzwqyHgt/US4bvEV/7G1tsQhztgRbxqQwcFrSoj7ifKJ8JLsXpgnkKUw2Z8lb+/zGlCjVe0+eRocjlYszrX26N75XU5ba8lW6vC9ALGq2Amm7pWpF420CJmolz6+4dwOM0wGOhNYV1ho2qs7W42esp9CenpqnzJhZY6QrHNRpEEGl3zCDS9mFcejnTNzcjWOZ0nuiMYM5vYW6NIfZlTSmASAGxKlVHbnDAmO5kLIyO2PQGdWkKJT0cL07oFEj5B2LN18FbEONOV6v8pZSaAh+iyn5WPdAFfn4kPOUUaQvGXu5cj0yM8gUcbdEnUL3GZ3HUMPVFnvHtUwLoRwbU4kAkC6djFEW8lfx3+6Jyk+GCbn7Kvdo4", - "NEWARA_DB_PASSWORD": "AgATK2yBaMVH6XDiKoddEFcXNJSGJFjGr3XoxuldTGrYgfDNpemAtWRB7WJBa9+4Zxf3ASTzBZcZVVdUb00BiYpX7tHNXVgi/7jydfSIG0yhj9opRF9u89UC8PLEvMSfGXGjKGlQSQedlXZY7sXwNRRL3gCWxiixLQqFAWuNYoZg0xs8DG4Y3RsAMALNY9dKGnuj4BlnkZaKKBz5ovKRD4QymRWTkBcvG5ItX9kt8CAx2Ia0WsKc3tIaZt0mTm76BTx/BHn2XHu9M1gdsxXdAn9YA2sFH+BQB2GoEBSoGU1RfT+DKKp9Yk3TuD/5ajnI76WbN3/lPA1KLuYQHQdvto4PjE/wETuyC5k8InY3TnJyd1TUP608yJBY68JPUu7b5FLZeHutVqeB2tUSwYLY74Bl5LCaYzLDqgNl992x0guhOEgDPaO4P6R28tM42bQtgSbyW+OuBCOYMLNLUT7zWbZDc6GHfq88IOyBm+zx0WQq7dJIq6WH2/hjwwKi2jMe3pKJmQo7lG+zy2H9lc0OEGE+oz7X4tous0TDDJj/ww66zD4rf+iVcanUma7LNRcbGKjTYZ4666chwI7HzQepqlk+PNm+NYnJ3Ig5hZMny2dNW6thnlJIpiXw7Hj+xo4swQW/oabVHxehrtsTHAIra6CVrcviVCDUx7yhl+S54v9Jmv4u0h2gfyz07U+Ln5Ee58hCJUTTOdgeoQClUdh0fJ2f", - "NEWARA_DB_PORT": "AgCTTVOSzmtFZ6PalsRH6kgt/mxDaXlnOD9f0nsRt3hxLMeR8Al/C89S9b0l6l8Oxx+Xfjju4iv1d8TC5BSGDNtfyVcqOrQeTM5tmmk11cjCORGhEJGgg5An0NmLAF+o82b6fMiOdo0GdvH6+I6DD930dnp+FFcqs78ni3LdampQ4xf8ZxRo2NDJC/gbqFVE6Afk0AtawZKYYTYLRcEhI6kDHufrYzGA8rwopXuI3wRHKdeR//CVrAlG+/rf95AwG++pPPs4JOrpaX47uNs4RzMD5pRc6ntoHmpObS09bvv4aLqcKEGs/Vz3Xti0MEdYysDswMpUtTcXmSuCBIY+S3jyvoWZULVRGbasSyIKSm6ITynJWu8HPE5djrJHqCOaCG8gzyMEYUZv65PQ4TAkhU1jJoj7f2MirBoasPwSC8VQlcEK3ou/XUddMKR7ZVDL1h9UnsoOsHE9Mmbt6eOpkj02AqNVYLw6sC2ZVE/HVcgIDspI7zkFWgiLaqhACkEVHA+e5YXYUWVfiKRSh5Hdzu60onUBmLeNgsRXSqvmXoLwX9/nZLIW2335K1T4D5ifvX5hPasYSz3LE+8Y+li3giTY9H0vjQ+AbXwvXLff2sfQRywVg8Xhg1a94L1Efh5ZXaWPGsfCqmG3ALXg6x+pN2+gcjTepzbvbQfLutPgqL2/SlUQ9mwLX3mTSAZJ44PNYLrczqkW", - "NEWARA_DB_USER": "AgBNGaC8cBxMppwmUi4Q8e9DTDC8Y5iTUxP8f5rcAAMeecb/QItwL37OtwThLKlebQ/u4TES7bz6F9vWrNyVXqN/JKPNbbfZ3/IliJuwdTYKJ3UnPP7zh6bjTYwL+bZZzwUkcSrRw1VN+Ll52vkWV2zJUN4LuAB9Q/c8jmqXBVI7jidbugSHpId4PExR6lbNpd6Macqe8xJFJ3wPV37M2L6mZmeHve1v6OKUh+ZMf7CXLPjfKxolMGgUgXW8VQOrAd1Zl3WeYIa5mRcJiiqPFvO+fBenb9ObZs1NelUkr86njwicBCn/Z+KZSJFeREC1aZn/e38FPczeFktVG4cOxBSxU71YMC/agpeul1IPZn4+FXJAa7AyceHO3pDag9yNLt9mIanZcmtXESGIu1C+ns0v3AAjqvW1x1bqatcMyiXpZ2iqH1iC5gTtdTeUamMnjJQrRLqrbL0to79iA8VAaiD+A48lYARaPij/l8tOj5lXotu3OtVNCwYh1vlwry1edBZkMKiC9jnIRG2yhPnLIH5fKXPYo8mQAOxXoWtwEFg4+WB7Sw9KvjtoGW0WrtvfBmVlxIszdMO4DzpDFPcdCjzlhRBLTzAyWyj4fcwZBSQ08DS08MdHvzv5KCnvBqDCPWSxIKcttz5qImowcI4NX5pL7+ZuPNHL0JqZJvMJEOmz5APQj6mUa7JAlgdg1sIKwPeOk2PV", - "NEWARA_ELASTICSEARCH_HOST": "AgAaVlfDG44IVi3QB6W7w1Omk/K///nvM+3V2IBBvIlKohPipGzx7UIo1z2F7oOX85+9Jh3+9SkSafVG11oXvkwjbtEy52Nfta4Ej1qWQomXP14/inLTbnS30ddG7GrCyA3BetECzsOSLydgdSlckZP4HA5t3qPFuLXEzs4V7VfnFIrQ8alqnu+Dre7TepK56yzxHCOGEIw/GcoTud1mlyJ0OQVvWHNCE2mcacP1STSfhQNBI45olsClUooK8JQ4+Vnr/4v49h/mslqig5wmeIT6O05WFyuVXmdV52qMwUoarTCXKxObQuO1MI/CLliydQ2pwexOznCQb/5PJioZJNp06DHK+f/XzeUszoLQ5AXwv9nh99qBDsL58bxi3pTxmMUC93GVjJsHaicYfzKVLTNR4Qa1lCMxCn2OIEJQ1U9TZy3Xf3PONDTDa+h/4UTdYEWAIa/jFQHMGdf7NQ2ogCdwUTR102XYCDeMG8MXedCQSSQ1WYCQRaczMtwqiQDDjVJQErbVCh3EJ6UX2rtpEJ9iJi13s2KprUa+rklJTcS3lvbZjcycRL7FORRgx4lrKnzM45K/Zsv5PMYastxq2sbVk3tp1UsWTI8IFmjpyZfNBsfxUxk1hC1V/uE9+0BquiTxajSHzisPMNPaXSOvUngbiIQeBIOjWzN5b4Ib+eDMBQ3yZhETSj1ZCiFjXirL/8xkfcB23gFnzvGUsqaRSHrCN5crnqvh", - "NEWARA_ELASTICSEARCH_PORT": "AgCeHCZzwAfIpQFdcXKbecZuBgiQst9QsR7p2DJppzjBajLBorkLE2NBteAVt9aewMMTndw1Aa3dWhwlWIq73FduLO3+ZysBSZlB2wQXEFpm0jT3Y6dXNGb5H4eGV6Rk7ijGIs6IlnUrmpO5JleR7lqbxIHnfC0Y5k2rI7x5QPAs3rNp0iGY/03X+arCT0Js6SGM7ryys094CsJVf8a+JMXS1VSxhT6h1kfyMCqme6zJdPUxr1w/RQl/K38r5Q29T1e+F9qOr24ztOq5XJzeUfhqR/Qkh/2oKZAB+nobjY+BHag9Zeb8DeLDqoY19K8cnrgFnXCah5ApXlzhQiC8RpYF/iWhb4d6GIKIvMIfV3IFQ7ode8Ta1CWEmZ/yreOEfmIanWp8p0nyRWPf47lDLeg/Z1118jUrNMszgCXeCF5sbm6W420VFuUW4+1J4utH42Ua7OllK6FDjSrs8bz8mLyDFuGQoAhCDfhFsTWMNNbazP/WbPaJFT0Ex5YdyZq/+ajr8zwHqo+Nn35l+yORQuGInAcp1LgTuFNhjW0RpjUaMWf6USR8V2qh+B0JV8H4Y++fI4iIwxO9w7W9LjSGdCOQQXcqD9BxnBjl1h8UaTuVAN7iLZbJ9HbDVJMpqEhlIsrsFBKsAyt+5hMw4WNTPlngotJ+9ug3x8YZSzz9MvcdyQRHWjyxnNtH+Rl95tiEdlQDAY4zIQ==", - "NEWARA_ELASTICSEARCH_URL": "AgBVOPuWF+0k3HCwj8L5xYuyxgB8FEtV8bekBXuPRH+LYJlY5VshfkqEcYPOTRhNaiLYFOZhhXw1Zde7x62BpuTve5cah1p2/6tHJ1V9u4BluBuFBSqZORl5JtphhuYLaa5BgTIm+9xAMl7NV0OimOlWWoLgWTt/9UwlRhXi0TiiolmXHN8mgHTIrxBVOC4+A3i+hlb1CZCtzgnBGcQU8+NWJExcyIA20+CbR1yGta4UUgEPS7+7AuRCBEykDrXPpkzX4aSeh0uC3aaUuccadddohRQ6tbaCo47xsjflkxGnsYyNkWH2m7syT/NsNUpsYj+4sy4lwXZwtwoEwuOowIhReRcbO1slBVVd1288S4hPu2SxeUDlXyAtaVvWYWLA6p4YFOa6quE+/uKexzyrsGR5Ea5wShA+K6S6i038buRngbKoURJcsItQ7dUNJCJuzIeJSvASIIml1stbVN/aTAcyUBvHfO763dPME9d8RkzXbdvPFHeWIZ2ADfh5r/FU4z49PRxKM1QYDNtZfd8JMg8GnQkiThh6e4U3gJhHXRpnAy/AxGq/LCsDjq/6nlM1mkpjCOa0TZ7/eU+Blboffo+VV5MukAWxlzha4IqajV0tUCNxs2k/0lGmb+83kRcMlHhEKRbq7+K01NY3f3srONhRPHWvnhG2kW0H4vh8ss6cborpjibtT7itiUCNUPy+75+sBiSwdT8vCAwS3pZBqzyOq+MLYoksMx46gWAmJlffRGutWiButpyACRY9zo1zzdFXfyLrVRQrDRTDx7bRc9DZ3A==", - "PORTAL_JSESSIONID": "AgAPC2ZUs38zrKparyYp95gDyNwlpU4rJh462ZSdqrqPrpMqVBFgFz+GL0dPaSl/ApkL6znImvd54nJKnKKzl+qk1g4uVRn9POeIwEVUyUFoq4588qW2KLHugWwDC9KlaNDiA5mwQlGW5JdIEyrFM8OCulxA9r67GrGP7o3anHzuIZmK77dYXqVJuXwn/O5Sj6+aogVaPsvKsi8UPY+Qrdi6AgsV0uOFOBQCM+HQ+V87n+UqomBeMB+vI3xqgd2AxisGF/ZUYySVJ+w7qR2IzniQvewT7gxr0HEE+uy1oJ13E/Dm8U2W+jU++b63P295j1Qn49BCjy4LCAMyPxp57PUl6EbVi80LmLLdZWcohYVDAYtIZUPTvVyxXfqQGBaJPe4GH2WhACoDV9f8O5GJLqgIUux9HTHLV1eYMaxc8+oxJt0srAE0zT57pWl63+i0yFCpLe8xBDjRlGMqyYJWl8o9XqYu6vQzh0M/xfPPUWaGzYcDW6b0Su4eP1Lq796nGVAqj1YNYZx8F0YM0d89tVyQP9KfDALtvERbm/BAc8maGdax8sDfjuzLUtEQhrNDYX1zeVrPXyT24ZXfQst/KBRKVGFpHH/SOLBINfB+l5d1VV9lTScp18c6E5A17JxPWz4TXDLlEB5ANgfnz99JzY2BEiCxlknvAC7evrirFl+hahWC6M3LE6vT62I39zl64qxsGYamRR+7rVF6XteapZV6LVOy5X0ayMPqfcC4DoasPJ+Nuz7e1LS8EIZzPAOlYIu+yuSnSyH0KHdUwhNdeM0dyRwsSQ3I/z/sQkAbPPJP0zD02uWK", - "SECRET_KEY": "AgCtQaAJwU0+IAdQHpDMfnbh+hO3dDUi4enF8zrgvmnTa/yKB0cgKwj4KwQMUZ1Xao3nGQ+XiS0Vp5tOHcwv0UKqNu20RFvMFvlQ0zjDTHZwJOAKofW38kC6egD+AgLZQu92RWLZxWPviG22yxHA/syRoKi364mICwghyV2kBqmaMBm9rO/xdty4TPd5OLc2hQ30JjV6rEXD42C01JP+oW3oxnAKvEWENcWfrkeV87iyEoy5TShaUztXC7L/WMEUTZB5koia1BxF4HLZgiPwepE3BQsDDbquV0G3+rlrpWKgcQ6h9UnoIxObSP4hPYFmaQw5tb21vyrHjVfK6IuR4af+a3tWYJN8NRVIKourrBCzMJDwOEZFeN72OJMAfoxQzHmGp8NW7qrhgNSSJgbpFulur8inoRbxvaYjqzP+OSDZCBQVp1rjPAMkjb4njHOkUAD2YMPVeOeN8pokgI1UH2GrckgNs6BsYSy0M94azK9Rx55iRKzggKz8Mc3c5Bpee8tpQ6Q31ibayczm2/LCBn754MfyvwdkeZ8ZnGADuXo0f9cv/n7wIhGWsD9WSR1ZM5ITURF0ASxniwkywMKk5huO8AfO/qU7g/TYMovqVKdwE8GK4wfgMHAji63zATkHKaX0eUnF4MrhIRvxyltDxo/I1UII79y6JRhiCrgvXziyUGhLO79Tt2dmOmbBwGoSSShchSdktzAvqJgR/tWU1dlXiPnxTv9WI5STmg6jL+gDIoXA1F7mjOZFFI1Cs7IMCw==", - "SENTRY_DSN": "AgBYd2DfyfQFDs5GVhyZolkrgzrtmUrcDbDz3lIEWPzqkgN+UZuFwLOqvWhDSEkFrZlJHALiCmRkVzMuYCiX/KOjckVhO4onJuxRR0V1yqNX3LjDSPA/FlMRFhw/9yYHBPZrJusO5/SG+XYZa/8ayxGXv4ALoD5fX++SvKQPP3861rolkJkgsjOrToVDd4GLzP2iLZRzCr8JqKca6F9MfAl4KC+QqCWYo7jtcbl6rNOaQWnTIGEzSZnZ1YC68cVXfDV1MlVnB6rjhOoxDX9vGkUEHLgUDIEFiWaqXrWNibyuvhFUdWlPC4KzGM6H1xLR0QeR+QLJAWlm9F6jpUdk005Hj0YXuN3bpE2WmoaLF5UN72mmEX/oP76mCw2tKXqzRnXK54pZg4gCcWaKNvHASnnXTF9QdkQ7eNUyBu+IQpC0QzhPdMPzS3QfpBkG2XVTNqTh8yfwFTkl5J/AXhVlqOd3TseR5PB0j/leZx92KTVLBXPN+H7OmkVGkfS6Zq5L5igpQGH7upbwYeraBZ8SmtENQY5e953Xhc3oeEJT+FI8Sun8hMbPLfvUeqAHCDrP3NQW/zvQTxbGXoOU4Q3lg2Fse3DUXS2H2hHJ14SH40QHcBrp3JzfQpxA5nDIyz0q49k2FPr8TaOxmilIta0z3j5J8L5ToIvzFdHxwo+0I2lc1L3CgW9TyN/1rWvLCZrthgiIL26XqkMs2lD0mz2dmQY2vDAs0KmcO03g5D37fOOx1s51z7Iogi8oHFfVHpSQEJQCJh7793/2aWQzmEMfb2vfHzHbjCdkso4E", - "SSO_SECRET_KEY": "AgB/hMWQzNd/s/Y0yaK0otUUcwfDnE3JN2bgRKDV9sdACtIV57V5mucDOKB0JUm4ssYjx86yrJZdYhGTcVdK2rvBeTz4c6HdNiEr2jMKw/lIVSNIzFcUXK4Jr91XTwMHu9I6EVpDgFS3zDeTEhsLPitk0GZHirmvuGRG0+Hj4R6y0cECWFoC364Iwyios6knyMKOsBBSjGFyxmBK2vzKxH85hHIt7dj1TcUShF2ERwkYsdeIKsLgkkXOylyvcpoPiq9wLlUmG3hIqqVyl5/FgKIkjdSt50lbUwz2jsMsunJnf1+qt8cnbmKdIhXBPLQ1/LPjEXaZCXlxEJ8G5fRxpK0RIWA5o1u23tb0E9APvHGL9yiAQCKxpeWmzYjGd/PiieguwSDAOc+WUYr7yKJoothr4VVteJPiE6BcbGKi2ZnNyPVfPtqK/gTV5ihuCN0PnYsh6V09lD4aNBjuVt8iOLlvcQGGBUMPI2rwOW0WhZ+QTTGGqravFbfS8fI3Dc7pwp4iGOXxNB6r9dDXP7ZUfG1HKuTl2EDJcdRwNMM1tspim/cPsLfcrvODH/hBQ+bUj5TCSmtjBfot3Q0Q7SS8HMYAWcojZPOZX0cARl4dbTKV9rLTL5kyw4KwKxcsImLFMY0wyRaIOmovIggowbhtRaaRFK3l9v/Xc5t5aFzMLo8j2wS0X6R1B3/wtmueDzODyHpT5+cQgGTwyHlo3/4NoGxeLJfKATBDaHsP+8LshIxzIU5k0fJEmEY47kXb2MR4s8TvDNF72QMQO7BBv5DLg4swJ887djBcTx04WF5I9yU0kA==" - } - } -} diff --git a/deployment/base/server/secret-template.yaml b/deployment/base/server/secret-template.yaml deleted file mode 100644 index bdd3b324..00000000 --- a/deployment/base/server/secret-template.yaml +++ /dev/null @@ -1,16 +0,0 @@ -apiVersion: v1 -kind: Secret -metadata: - name: ara-secret - namespace: ara -type: Opaque -data: - AWS_SECRET_ACCESS_KEY: base64encoded - SENTRY_DSN: base64encoded - SECRET_KEY: base64encoded - HASH_SECRET_VALUE: base64encoded - NEWARA_DB_USER: base64encoded - NEWARA_DB_PASSWORD: base64encoded - NEWARA_ELASTICSEARCH_URL: base64encoded - PORTAL_JSESSIONID: base64encoded - SSO_SECRET_KEY: base64encoded diff --git a/deployment/base/server/service.yaml b/deployment/base/server/service.yaml deleted file mode 100644 index 66ae1cf1..00000000 --- a/deployment/base/server/service.yaml +++ /dev/null @@ -1,12 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - name: ara-svc -spec: - type: NodePort - selector: - app: ara-server - ports: - - protocol: TCP - port: 9000 - targetPort: 9000 \ No newline at end of file diff --git a/deployment/overlays/dev/kustomization.yaml b/deployment/overlays/dev/kustomization.yaml deleted file mode 100644 index c047bc28..00000000 --- a/deployment/overlays/dev/kustomization.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: kustomize.config.k8s.io/v1beta1 -kind: Kustomization -images: -- name: 666583083672.dkr.ecr.ap-northeast-2.amazonaws.com/newara -resources: -- ../../base