diff --git a/build/dev/configmap.yaml b/build/dev/configmap.yaml index 9ebebfb6..5db245e1 100755 --- a/build/dev/configmap.yaml +++ b/build/dev/configmap.yaml @@ -1,18 +1,17 @@ apiVersion: v1 kind: ConfigMap metadata: - name: lifeline-web-cm - namespace: lifeline-web + name: medicalalert-web-cm + namespace: medicalalert-web labels: - app: lifeline-web + app: medicalalert-web data: - DB_HOST: dev-lifeline-ecommerce.c5om7w6xopq1.us-east-1.rds.amazonaws.com + DB_HOST: dev-medicalalert-ecommerce.c5om7w6xopq1.us-east-1.rds.amazonaws.com ENV: dev WP_DEBUG: "false" DB_CHARSET: utf8 DB_COLLATE: utf8_general_ci - CACHE_HOST: master.redis-cache-all-be-caresage.cqsmse.use1.cache.amazonaws.com + CACHE_HOST: master.redis-cache-all-be-medicalalert.cqsmse.use1.cache.amazonaws.com CACHE_PORT: "6379" - DB_USER: pantheon - DB_NAME: pantheon - SUBDB_NAME: dev03 + DB_NAME: "www" + DB_USER: "pantheon" diff --git a/build/dev/deployment.tpl b/build/dev/deployment.tpl index aa0b661e..35913599 100755 --- a/build/dev/deployment.tpl +++ b/build/dev/deployment.tpl @@ -4,16 +4,16 @@ metadata: annotations: deployment.kubernetes.io/revision: "11" labels: - app: lifeline-web - name: lifeline-web - namespace: lifeline-web + app: medicalalert-web + name: medicalalert-web + namespace: medicalalert-web spec: progressDeadlineSeconds: 600 replicas: 1 revisionHistoryLimit: 10 selector: matchLabels: - app: lifeline-web + app: medicalalert-web strategy: rollingUpdate: maxSurge: 25% @@ -25,7 +25,7 @@ spec: kubectl.kubernetes.io/restartedAt: "2023-06-08T17:04:19-04:00" creationTimestamp: null labels: - app: lifeline-web + app: medicalalert-web spec: affinity: nodeAffinity: @@ -41,14 +41,14 @@ spec: - env: - name: ENVIRONMENT value: "$ENV" - image: 716593996126.dkr.ecr.us-east-1.amazonaws.com/lifeline-web:$VERSION + image: 716593996126.dkr.ecr.us-east-1.amazonaws.com/medicalalert-web:$VERSION envFrom: - secretRef: - name: lifeline-web-secrets + name: medicalalert-web-secrets - configMapRef: - name: lifeline-web-cm + name: medicalalert-web-cm imagePullPolicy: Always - name: lifeline-web + name: medicalalert-web ports: - containerPort: 80 name: http @@ -88,23 +88,23 @@ spec: volumes: - name: persistent-storage persistentVolumeClaim: - claimName: efs-claim-lifeline + claimName: efs-claim-medicalalert - name: persistent-storage-dev01 persistentVolumeClaim: - claimName: efs-claim-lifeline-dev01 + claimName: efs-claim-medicalalert-dev01 - name: persistent-storage-dev02 persistentVolumeClaim: - claimName: efs-claim-lifeline-dev02 + claimName: efs-claim-medicalalert-dev02 - name: persistent-storage-dev03 persistentVolumeClaim: - claimName: efs-claim-lifeline-dev03 + claimName: efs-claim-medicalalert-dev03 - name: persistent-storage-dev04 persistentVolumeClaim: - claimName: efs-claim-lifeline-dev04 + claimName: efs-claim-medicalalert-dev04 - name: persistent-storage-dev05 persistentVolumeClaim: - claimName: efs-claim-lifeline-dev05 + claimName: efs-claim-medicalalert-dev05 - name: default-conf configMap: defaultMode: 420 - name: lifeline-web-default-conf-cm + name: medicalalert-web-default-conf-cm diff --git a/build/dev/deployment.yml b/build/dev/deployment.yml deleted file mode 100755 index 7581d4a1..00000000 --- a/build/dev/deployment.yml +++ /dev/null @@ -1,98 +0,0 @@ -apiVersion: apps/v1 -kind: Deployment -metadata: - annotations: - deployment.kubernetes.io/revision: "11" - labels: - app: medicalalert-web - name: medicalalert-web - namespace: caresage-web -spec: - progressDeadlineSeconds: 600 - replicas: 1 - revisionHistoryLimit: 10 - selector: - matchLabels: - app: medicalalert-web - strategy: - rollingUpdate: - maxSurge: 25% - maxUnavailable: 25% - type: RollingUpdate - template: - metadata: - annotations: - kubectl.kubernetes.io/restartedAt: "2023-06-08T17:04:19-04:00" - creationTimestamp: null - labels: - app: medicalalert-web - spec: - affinity: - nodeAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - nodeSelectorTerms: - - matchExpressions: - - key: kubernetes.io/arch - operator: In - values: - - amd64 - - arm64 - containers: - - env: - - name: ENVIRONMENT - value: dev - image: 716593996126.dkr.ecr.us-east-1.amazonaws.com/medicalalert-web:v01 - envFrom: - - secretRef: - name: medicalalert-web-secrets - - configMapRef: - name: medicalalert-web-cm - imagePullPolicy: Always - name: medicalalert-web - ports: - - containerPort: 80 - name: http - protocol: TCP - resources: - limits: - cpu: 200m - memory: 300Mi - requests: - cpu: 100m - memory: 100Mi - terminationMessagePath: /dev/termination-log - terminationMessagePolicy: File - volumeMounts: - - mountPath: /usr/share/nginx/html/wp-content/uploads - name: persistent-storage - - mountPath: /etc/nginx/conf.d/ - name: default-conf - - mountPath: /var/lib/nginx/cache - name: cache - dnsPolicy: ClusterFirst - imagePullSecrets: - - name: regcred - nodeSelector: - kubernetes.io/os: linux - restartPolicy: Always - schedulerName: default-scheduler - terminationGracePeriodSeconds: 30 - volumes: - - name: persistent-storage - persistentVolumeClaim: - claimName: efs-claim-medicalalert - - name: default-conf - configMap: - defaultMode: 420 - name: medicalalert-web-default-conf-cm - - name: cache - emptyDir: {} - - - - - - - - - diff --git a/build/dev/jobs.tpl b/build/dev/jobs.tpl index bd90bb9b..024444f6 100755 --- a/build/dev/jobs.tpl +++ b/build/dev/jobs.tpl @@ -2,16 +2,16 @@ apiVersion: batch/v1 kind: Job metadata: name: common-jobs - namespace: lifeline-web + namespace: medicalalert-web labels: - app: lifeline-web + app: medicalalert-web rds: enable spec: ttlSecondsAfterFinished: 10 template: metadata: labels: - app: lifeline-web + app: medicalalert-web rds: enable spec: affinity: @@ -29,9 +29,9 @@ spec: image: ubuntu:latest envFrom: - secretRef: - name: lifeline-web-secrets + name: medicalalert-web-secrets - configMapRef: - name: lifeline-web-cm + name: medicalalert-web-cm command: ["bash"] args: - -c @@ -47,4 +47,4 @@ spec: volumes: - name: persistent-storage persistentVolumeClaim: - claimName: efs-claim-lifeline + claimName: efs-claim-medicalalert diff --git a/build/dev/lifeline-web-default-conf-cm.yaml b/build/dev/lifeline-web-default-conf-cm.yaml deleted file mode 100644 index ddc04b5f..00000000 --- a/build/dev/lifeline-web-default-conf-cm.yaml +++ /dev/null @@ -1,285 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: lifeline-web-default-conf-cm - namespace: lifeline-web - labels: - app: lifeline-web -data: - default.conf: | - - # --------------------- - fastcgi_cache_path /var/lib/nginx/cache levels=1:2 keys_zone=MYAPP:100m inactive=60m; - fastcgi_cache_key "$scheme$request_method$host$request_uri"; - # ----------------------------------------- - fastcgi_intercept_errors on; - fastcgi_ignore_client_abort on; - fastcgi_buffers 8 16k; - fastcgi_buffer_size 32k; - fastcgi_read_timeout 120; - #fastcgi_index index.php; - # -------------------------------- - - # Only cache positive responses - proxy_cache_valid 200 1h; - proxy_cache_valid 301 302 15m; - - server { - listen 80 default; ## listen for ipv4; this line is default and implied - listen [::]:80 default ipv6only=on; ## listen for ipv6 - - server_name dev-lifeline.com ""; - - return 301 https://www.$host$request_uri; - - root /usr/share/nginx/subdomain/www; - index index.php index.html index.htm; - - } - - - subdomain.conf: | - - server { - listen 80; - listen [::]:80; - - server_name ~^(?.+)\.dev-lifeline\.com$; - - if ($http_x_forwarded_proto != 'https') { - return 301 https://$host$request_uri; - } - - root /usr/share/nginx/subdomain/$subdomain; - index index.php index.html index.htm; - sendfile off; - - # Security - Hide nginx version number in error pages and Server header - server_tokens off; - - # Add stdout logging - error_log /dev/stdout error; - access_log /dev/stdout; - - # reduce the data that needs to be sent over network - gzip on; - gzip_min_length 10240; - gzip_proxied expired no-cache no-store private auth; - gzip_types text/plain text/css text/xml application/json text/javascript application/x-javascript application/xml; - gzip_disable "MSIE [1-6]\."; - add_header 'Content-Security-Policy' 'upgrade-insecure-requests'; - add_header X-Cache-Status $upstream_cache_status; - add_header Cache-Control "public"; - - #Cache everything by default - set $no_cache 0; - - #Don't cache POST requests - if ($request_method = POST) - { - set $no_cache 1; - } - - #Don't cache if the URL contains a query string - if ($query_string != "") - { - set $no_cache 1; - } - - #Don't cache the following URLs - if ($request_uri ~* "/(administrator/|wp-login.php)") - { - set $no_cache 1; - } - - #Don't cache if there is a cookie called PHPSESSID - if ($http_cookie = "PHPSESSID") - { - set $no_cache 1; - } - - location / { - # First attempt to serve request as file, then - # as directory, then fall back to index.php - try_files $uri $uri/ /index.php?$args; - proxy_set_header X-Forwarded-Proto $scheme; - fastcgi_param SUBDOMAIN $subdomain; # $_SERVER["SUBDOMAIN"] - include fastcgi_params; - fastcgi_cache MYAPP; - fastcgi_cache_valid 200 302 60m; - fastcgi_cache_valid 301 1h; - fastcgi_cache_valid any 1m; - fastcgi_cache_bypass $no_cache; - fastcgi_no_cache $no_cache; - - } - - # redirect server error pages to the static page /50x.html - # - error_page 500 502 503 504 /50x.html; - location = /50x.html { - root /usr/share/nginx/subdomain/$subdomain; - } - - # pass the PHP scripts to FastCGI server listening on socket - # - #~ \.php$ - location ~ [^/]\.php(/|$) { - proxy_set_header X-Forwarded-Proto $scheme; - try_files $uri $uri/ /index.php?$args; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - fastcgi_split_path_info ^(.+\.php)(/.+)$; - - fastcgi_pass unix:/run/php/php7.4-fpm.sock; - fastcgi_index index.php; - include fastcgi_params; - fastcgi_param SUBDOMAIN $subdomain; # $_SERVER["SUBDOMAIN"] - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_param PATH_INFO $fastcgi_path_info; - fastcgi_cache MYAPP; - fastcgi_cache_valid 200 302 60m; - fastcgi_cache_valid 301 1h; - fastcgi_cache_valid any 1m; - fastcgi_cache_bypass $no_cache; - fastcgi_no_cache $no_cache; - } - - location ~* \.(jpg|jpeg|gif|png|css|js|ico|xml)$ { - proxy_set_header X-Forwarded-Proto $scheme; - fastcgi_cache MYAPP; - fastcgi_cache_valid 200 302 60m; - fastcgi_cache_valid 301 1h; - fastcgi_cache_valid any 1m; - proxy_cache_background_update on; - proxy_cache_lock on; - } - - # deny access to . files, for security - # - location ~ /\. { - log_not_found off; - deny all; - } - - } - - localhost.conf: | - - server { - listen 80; - listen [::]:80; - - server_name localhost; - root /usr/share/nginx/subdomain/www; - index index.php index.html index.htm; - - sendfile off; - server_tokens off; - error_log /dev/stdout error; - access_log /dev/stdout; - - # reduce the data that needs to be sent over network - gzip on; - gzip_min_length 10240; - gzip_proxied expired no-cache no-store private auth; - gzip_types text/plain text/css text/xml application/json text/javascript application/x-javascript application/xml; - gzip_disable "MSIE [1-6]\."; - add_header 'Content-Security-Policy' 'upgrade-insecure-requests'; - add_header X-Cache-Status $upstream_cache_status; - add_header Cache-Control "public"; - - #Cache everything by default - set $no_cache 0; - - #Don't cache POST requests - if ($request_method = POST) - { - set $no_cache 1; - } - - #Don't cache if the URL contains a query string - if ($query_string != "") - { - set $no_cache 1; - } - - #Don't cache the following URLs - if ($request_uri ~* "/(administrator/|wp-login.php)") - { - set $no_cache 1; - } - - #Don't cache if there is a cookie called PHPSESSID - if ($http_cookie = "PHPSESSID") - { - set $no_cache 1; - } - - location / { - # First attempt to serve request as file, then - # as directory, then fall back to index.php - try_files $uri $uri/ /index.php?$args; - proxy_set_header X-Forwarded-Proto $scheme; - fastcgi_param SUBDOMAIN www; # $_SERVER["SUBDOMAIN"] - include fastcgi_params; - fastcgi_cache MYAPP; - fastcgi_cache_valid 200 302 60m; - fastcgi_cache_valid 301 1h; - fastcgi_cache_valid any 1m; - fastcgi_cache_bypass $no_cache; - fastcgi_no_cache $no_cache; - - } - - # redirect server error pages to the static page /50x.html - # - error_page 500 502 503 504 /50x.html; - location = /50x.html { - root /usr/share/nginx/subdomain/www; - } - - # pass the PHP scripts to FastCGI server listening on socket - # - #~ \.php$ - location ~ [^/]\.php(/|$) { - proxy_set_header X-Forwarded-Proto $scheme; - try_files $uri $uri/ /index.php?$args; - if (!-f $document_root$fastcgi_script_name) { - return 404; - } - fastcgi_split_path_info ^(.+\.php)(/.+)$; - - fastcgi_pass unix:/run/php/php7.4-fpm.sock; - fastcgi_index index.php; - include fastcgi_params; - fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; - fastcgi_param PATH_INFO $fastcgi_path_info; - fastcgi_param SUBDOMAIN www; # $_SERVER["SUBDOMAIN"] - fastcgi_cache MYAPP; - fastcgi_cache_valid 200 302 60m; - fastcgi_cache_valid 301 1h; - fastcgi_cache_valid any 1m; - fastcgi_cache_bypass $no_cache; - fastcgi_no_cache $no_cache; - } - - location ~* \.(jpg|jpeg|gif|png|css|js|ico|xml)$ { - proxy_set_header X-Forwarded-Proto $scheme; - fastcgi_cache MYAPP; - fastcgi_cache_valid 200 302 60m; - fastcgi_cache_valid 301 1h; - fastcgi_cache_valid any 1m; - proxy_cache_background_update on; - proxy_cache_lock on; - } - - # deny access to . files, for security - # - location ~ /\. { - log_not_found off; - deny all; - } - - } diff --git a/build/dev/lifeline-web-hpa.yml b/build/dev/lifeline-web-hpa.yml deleted file mode 100644 index fb74c086..00000000 --- a/build/dev/lifeline-web-hpa.yml +++ /dev/null @@ -1,13 +0,0 @@ -apiVersion: autoscaling/v1 -kind: HorizontalPodAutoscaler -metadata: - name: lifeline-web-hpa - namespace: lifeline-web -spec: - scaleTargetRef: - apiVersion: apps/v1 - kind: Deployment - name: lifeline-web - minReplicas: 1 - maxReplicas: 1 - targetCPUUtilizationPercentage: 70 diff --git a/build/dev/pvc.yml b/build/dev/pvc.yml index 3dd52c8c..b1815898 100755 --- a/build/dev/pvc.yml +++ b/build/dev/pvc.yml @@ -1,8 +1,8 @@ apiVersion: v1 kind: PersistentVolumeClaim metadata: - name: efs-claim-lifeline - namespace: lifeline-web + name: efs-claim-medicalalert + namespace: medicalalert-web spec: accessModes: - ReadWriteMany @@ -14,8 +14,8 @@ spec: apiVersion: v1 kind: PersistentVolumeClaim metadata: - name: efs-claim-lifeline-dev05 - namespace: lifeline-web + name: efs-claim-medicalalert-dev05 + namespace: medicalalert-web spec: accessModes: - ReadWriteMany @@ -27,8 +27,8 @@ spec: apiVersion: v1 kind: PersistentVolumeClaim metadata: - name: efs-claim-lifeline-dev04 - namespace: lifeline-web + name: efs-claim-medicalalert-dev04 + namespace: medicalalert-web spec: accessModes: - ReadWriteMany @@ -40,8 +40,8 @@ spec: apiVersion: v1 kind: PersistentVolumeClaim metadata: - name: efs-claim-lifeline-dev03 - namespace: lifeline-web + name: efs-claim-medicalalert-dev03 + namespace: medicalalert-web spec: accessModes: - ReadWriteMany @@ -53,8 +53,8 @@ spec: apiVersion: v1 kind: PersistentVolumeClaim metadata: - name: efs-claim-lifeline-dev02 - namespace: lifeline-web + name: efs-claim-medicalalert-dev02 + namespace: medicalalert-web spec: accessModes: - ReadWriteMany @@ -66,8 +66,8 @@ spec: apiVersion: v1 kind: PersistentVolumeClaim metadata: - name: efs-claim-lifeline-dev01 - namespace: lifeline-web + name: efs-claim-medicalalert-dev01 + namespace: medicalalert-web spec: accessModes: - ReadWriteMany diff --git a/build/dev/secrets.yaml b/build/dev/secrets.yaml index cdb4f2b6..fef92fb2 100644 --- a/build/dev/secrets.yaml +++ b/build/dev/secrets.yaml @@ -1,12 +1,13 @@ apiVersion: v1 +data: + CACHE_PASSWORD: UU1FRVQ0ZG15VlE4OXZKWUFSUjdQQXhoUU1FRVQ0ZG15VlE4OXZKWUFSUjdQQXho + DB_PASSWORD: cGFudGhlb24= + TOKEN: QVRDVFQzeEZmR04wbXpCZjF4NDVaSkVIa3l0eWVYX0NvWXJRSHJwbHk4RlUzWG1wTjZHcGNjNHU5RzB5bW5DMzg2SjFQUTFSR3Z3VG10QWN3WUVmc2s5MGt4UDQxVEc3Q0xhSWwtYUs2cFRTY0NqYVVQcUdOY3phWEFxdVFXaGhlWjc5d1FXa3dTd2J6NDVhY1Z4T21ZZWtpTFlIU21TMTBsWV9ibF9wZ1ZxbG9kMVFxSy1uYmV3PTg4NjIyMEM3 kind: Secret metadata: - name: lifeline-web-secrets - namespace: lifeline-web + annotations: labels: - app: lifeline-web + app: medicalalert-web + name: medicalalert-web-secrets + namespace: medicalalert-web type: Opaque -data: - DB_PASSWORD: cGFudGhlb24= - CACHE_PASSWORD: UU1FRVQ0ZG15VlE4OXZKWUFSUjdQQXhoUU1FRVQ0ZG15VlE4OXZKWUFSUjdQQXho - TOKEN: QVRDVFQzeEZmR04wbXpCZjF4NDVaSkVIa3l0eWVYX0NvWXJRSHJwbHk4RlUzWG1wTjZHcGNjNHU5RzB5bW5DMzg2SjFQUTFSR3Z3VG10QWN3WUVmc2s5MGt4UDQxVEc3Q0xhSWwtYUs2cFRTY0NqYVVQcUdOY3phWEFxdVFXaGhlWjc5d1FXa3dTd2J6NDVhY1Z4T21ZZWtpTFlIU21TMTBsWV9ibF9wZ1ZxbG9kMVFxSy1uYmV3PTg4NjIyMEM3 diff --git a/build/dev/service.yml b/build/dev/service.yml index aebe136d..0bb56c91 100755 --- a/build/dev/service.yml +++ b/build/dev/service.yml @@ -1,16 +1,16 @@ apiVersion: v1 kind: Service metadata: - name: lifeline-web - namespace: lifeline-web + name: medicalalert-web + namespace: medicalalert-web labels: - app: lifeline-web + app: medicalalert-web spec: type: NodePort selector: - app: lifeline-web + app: medicalalert-web ports: - protocol: TCP port: 80 targetPort: 80 - nodePort: 30843 + nodePort: 30846 diff --git a/build/dev/medicalalert-web-default-conf-cm.yaml b/build/dev/web-default-conf-cm.yaml old mode 100755 new mode 100644 similarity index 100% rename from build/dev/medicalalert-web-default-conf-cm.yaml rename to build/dev/web-default-conf-cm.yaml diff --git a/build/dev/medicalalert-web-hpa.yml b/build/dev/web-hpa.yml old mode 100755 new mode 100644 similarity index 89% rename from build/dev/medicalalert-web-hpa.yml rename to build/dev/web-hpa.yml index baf41dbf..86625d72 --- a/build/dev/medicalalert-web-hpa.yml +++ b/build/dev/web-hpa.yml @@ -2,7 +2,7 @@ apiVersion: autoscaling/v1 kind: HorizontalPodAutoscaler metadata: name: medicalalert-web-hpa - namespace: caresage-web + namespace: medicalalert-web spec: scaleTargetRef: apiVersion: apps/v1