Skip to content
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
10 changes: 5 additions & 5 deletions charts/plane-enterprise/templates/workloads/minio.stateful.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ spec:
args:
- server
- /data
- --console-address
- --console-address
- :9090
envFrom:
- secretRef:
Expand Down Expand Up @@ -97,7 +97,7 @@ spec:
restartPolicy: OnFailure
initContainers:
- name: init
image: busybox
image: {{ .Values.services.minio.image_busybox }}
command: ['sh', '-c', "until nslookup {{ .Release.Name }}-minio.{{ .Release.Namespace }}.svc.cluster.local; do echo waiting for {{ .Release.Name }}-minio; sleep 2; done"]
containers:
- name: {{ .Release.Name }}-minio-bucket
Expand All @@ -109,8 +109,8 @@ spec:
- '-c'
- >-
/usr/bin/mc config host add plane-app-minio
http://{{ .Release.Name }}-minio.{{ .Release.Namespace }}.svc.cluster.local:9000 "$AWS_ACCESS_KEY_ID" "$AWS_SECRET_ACCESS_KEY";
/usr/bin/mc mb plane-app-minio/$AWS_S3_BUCKET_NAME;
http://{{ .Release.Name }}-minio.{{ .Release.Namespace }}.svc.cluster.local:9000 "$AWS_ACCESS_KEY_ID" "$AWS_SECRET_ACCESS_KEY";
/usr/bin/mc mb plane-app-minio/$AWS_S3_BUCKET_NAME;
/usr/bin/mc anonymous set download plane-app-minio/$AWS_S3_BUCKET_NAME; exit 0;
envFrom:
- secretRef:
Expand All @@ -124,4 +124,4 @@ spec:
serviceAccount: {{ .Release.Name }}-srv-account
serviceAccountName: {{ .Release.Name }}-srv-account
terminationGracePeriodSeconds: 120
{{- end }}
{{- end }}
20 changes: 10 additions & 10 deletions charts/plane-enterprise/templates/workloads/silo.deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,21 +43,21 @@ spec:
spec:
initContainers:
- name: wait-for-rabbitmq
image: busybox
image: {{ .Values.services.silo.image_busybox }}
command:
- /bin/sh
args:
- '-c'
- >-
if echo "$AMQP_URL" | grep -q "rabbitmq.{{ .Release.Namespace }}.svc.{{ .Values.env.default_cluster_domain | default "cluster.local" }}"; then
echo "Waiting for local RabbitMQ...";
if echo "$AMQP_URL" | grep -q "rabbitmq.{{ .Release.Namespace }}.svc.{{ .Values.env.default_cluster_domain | default "cluster.local" }}"; then
echo "Waiting for local RabbitMQ...";
until nslookup {{ .Release.Name }}-rabbitmq.{{ .Release.Namespace }}.svc.{{ .Values.env.default_cluster_domain | default "cluster.local" }} > /dev/null 2>&1; do
echo "RabbitMQ not ready...";
sleep 5;
done;
echo "RabbitMQ is up!";
else
echo "Skipping wait, using external RabbitMQ";
echo "RabbitMQ not ready...";
sleep 5;
done;
echo "RabbitMQ is up!";
else
echo "Skipping wait, using external RabbitMQ";
fi;
envFrom:
- configMapRef:
Expand Down Expand Up @@ -91,4 +91,4 @@ spec:
serviceAccount: {{ .Release.Name }}-srv-account
serviceAccountName: {{ .Release.Name }}-srv-account
---
{{- end }}
{{- end }}
2 changes: 2 additions & 0 deletions charts/plane-enterprise/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ services:
local_setup: true
image: minio/minio:latest
image_mc: minio/mc:latest
image_busybox: busybox
volumeSize: 3Gi
pullPolicy: IfNotPresent
root_user: admin
Expand Down Expand Up @@ -235,6 +236,7 @@ services:
memoryRequest: 50Mi
cpuRequest: 50m
image: artifacts.plane.so/makeplane/silo-commercial
image_busybox: busybox
pullPolicy: Always
assign_cluster_ip: false
nodeSelector: {}
Expand Down