update dev

2024-06-14 01:26:36 +05:30
parent c2ecee3b10
commit 1e22f549ca
11 changed files with 74 additions and 73 deletions
--- a/bitbucket-pipelines.yml
+++ b/bitbucket-pipelines.yml
@@ -474,8 +474,8 @@ pipelines:
        #- chmod 755 ./validation.sh && ./validation.sh default
        - echo "make sure that release version file and plan has been added to the release repo"
        - source release
-        - export MANIFEST=$(aws ecr batch-get-image --repository-name weareconnectamerica-web --image-ids imageTag=$VERSION --output json | jq --raw-output --join-output '.images[0].imageManifest')
-        - aws ecr put-image --repository-name weareconnectamerica-web --image-tag $RELEASE --image-manifest "$MANIFEST" && echo ------ image $VERSION has been retagged as $RELEASE || exit 9
+        - export MANIFEST=$(aws ecr batch-get-image --repository-name $BITBUCKET_REPO_SLUG --image-ids imageTag=$VERSION --output json | jq --raw-output --join-output '.images[0].imageManifest')
+        - aws ecr put-image --repository-name $BITBUCKET_REPO_SLUG --image-tag $RELEASE --image-manifest "$MANIFEST" && echo ------ image $VERSION has been retagged as $RELEASE || exit 9
        - echo "export VERSION=$RELEASE" >> setenv.sh
        - echo "export ENV=stage" >> setenv.sh
        artifacts: # define the artifacts to be passed to each future step
@@ -519,7 +519,7 @@ pipelines:
        - cp -rf ./common-scripts-web/* .  &&  ls -lrth && export ENV=dev
        - chmod 755 ./validation.sh && ./validation.sh default

-        - export IMAGE="weareconnectamerica-web" && export VERSION=$BITBUCKET_BUILD_NUMBER
+        - export IMAGE="$BITBUCKET_REPO_SLUG" && export VERSION=$BITBUCKET_BUILD_NUMBER
        - aws ecr get-login-password --region us-east-1 | docker login --username AWS --password-stdin 716593996126.dkr.ecr.us-east-1.amazonaws.com
        - docker build -t ${IMAGE} .
        - docker tag ${IMAGE} ${IMAGE}:${VERSION}
--- a/build/dev/configmap.yaml
+++ b/build/dev/configmap.yaml
@@ -1,17 +1,17 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: medicalalert-web-cm
-  namespace: medicalalert-web
+  name: weareconnectamerica-web-cm
+  namespace: weareconnectamerica-web
  labels:
-    app: medicalalert-web
+    app: weareconnectamerica-web
 data:
-  DB_HOST: dev-medicalalert-ecommerce.c5om7w6xopq1.us-east-1.rds.amazonaws.com
+  DB_HOST: dev-weareconnectamerica-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-medicalalert.cqsmse.use1.cache.amazonaws.com
+  CACHE_HOST: master.redis-cache-all-be-caresage.cqsmse.use1.cache.amazonaws.com
  CACHE_PORT: "6379"
  DB_NAME: "www"
  DB_USER: "pantheon"
--- a/build/dev/deployment.tpl
+++ b/build/dev/deployment.tpl
@@ -4,16 +4,16 @@ metadata:
  annotations:
    deployment.kubernetes.io/revision: "11"
  labels:
-    app: medicalalert-web
-  name: medicalalert-web
-  namespace: medicalalert-web
+    app: weareconnectamerica-web
+  name: weareconnectamerica-web
+  namespace: weareconnectamerica-web
 spec:
  progressDeadlineSeconds: 600
  replicas: 1
  revisionHistoryLimit: 10
  selector:
    matchLabels:
-      app: medicalalert-web
+      app: weareconnectamerica-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: medicalalert-web
+        app: weareconnectamerica-web
    spec:
      affinity:
        nodeAffinity:
@@ -41,7 +41,7 @@ spec:
      - env:
        - name: ENVIRONMENT
          value: "$ENV"
-        image: 716593996126.dkr.ecr.us-east-1.amazonaws.com/medicalalert-web:$VERSION
+        image: 716593996126.dkr.ecr.us-east-1.amazonaws.com/weareconnectamerica-web:$VERSION
        lifecycle:
          postStart:
            exec:
@@ -57,11 +57,11 @@ spec:
              - 'for j in dev02 dev03 dev04 dev05; do rm -rf /usr/share/nginx/subdomain/${${j}j}-web;done'
        envFrom:
        - secretRef:
-            name: medicalalert-web-secrets
+            name: weareconnectamerica-web-secrets
        - configMapRef:
-            name: medicalalert-web-cm
+            name: weareconnectamerica-web-cm
        imagePullPolicy: Always
-        name: medicalalert-web
+        name: weareconnectamerica-web
        ports:
        - containerPort: 80
          name: http
@@ -141,25 +141,25 @@ spec:
      volumes:
      - name: persistent-storage
        persistentVolumeClaim:
-          claimName: efs-claim-medicalalert
+          claimName: efs-claim-weareconnectamerica
      - name: persistent-storage-dev01
        persistentVolumeClaim:
-          claimName: efs-claim-medicalalert-dev01
+          claimName: efs-claim-weareconnectamerica-dev01
      - name: persistent-storage-dev02
        persistentVolumeClaim:
-          claimName: efs-claim-medicalalert-dev02
+          claimName: efs-claim-weareconnectamerica-dev02
      - name: persistent-storage-dev03
        persistentVolumeClaim:
-          claimName: efs-claim-medicalalert-dev03
+          claimName: efs-claim-weareconnectamerica-dev03
      - name: persistent-storage-dev04
        persistentVolumeClaim:
-          claimName: efs-claim-medicalalert-dev04
+          claimName: efs-claim-weareconnectamerica-dev04
      - name: persistent-storage-dev05
        persistentVolumeClaim:
-          claimName: efs-claim-medicalalert-dev05
+          claimName: efs-claim-weareconnectamerica-dev05
      - name: default-conf
        configMap:
          defaultMode: 420
-          name: medicalalert-web-default-conf-cm
+          name: weareconnectamerica-web-default-conf-cm
      - emptyDir: {}
        name: empty-dir
--- a/build/dev/jobs.tpl
+++ b/build/dev/jobs.tpl
@@ -2,16 +2,16 @@ apiVersion: batch/v1
 kind: Job
 metadata:
  name: common-jobs
-  namespace: medicalalert-web
+  namespace: weareconnectamerica-web
  labels:
-    app: medicalalert-web
+    app: weareconnectamerica-web
    rds: enable
 spec:
  ttlSecondsAfterFinished: 10
  template:
    metadata:
      labels:
-        app: medicalalert-web
+        app: weareconnectamerica-web
        rds: enable
    spec:
      affinity:
@@ -29,9 +29,9 @@ spec:
        image: ubuntu:latest
        envFrom:
        - secretRef:
-            name: medicalalert-web-secrets
+            name: weareconnectamerica-web-secrets
        - configMapRef:
-            name: medicalalert-web-cm
+            name: weareconnectamerica-web-cm
        command: ["bash"]
        args:
        - -c
@@ -47,4 +47,4 @@ spec:
      volumes:
      - name: persistent-storage
        persistentVolumeClaim:
-          claimName: efs-claim-medicalalert
+          claimName: efs-claim-weareconnectamerica
--- a/build/dev/pod.tpl
+++ b/build/dev/pod.tpl
@@ -2,9 +2,9 @@ apiVersion: v1
 kind: Pod
 metadata:
  name: common-job-pod
-  namespace: medicalalert-web
+  namespace: weareconnectamerica-web
  labels:
-    app: medicalalert-web
+    app: weareconnectamerica-web
    rds: enable
    pod: common
 spec:
@@ -23,9 +23,9 @@ spec:
        image: 716593996126.dkr.ecr.us-east-1.amazonaws.com/common-images:nginx-php-fpm-php74-v02
        envFrom:
        - secretRef:
-            name: medicalalert-web-secrets
+            name: weareconnectamerica-web-secrets
        - configMapRef:
-            name: medicalalert-web-cm
+            name: weareconnectamerica-web-cm
        command: ["bash"]
        args:
        - -c
@@ -51,20 +51,20 @@ spec:
      volumes:
      - name: persistent-storage
        persistentVolumeClaim:
-          claimName: efs-claim-medicalalert
+          claimName: efs-claim-weareconnectamerica
      - name: persistent-storage-dev01
        persistentVolumeClaim:
-          claimName: efs-claim-medicalalert-dev01
+          claimName: efs-claim-weareconnectamerica-dev01
      - name: persistent-storage-dev02
        persistentVolumeClaim:
-          claimName: efs-claim-medicalalert-dev02
+          claimName: efs-claim-weareconnectamerica-dev02
      - name: persistent-storage-dev03
        persistentVolumeClaim:
-          claimName: efs-claim-medicalalert-dev03
+          claimName: efs-claim-weareconnectamerica-dev03
      - name: persistent-storage-dev04
        persistentVolumeClaim:
-          claimName: efs-claim-medicalalert-dev04
+          claimName: efs-claim-weareconnectamerica-dev04
      - name: persistent-storage-dev05
        persistentVolumeClaim:
-          claimName: efs-claim-medicalalert-dev05
+          claimName: efs-claim-weareconnectamerica-dev05

--- a/build/dev/pvc.yml
+++ b/build/dev/pvc.yml
@@ -1,8 +1,8 @@
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: efs-claim-medicalalert
-  namespace: medicalalert-web
+  name: efs-claim-weareconnectamerica
+  namespace: weareconnectamerica-web
 spec:
  accessModes:
  - ReadWriteMany
@@ -14,8 +14,8 @@ spec:
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: efs-claim-medicalalert-dev05
-  namespace: medicalalert-web
+  name: efs-claim-weareconnectamerica-dev05
+  namespace: weareconnectamerica-web
 spec:
  accessModes:
  - ReadWriteMany
@@ -27,8 +27,8 @@ spec:
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: efs-claim-medicalalert-dev04
-  namespace: medicalalert-web
+  name: efs-claim-weareconnectamerica-dev04
+  namespace: weareconnectamerica-web
 spec:
  accessModes:
  - ReadWriteMany
@@ -40,8 +40,8 @@ spec:
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: efs-claim-medicalalert-dev03
-  namespace: medicalalert-web
+  name: efs-claim-weareconnectamerica-dev03
+  namespace: weareconnectamerica-web
 spec:
  accessModes:
  - ReadWriteMany
@@ -53,8 +53,8 @@ spec:
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: efs-claim-medicalalert-dev02
-  namespace: medicalalert-web
+  name: efs-claim-weareconnectamerica-dev02
+  namespace: weareconnectamerica-web
 spec:
  accessModes:
  - ReadWriteMany
@@ -66,8 +66,8 @@ spec:
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
-  name: efs-claim-medicalalert-dev01
-  namespace: medicalalert-web
+  name: efs-claim-weareconnectamerica-dev01
+  namespace: weareconnectamerica-web
 spec:
  accessModes:
  - ReadWriteMany
--- a/build/dev/resourcelimit.yaml
+++ b/build/dev/resourcelimit.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 kind: ResourceQuota
 metadata:
  name: storage-quota
-  namespace: medicalalert-web
+  namespace: weareconnectamerica-web
 spec:
  hard:
    requests.ephemeral-storage: "2Gi"
--- a/build/dev/secrets.yaml
+++ b/build/dev/secrets.yaml
@@ -1,13 +1,14 @@
 apiVersion: v1
 data:
  CACHE_PASSWORD: UU1FRVQ0ZG15VlE4OXZKWUFSUjdQQXhoUU1FRVQ0ZG15VlE4OXZKWUFSUjdQQXho
-  DB_PASSWORD: U2xCMU5IUjZWbXhFZHpkM2NqbHJkRGxMUlRaWFRYRTJiMmRHU1hWamMwST0=
-  TOKEN: QVRDVFQzeEZmR04wbXpCZjF4NDVaSkVIa3l0eWVYX0NvWXJRSHJwbHk4RlUzWG1wTjZHcGNjNHU5RzB5bW5DMzg2SjFQUTFSR3Z3VG10QWN3WUVmc2s5MGt4UDQxVEc3Q0xhSWwtYUs2cFRTY0NqYVVQcUdOY3phWEFxdVFXaGhlWjc5d1FXa3dTd2J6NDVhY1Z4T21ZZWtpTFlIU21TMTBsWV9ibF9wZ1ZxbG9kMVFxSy1uYmV3PTg4NjIyMEM3
+  DB_PASSWORD: cGFudGhlb24=
+  TOKEN: ATCTT3xFfGN0QB9TykGDCaz4-qkslFMICn9Naymf7qULefdhOvL6tm2bgEouNdQEwx84CyLnXKZsFCFD75rHvtEtHLdGSg9d4kvWU0QyodAc__PEFm-gA5RNUZ4p8LVwBQxAApw7E2GdrPPOCTNrFeAb-hjc16Y2d_eisYFd4cL738QPzEPEiNo=652F439D
+  
 kind: Secret
 metadata:
  annotations:
  labels:
-    app: medicalalert-web
-  name: medicalalert-web-secrets
-  namespace: medicalalert-web
+    app: weareconnectamerica-web
+  name: weareconnectamerica-web-secrets
+  namespace: weareconnectamerica-web
 type: Opaque
--- a/build/dev/service.yml
+++ b/build/dev/service.yml
@@ -1,14 +1,14 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: medicalalert-web
-  namespace: medicalalert-web
+  name: weareconnectamerica-web
+  namespace: weareconnectamerica-web
  labels:
-    app: medicalalert-web
+    app: weareconnectamerica-web
 spec:
  type: NodePort
  selector:
-    app: medicalalert-web
+    app: weareconnectamerica-web
  ports:
    - protocol: TCP
      port: 80
--- a/build/dev/web-default-conf-cm.yaml
+++ b/build/dev/web-default-conf-cm.yaml
@@ -1,10 +1,10 @@
 apiVersion: v1
 kind: ConfigMap
 metadata:
-  name: medicalalert-web-default-conf-cm
-  namespace: medicalalert-web
+  name: weareconnectamerica-web-default-conf-cm
+  namespace: weareconnectamerica-web
  labels:
-    app: medicalalert-web
+    app: weareconnectamerica-web
 data:
  default.conf: |

@@ -37,9 +37,9 @@ data:
        listen   80 default; ## listen for ipv4; this line is default and implied
        listen   [::]:80 default ipv6only=on; ## listen for ipv6

-        server_name dev-medicalalert.com "";
+        server_name dev-weareconnectamerica.com "";

-        return 301 https://www.dev-medicalalert.com$request_uri;
+        return 301 https://www.dev-weareconnectamerica.com$request_uri;

        root /usr/share/nginx/subdomain/www;
        index index.php index.html index.htm;
@@ -60,7 +60,7 @@ data:
        listen   80;
        listen   [::]:80;

-        server_name ~^(?<subdomain>.+)\.dev-medicalalert\.com$;
+        server_name ~^(?<subdomain>.+)\.dev-weareconnectamerica\.com$;

        if ($http_x_forwarded_proto != 'https') {
        return 301 https://$host$request_uri;
@@ -205,7 +205,7 @@ data:
        listen   80;
        listen   [::]:80;

-        server_name  www.dev-medicalalert.com;
+        server_name  www.dev-weareconnectamerica.com;

        if ($http_x_forwarded_proto != 'https') {
        return 301 https://$host$request_uri;
@@ -350,7 +350,7 @@ data:
        listen   80;
        listen   [::]:80;

-        server_name  dev01.dev-medicalalert.com;
+        server_name  dev01.dev-weareconnectamerica.com;

        if ($http_x_forwarded_proto != 'https') {
        return 301 https://$host$request_uri;
--- a/build/dev/web-hpa.yml
+++ b/build/dev/web-hpa.yml
@@ -1,13 +1,13 @@
 apiVersion: autoscaling/v2
 kind: HorizontalPodAutoscaler
 metadata:
-  name: medicalalert-web-hpa
-  namespace: medicalalert-web
+  name: weareconnectamerica-web-hpa
+  namespace: weareconnectamerica-web
 spec:
  scaleTargetRef:
    apiVersion: apps/v1
    kind: Deployment
-    name: medicalalert-web
+    name: weareconnectamerica-web
  minReplicas: 1
  maxReplicas: 1
  metrics: