Skip to content

A few small changes to simplify deployments #21

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.

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
45 changes: 11 additions & 34 deletions kubernetes/servicecontrol-audit.statefulset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ spec:
- name: api
containerPort: 44444
protocol: TCP
args: ["--setup-and-run"]
env:
- name: RABBITMQ_HOST
valueFrom:
Expand Down Expand Up @@ -114,37 +115,13 @@ spec:
volumeMounts:
- name: audit-db-data
mountPath: /var/lib/ravendb/data
- name: wait-for-ravendb
image: curlimages/curl:latest
command:
[
"curl",
"-o",
"ping.json",
"http://localhost:8080/admin/debug/node/ping",
]
- name: init-servicecontrol-audit
image: particular/servicecontrol-audit:latest
args: ["--setup"]
env:
- name: RABBITMQ_HOST
valueFrom:
secretKeyRef:
name: rabbitmq-default-user
key: host
- name: RABBITMQ_USERNAME
valueFrom:
secretKeyRef:
name: rabbitmq-default-user
key: username
- name: RABBITMQ_PASSWORD
valueFrom:
secretKeyRef:
name: rabbitmq-default-user
key: password
- name: TRANSPORTTYPE
value: "RabbitMQ.QuorumConventionalRouting"
- name: CONNECTIONSTRING
value: "Host=$(RABBITMQ_HOST);username=$(RABBITMQ_USERNAME);Password=$(RABBITMQ_PASSWORD);"
- name: RAVENDB_CONNECTIONSTRING
value: http://localhost:8080
readinessProbe:
httpGet:
path: "/admin/debug/node/ping"
port: 8080
scheme: HTTP
initialDelaySeconds: 2
periodSeconds: 5
timeoutSeconds: 1
successThreshold: 1
failureThreshold: 20
45 changes: 11 additions & 34 deletions kubernetes/servicecontrol-error.statefulset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ spec:
- name: api
containerPort: 33333
protocol: TCP
args: ["--setup-and-run"]
env:
- name: RABBITMQ_HOST
valueFrom:
Expand Down Expand Up @@ -116,37 +117,13 @@ spec:
volumeMounts:
- name: error-db-data
mountPath: /var/lib/ravendb/data
- name: wait-for-ravendb
image: curlimages/curl:latest
command:
[
"curl",
"-o",
"ping.json",
"http://localhost:8080/admin/debug/node/ping",
]
- name: init-servicecontrol-error
image: particular/servicecontrol:latest
args: ["--setup"]
env:
- name: RABBITMQ_HOST
valueFrom:
secretKeyRef:
name: rabbitmq-default-user
key: host
- name: RABBITMQ_USERNAME
valueFrom:
secretKeyRef:
name: rabbitmq-default-user
key: username
- name: RABBITMQ_PASSWORD
valueFrom:
secretKeyRef:
name: rabbitmq-default-user
key: password
- name: TRANSPORTTYPE
value: "RabbitMQ.QuorumConventionalRouting"
- name: CONNECTIONSTRING
value: "Host=$(RABBITMQ_HOST);username=$(RABBITMQ_USERNAME);Password=$(RABBITMQ_PASSWORD);"
- name: RAVENDB_CONNECTIONSTRING
value: http://localhost:8080
readinessProbe:
httpGet:
path: "/admin/debug/node/ping"
port: 8080
scheme: HTTP
initialDelaySeconds: 2
periodSeconds: 5
timeoutSeconds: 1
successThreshold: 1
failureThreshold: 20
25 changes: 1 addition & 24 deletions kubernetes/servicecontrol-monitoring.deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,30 +33,7 @@ spec:
containers:
- name: servicecontrol-monitoring
image: particular/servicecontrol-monitoring:latest
env:
- name: RABBITMQ_HOST
valueFrom:
secretKeyRef:
name: rabbitmq-default-user
key: host
- name: RABBITMQ_USERNAME
valueFrom:
secretKeyRef:
name: rabbitmq-default-user
key: username
- name: RABBITMQ_PASSWORD
valueFrom:
secretKeyRef:
name: rabbitmq-default-user
key: password
- name: TRANSPORTTYPE
value: "RabbitMQ.QuorumConventionalRouting"
- name: CONNECTIONSTRING
value: "Host=$(RABBITMQ_HOST);username=$(RABBITMQ_USERNAME);Password=$(RABBITMQ_PASSWORD);"
initContainers:
- name: init-servicecontrol-monitoring
image: particular/servicecontrol-monitoring:latest
args: ["--setup"]
args: ["--setup-and-run"]
env:
- name: RABBITMQ_HOST
valueFrom:
Expand Down