Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Moving cwagent check outside of celery" #2198

Merged
merged 1 commit into from
Nov 17, 2023
Merged

Revert "Moving cwagent check outside of celery" #2198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 0 additions & 31 deletions base/notify-celery-email-send/celery-email-send-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,37 +21,6 @@ spec:
labels:
app: celery-email-send
spec:
initContainers:
- name: wait-cwagent-ready
env:
- name: STATSD_HOST
valueFrom:
fieldRef:
fieldPath: spec.nodeName
image: api
imagePullPolicy: IfNotPresent
command: ["sh", "-c"]
args:
- >-
if [ -n "${STATSD_HOST}" ]; then
echo "Initializing... Waiting for CWAgent to become ready within the next 30 seconds."
timeout=30
while [ $timeout -gt 0 ]; do
if nc -vz "$STATSD_HOST" 25888; then
echo "CWAgent is Ready."
break
else
echo "Waiting for CWAgent to become ready."
sleep 1
timeout=$((timeout - 1))
fi
done

if [ $timeout -eq 0 ]; then
echo "Timeout reached. CWAgent did not become ready in 30 seconds."
exit 1
fi
fi
containers:
- image: api
imagePullPolicy: Always
Expand Down
31 changes: 0 additions & 31 deletions base/notify-celery-main/celery-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,37 +23,6 @@ spec:
app: celery
# profile: fargate
spec:
initContainers:
- name: wait-cwagent-ready
env:
- name: STATSD_HOST
valueFrom:
fieldRef:
fieldPath: spec.nodeName
image: api
imagePullPolicy: IfNotPresent
command: ["sh", "-c"]
args:
- >-
if [ -n "${STATSD_HOST}" ]; then
echo "Initializing... Waiting for CWAgent to become ready within the next 30 seconds."
timeout=30
while [ $timeout -gt 0 ]; do
if nc -vz "$STATSD_HOST" 25888; then
echo "CWAgent is Ready."
break
else
echo "Waiting for CWAgent to become ready."
sleep 1
timeout=$((timeout - 1))
fi
done

if [ $timeout -eq 0 ]; then
echo "Timeout reached. CWAgent did not become ready in 30 seconds."
exit 1
fi
fi
containers:
- image: api
imagePullPolicy: Always
Expand Down
251 changes: 110 additions & 141 deletions base/notify-celery-sms-send/celery-sms-send-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,148 +21,117 @@ spec:
labels:
app: celery-sms-send
spec:
initContainers:
- name: wait-cwagent-ready
env:
- name: STATSD_HOST
valueFrom:
fieldRef:
fieldPath: spec.nodeName
image: api
imagePullPolicy: IfNotPresent
command: ["sh", "-c"]
args:
- >-
if [ -n "${STATSD_HOST}" ]; then
echo "Initializing... Waiting for CWAgent to become ready within the next 30 seconds."
timeout=30
while [ $timeout -gt 0 ]; do
if nc -vz "$STATSD_HOST" 25888; then
echo "CWAgent is Ready."
break
else
echo "Waiting for CWAgent to become ready."
sleep 1
timeout=$((timeout - 1))
fi
done

if [ $timeout -eq 0 ]; then
echo "Timeout reached. CWAgent did not become ready in 30 seconds."
exit 1
fi
fi
containers:
- image: api
imagePullPolicy: Always
name: celery-sms-send
env:
- name: ADMIN_BASE_URL
value: https://$(BASE_DOMAIN)
- name: ADMIN_CLIENT_SECRET
value: '$(ADMIN_CLIENT_SECRET)'
- name: ALLOW_HTML_SERVICE_IDS
value: '$(ALLOW_HTML_SERVICE_IDS)'
- name: API_HOST_NAME
value: '$(API_HOST_NAME)'
- name: ASSET_DOMAIN
value: '$(ASSET_DOMAIN)'
- name: ASSET_UPLOAD_BUCKET_NAME
value: '$(ASSET_UPLOAD_BUCKET_NAME)'
- name: AWS_PINPOINT_REGION
value: '$(AWS_PINPOINT_REGION)'
- name: AWS_REGION
value: '$(AWS_REGION)'
- name: BATCH_INSERTION_CHUNK_SIZE
value: '$(BATCH_INSERTION_CHUNK_SIZE)'
- name: BULK_SEND_TEST_SERVICE_ID
value: '$(BULK_SEND_TEST_SERVICE_ID)'
- name: CELERY_CONCURRENCY
value: '$(CELERY_CONCURRENCY)'
- name: CELERY_DELIVER_SMS_RATE_LIMIT
value: '$(CELERY_DELIVER_SMS_RATE_LIMIT)'
- name: CSV_UPLOAD_BUCKET_NAME
value: '$(CSV_UPLOAD_BUCKET_NAME)'
- name: DANGEROUS_SALT
value: '$(DANGEROUS_SALT)'
- name: DOCUMENT_DOWNLOAD_API_HOST
value: 'http://document-download-api.notification-canada-ca.svc.cluster.local:7000'
- name: FF_SPIKE_SMS_DAILY_LIMIT
value: '$(FF_SPIKE_SMS_DAILY_LIMIT)'
- name: FF_SMS_PARTS_UI
value: '$(FF_SMS_PARTS_UI)'
- name: FF_EMAIL_DAILY_LIMIT
value: '$(FF_EMAIL_DAILY_LIMIT)'
- name: FIDO2_DOMAIN
value: '$(FIDO2_DOMAIN)'
- name: HC_EN_SERVICE_ID
value: '$(HC_EN_SERVICE_ID)'
- name: HC_FR_SERVICE_ID
value: '$(HC_FR_SERVICE_ID)'
- name: NOTIFY_EMAIL_DOMAIN
value: '$(BASE_DOMAIN)'
- name: NOTIFY_ENVIRONMENT
value: '$(ENVIRONMENT)'
- name: NOTIFICATION_QUEUE_PREFIX
value: 'eks-notification-canada-ca'
- name: REDIS_URL
value: '$(REDIS_URL)'
- name: REDIS_PUBLISH_URL
value: '$(REDIS_PUBLISH_URL)'
- name: REDIS_ENABLED
value: '1'
- name: SECRET_KEY
value: '$(SECRET_KEY)'
- name: SENDGRID_API_KEY
value: '$(SENDGRID_API_KEY)'
- name: SQLALCHEMY_DATABASE_URI
value: '$(POSTGRES_SQL)'
- name: SQLALCHEMY_DATABASE_READER_URI
value: '$(SQLALCHEMY_DATABASE_READER_URI)'
- name: STATSD_HOST
valueFrom:
fieldRef:
fieldPath: spec.nodeName
- name: TWILIO_ACCOUNT_SID
value: '$(TWILIO_ACCOUNT_SID)'
- name: TWILIO_AUTH_TOKEN
value: '$(TWILIO_AUTH_TOKEN)'
- name: TWILIO_FROM_NUMBER
value: '$(TWILIO_FROM_NUMBER)'
- name: AWS_US_TOLL_FREE_NUMBER
value: '$(AWS_US_TOLL_FREE_NUMBER)'
- name: SENTRY_URL
value: '$(SENTRY_URL)'
- name: NEW_RELIC_APP_NAME
value: 'notification-celery-$(ENVIRONMENT)'
- name: NEW_RELIC_DISTRIBUTED_TRACING_ENABLED
value: 'true'
- name: NEW_RELIC_LICENSE_KEY
value: '$(NEW_RELIC_LICENSE_KEY)'
- name: NEW_RELIC_MONITOR_MODE
value: '$(NEW_RELIC_MONITOR_MODE)'
- name: FF_CLOUDWATCH_METRICS_ENABLED
value: 'True'
- name: FF_BOUNCE_RATE_V1
value: '$(FF_BOUNCE_RATE_V1)'
- name: FF_BOUNCE_RATE_BACKEND
value: '$(FF_BOUNCE_RATE_BACKEND)'
lifecycle:
preStop:
exec:
command:
- /bin/bash
- -c
- /app/scripts/run_celery_exit.sh
command: ["/bin/sh"]
args: ["-c", "sh /app/scripts/run_celery_send_sms.sh"]
resources:
requests:
cpu: "100m"
memory: "500Mi"
limits:
cpu: "550m"
memory: "1024Mi"
- image: api
imagePullPolicy: Always
name: celery-sms-send
env:
- name: ADMIN_BASE_URL
value: https://$(BASE_DOMAIN)
- name: ADMIN_CLIENT_SECRET
value: '$(ADMIN_CLIENT_SECRET)'
- name: ALLOW_HTML_SERVICE_IDS
value: '$(ALLOW_HTML_SERVICE_IDS)'
- name: API_HOST_NAME
value: '$(API_HOST_NAME)'
- name: ASSET_DOMAIN
value: '$(ASSET_DOMAIN)'
- name: ASSET_UPLOAD_BUCKET_NAME
value: '$(ASSET_UPLOAD_BUCKET_NAME)'
- name: AWS_PINPOINT_REGION
value: '$(AWS_PINPOINT_REGION)'
- name: AWS_REGION
value: '$(AWS_REGION)'
- name: BATCH_INSERTION_CHUNK_SIZE
value: '$(BATCH_INSERTION_CHUNK_SIZE)'
- name: BULK_SEND_TEST_SERVICE_ID
value: '$(BULK_SEND_TEST_SERVICE_ID)'
- name: CELERY_CONCURRENCY
value: '$(CELERY_CONCURRENCY)'
- name: CELERY_DELIVER_SMS_RATE_LIMIT
value: '$(CELERY_DELIVER_SMS_RATE_LIMIT)'
- name: CSV_UPLOAD_BUCKET_NAME
value: '$(CSV_UPLOAD_BUCKET_NAME)'
- name: DANGEROUS_SALT
value: '$(DANGEROUS_SALT)'
- name: DOCUMENT_DOWNLOAD_API_HOST
value: 'http://document-download-api.notification-canada-ca.svc.cluster.local:7000'
- name: FF_SPIKE_SMS_DAILY_LIMIT
value: '$(FF_SPIKE_SMS_DAILY_LIMIT)'
- name: FF_SMS_PARTS_UI
value: '$(FF_SMS_PARTS_UI)'
- name: FF_EMAIL_DAILY_LIMIT
value: '$(FF_EMAIL_DAILY_LIMIT)'
- name: FIDO2_DOMAIN
value: '$(FIDO2_DOMAIN)'
- name: HC_EN_SERVICE_ID
value: '$(HC_EN_SERVICE_ID)'
- name: HC_FR_SERVICE_ID
value: '$(HC_FR_SERVICE_ID)'
- name: NOTIFY_EMAIL_DOMAIN
value: '$(BASE_DOMAIN)'
- name: NOTIFY_ENVIRONMENT
value: '$(ENVIRONMENT)'
- name: NOTIFICATION_QUEUE_PREFIX
value: 'eks-notification-canada-ca'
- name: REDIS_URL
value: '$(REDIS_URL)'
- name: REDIS_PUBLISH_URL
value: '$(REDIS_PUBLISH_URL)'
- name: REDIS_ENABLED
value: '1'
- name: SECRET_KEY
value: '$(SECRET_KEY)'
- name: SENDGRID_API_KEY
value: '$(SENDGRID_API_KEY)'
- name: SQLALCHEMY_DATABASE_URI
value: '$(POSTGRES_SQL)'
- name: SQLALCHEMY_DATABASE_READER_URI
value: '$(SQLALCHEMY_DATABASE_READER_URI)'
- name: STATSD_HOST
valueFrom:
fieldRef:
fieldPath: spec.nodeName
- name: TWILIO_ACCOUNT_SID
value: '$(TWILIO_ACCOUNT_SID)'
- name: TWILIO_AUTH_TOKEN
value: '$(TWILIO_AUTH_TOKEN)'
- name: TWILIO_FROM_NUMBER
value: '$(TWILIO_FROM_NUMBER)'
- name: AWS_US_TOLL_FREE_NUMBER
value: '$(AWS_US_TOLL_FREE_NUMBER)'
- name: SENTRY_URL
value: '$(SENTRY_URL)'
- name: NEW_RELIC_APP_NAME
value: 'notification-celery-$(ENVIRONMENT)'
- name: NEW_RELIC_DISTRIBUTED_TRACING_ENABLED
value: 'true'
- name: NEW_RELIC_LICENSE_KEY
value: '$(NEW_RELIC_LICENSE_KEY)'
- name: NEW_RELIC_MONITOR_MODE
value: '$(NEW_RELIC_MONITOR_MODE)'
- name: FF_CLOUDWATCH_METRICS_ENABLED
value: 'True'
- name: FF_BOUNCE_RATE_V1
value: '$(FF_BOUNCE_RATE_V1)'
- name: FF_BOUNCE_RATE_BACKEND
value: '$(FF_BOUNCE_RATE_BACKEND)'
lifecycle:
preStop:
exec:
command:
- /bin/bash
- -c
- /app/scripts/run_celery_exit.sh
command: ["/bin/sh"]
args: ["-c", "sh /app/scripts/run_celery_send_sms.sh"]
resources:
requests:
cpu: "100m"
memory: "500Mi"
limits:
cpu: "550m"
memory: "1024Mi"
dnsPolicy: ClusterFirst
restartPolicy: Always
schedulerName: default-scheduler
Expand Down