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

Change 'rabbitmqctl status' to a wget | grep to save CPU #5009

Merged
merged 7 commits into from
Oct 18, 2019
Merged

Change 'rabbitmqctl status' to a wget | grep to save CPU #5009

Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e870550
Change 'rabbitmqctl status' to a wget | grep
wanderboessenkool Oct 14, 2019
038fd92
Properly escape quotes
wanderboessenkool Oct 14, 2019
d6134fb
Change /bin/ash to /bin/sh as requested by @shanecmd
wanderboessenkool Oct 17, 2019
9ab58e9
Change healthcheck from wget and grep to python with httplib
wanderboessenkool Oct 17, 2019
00c9d75
Move installtime hardcoded rabbitmq credentials to environment variab…
wanderboessenkool Oct 17, 2019
c49e64e
Make HTTPConnection import python 2,3 agnostic
wanderboessenkool Oct 17, 2019
8ecc1f3
Move python healthcheck script from probes to configMap
wanderboessenkool Oct 18, 2019
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
57 changes: 54 additions & 3 deletions installer/roles/kubernetes/templates/deployment.yml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ data:
[rabbitmq_management,rabbitmq_peer_discovery_k8s].
rabbitmq_definitions.json: |
{
"users":[{"name": "{{ rabbitmq_user }}", "password": "{{ rabbitmq_password }}", "tags": ""}],
"users":[{"name": "{{ rabbitmq_user }}", "password": "{{ rabbitmq_password }}", "tags": "administrator"}],
"permissions":[
{"user":"{{ rabbitmq_user }}","vhost":"awx","configure":".*","write":".*","read":".*"}
],
Expand Down Expand Up @@ -269,12 +269,56 @@ spec:
containerPort: 5672
livenessProbe:
exec:
command: ["rabbitmqctl", "status"]
command:
- /usr/bin/python
- -c
- |
try:
from http.client import HTTPConnection
wanderboessenkool marked this conversation as resolved.
Show resolved Hide resolved
except ImportError:
from httplib import HTTPConnection
import sys
import os
import base64
authsecret = base64.b64encode(os.getenv('RABBITMQ_USER') + ':' + os.getenv('RABBITMQ_PASSWORD'))
conn=HTTPConnection('localhost:15672')
conn.request('GET', '/api/healthchecks/node', headers={'Authorization': 'Basic %s' % authsecret})
r1 = conn.getresponse()
if r1.status != 200:
sys.stderr.write('Received http error %i\n' % (r1.status))
sys.exit(1)
body = r1.read()
if body != '{"status":"ok"}':
sys.stderr.write('Received body: %s' % body)
sys.exit(2)
sys.exit(0)
initialDelaySeconds: 30
timeoutSeconds: 10
readinessProbe:
exec:
command: ["rabbitmqctl", "status"]
command:
- /usr/bin/python
- -c
- |
try:
from http.client import HTTPConnection
except ImportError:
from httplib import HTTPConnection
import sys
import os
import base64
authsecret = base64.b64encode(os.getenv('RABBITMQ_USER') + ':' + os.getenv('RABBITMQ_PASSWORD'))
conn=HTTPConnection('localhost:15672')
conn.request('GET', '/api/healthchecks/node', headers={'Authorization': 'Basic %s' % authsecret})
r1 = conn.getresponse()
if r1.status != 200:
sys.stderr.write('Received http error %i\n' % (r1.status))
sys.exit(1)
body = r1.read()
if body != '{"status":"ok"}':
sys.stderr.write('Received body: %s' % body)
sys.exit(2)
sys.exit(0)
initialDelaySeconds: 10
timeoutSeconds: 10
env:
Expand All @@ -293,6 +337,13 @@ spec:
key: rabbitmq_erlang_cookie
- name: K8S_SERVICE_NAME
value: "rabbitmq"
- name: RABBITMQ_USER
value: {{ rabbitmq_user }}
- name: RABBITMQ_PASSWORD
valueFrom:
secretKeyRef:
name: "{{ kubernetes_deployment_name }}-secrets"
key: rabbitmq_password
volumeMounts:
- name: rabbitmq-config
mountPath: /etc/rabbitmq
Expand Down