Commit e0aeb54d authored by Andres Anaya Amariels's avatar Andres Anaya Amariels 🚀
Browse files

refactor: add celery-beat and celery-worker to deployment configurations

parent 29d7c8d1

capif/.gitlab-ci.yml

+11 −1
Original line number Diff line number Diff line
@@ -601,7 +601,7 @@ deploy_ocf_main: 
        "ocf-api-provider-management" "ocf-auditing-api-logs" 

        "ocf-discover-service-api" "ocf-events" "ocf-helper" 

        "ocf-publish-service-api" "ocf-register" "ocf-routing-info" 

        "ocf-security" "celery")

        "ocf-security" "celery-beat" "celery-worker")

      

      for chart in "${charts[@]}"; do

        yq e -i ".appVersion = \"main\"" "helm/capif/charts/$chart/Chart.yaml"
@@ -740,6 +740,16 @@ deploy_ocf_main: 
      --set mongo-express.ingress.hosts[0].paths[0].pathType="Prefix" \

      --set redis.image.repository=labs.etsi.org:5050/ocf/capif/redis \

      --set redis.image.tag=7.4.2-alpine \

      --set celery-beat.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/celery \

      --set celery-beat.image.tag=$CI_COMMIT_REF_SLUG \

      --set celery-beat.env.celeryModel=beat \

      --set celery-beat.env.redisHostname=redis \

      --set celery-beat.env.redisPort=6379 \

      --set celery-worker.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/celery \

      --set celery-worker.image.tag=$CI_COMMIT_REF_SLUG \

      --set celery-worker.env.celeryModel=worker \

      --set celery-worker.env.redisHostname=redis \

      --set celery-worker.env.redisPort=6379 \

      --wait --timeout=10m --create-namespace --atomic



main_rf_testing:

capif/templates/cd-deploy-ocf.gitlab-ci.yml

+22 −2
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ deploy_ocf_staging: 
        "ocf-api-provider-management" "ocf-auditing-api-logs" 

        "ocf-discover-service-api" "ocf-events" "ocf-helper" 

        "ocf-publish-service-api" "ocf-register" "ocf-routing-info" 

        "ocf-security" "celery")

        "ocf-security" "celery-beat" "celery-worker")

      

      for chart in "${charts[@]}"; do

        yq e -i ".appVersion = \"$IMAGE_TAG_STAGING\"" "helm/capif/charts/$chart/Chart.yaml"
@@ -245,6 +245,16 @@ deploy_ocf_staging: 
      --set mongo-express.ingress.hosts[0].paths[0].pathType="Prefix" \

      --set redis.image.repository=labs.etsi.org:5050/ocf/capif/redis \

      --set redis.image.tag=7.4.2-alpine \

      --set celery-beat.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/celery \

      --set celery-beat.image.tag=$CI_COMMIT_REF_SLUG \

      --set celery-beat.env.celeryModel=beat \

      --set celery-beat.env.redisHost=redis \

      --set celery-beat.env.redisPort=6379 \

      --set celery-worker.image.repository=$CI_REGISTRY/ocf/capif/$CI_COMMIT_REF_SLUG/celery \

      --set celery-worker.image.tag=$CI_COMMIT_REF_SLUG \

      --set celery-worker.env.celeryModel=worker \

      --set celery-worker.env.redisHost=redis \

      --set celery-worker.env.redisPort=6379 \

      --wait --timeout=10m --create-namespace --atomic



delete_ocf_staging:
@@ -298,7 +308,7 @@ deploy_ocf_oficial_staging: 
        "ocf-api-provider-management" "ocf-auditing-api-logs" 

        "ocf-discover-service-api" "ocf-events" "ocf-helper" 

        "ocf-publish-service-api" "ocf-register" "ocf-routing-info" 

        "ocf-security" "celery")

        "ocf-security" "celery-beat" "celery-worker")

      

      for chart in "${charts[@]}"; do

        yq e -i ".appVersion = \"staging\"" "helm/capif/charts/$chart/Chart.yaml"
@@ -435,6 +445,16 @@ deploy_ocf_oficial_staging: 
      --set mongo-express.ingress.hosts[0].paths[0].pathType="Prefix" \

      --set redis.image.repository=labs.etsi.org:5050/ocf/capif/redis \

      --set redis.image.tag=7.4.2-alpine \

      --set celery-beat.image.repository=$CI_REGISTRY/ocf/capif/staging/celery \

      --set celery-beat.image.tag=staging \

      --set celery-beat.env.celeryModel=beat \

      --set celery-beat.env.redisHost=redis \

      --set celery-beat.env.redisPort=6379 \

      --set celery-worker.image.repository=$CI_REGISTRY/ocf/capif/staging/celery \

      --set celery-worker.image.tag=staging \

      --set celery-worker.env.celeryModel=worker \

      --set celery-worker.env.redisHost=redis \

      --set celery-worker.env.redisPort=6379 \

      --wait --timeout=10m --create-namespace --atomic



## dev ###

capif/templates/cicd-deploy-release.gitlab-ci.yml

+12 −2
Original line number Diff line number Diff line
@@ -149,7 +149,7 @@ deploy_ocf_prod: 
        "ocf-api-provider-management" "ocf-auditing-api-logs" 

        "ocf-discover-service-api" "ocf-events" "ocf-helper" 

        "ocf-publish-service-api" "ocf-register" "ocf-routing-info" 

        "ocf-security" "celery")

        "ocf-security" "celery-beat" "celery-worker")

      

      for chart in "${charts[@]}"; do

        yq e -i ".appVersion = \"$CI_COMMIT_TAG\"" "helm/capif/charts/$chart/Chart.yaml"
@@ -274,4 +274,14 @@ deploy_ocf_prod: 
      --set mongo-express.ingress.hosts[0].paths[0].pathType="Prefix" \

      --set redis.image.repository=labs.etsi.org:5050/ocf/capif/redis \

      --set redis.image.tag=7.4.2-alpine \

      --set celery-beat.image.repository=$CI_REGISTRY/ocf/capif/$PATH_PROD/celery \

      --set celery-beat.image.tag=$CI_COMMIT_TAG \

      --set celery-beat.env.celeryModel=beat \

      --set celery-beat.env.redisHost=redis \

      --set celery-beat.env.redisPort=6379 \

      --set celery-worker.image.repository=$CI_REGISTRY/ocf/capif/$PATH_PROD/celery \

      --set celery-worker.image.tag=$CI_COMMIT_TAG \

      --set celery-worker.env.celeryModel=worker \

      --set celery-worker.env.redisHost=redis \

      --set celery-worker.env.redisPort=6379 \

      --wait --timeout=10m --create-namespace --atomic
 
 No newline at end of file