From 6b4241f23071ca77d075253a2e3dd7a8ce86652a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20J=C3=B6rg=20Wieland?= Date: Sun, 23 Nov 2025 13:07:03 +0100 Subject: [PATCH 1/3] fix: Remove hardcoded busybox image and use value --- .../templates/workloads/minio.stateful.yaml | 10 +++++----- .../templates/workloads/silo.deployment.yaml | 20 +++++++++---------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/charts/plane-enterprise/templates/workloads/minio.stateful.yaml b/charts/plane-enterprise/templates/workloads/minio.stateful.yaml index 69de0694..0196ac22 100644 --- a/charts/plane-enterprise/templates/workloads/minio.stateful.yaml +++ b/charts/plane-enterprise/templates/workloads/minio.stateful.yaml @@ -50,7 +50,7 @@ spec: args: - server - /data - - --console-address + - --console-address - :9090 envFrom: - secretRef: @@ -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 @@ -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: @@ -124,4 +124,4 @@ spec: serviceAccount: {{ .Release.Name }}-srv-account serviceAccountName: {{ .Release.Name }}-srv-account terminationGracePeriodSeconds: 120 -{{- end }} \ No newline at end of file +{{- end }} diff --git a/charts/plane-enterprise/templates/workloads/silo.deployment.yaml b/charts/plane-enterprise/templates/workloads/silo.deployment.yaml index 0b7db6f3..22aa10a6 100644 --- a/charts/plane-enterprise/templates/workloads/silo.deployment.yaml +++ b/charts/plane-enterprise/templates/workloads/silo.deployment.yaml @@ -43,21 +43,21 @@ spec: spec: initContainers: - name: wait-for-rabbitmq - image: busybox + image: {{ .Values.services.silo.busyboxImage }} 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: @@ -91,4 +91,4 @@ spec: serviceAccount: {{ .Release.Name }}-srv-account serviceAccountName: {{ .Release.Name }}-srv-account --- -{{- end }} \ No newline at end of file +{{- end }} From 19b0c2a35a902ebf5faf8e19f109dd86b589a3d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20J=C3=B6rg=20Wieland?= Date: Sun, 23 Nov 2025 13:07:27 +0100 Subject: [PATCH 2/3] fix: set default value for busybox image for backward compatibility --- charts/plane-enterprise/values.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/charts/plane-enterprise/values.yaml b/charts/plane-enterprise/values.yaml index cd44316c..628a1cce 100644 --- a/charts/plane-enterprise/values.yaml +++ b/charts/plane-enterprise/values.yaml @@ -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 @@ -235,6 +236,7 @@ services: memoryRequest: 50Mi cpuRequest: 50m image: artifacts.plane.so/makeplane/silo-commercial + busyboxImage: busybox pullPolicy: Always assign_cluster_ip: false nodeSelector: {} From 6bca788b4d77f8a2dd6f65d0beb70ff51cf49a50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hans=20J=C3=B6rg=20Wieland?= Date: Sun, 23 Nov 2025 15:26:45 +0100 Subject: [PATCH 3/3] fix: consistent naming for busybox image override --- .../plane-enterprise/templates/workloads/silo.deployment.yaml | 2 +- charts/plane-enterprise/values.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/plane-enterprise/templates/workloads/silo.deployment.yaml b/charts/plane-enterprise/templates/workloads/silo.deployment.yaml index 22aa10a6..83c6a59b 100644 --- a/charts/plane-enterprise/templates/workloads/silo.deployment.yaml +++ b/charts/plane-enterprise/templates/workloads/silo.deployment.yaml @@ -43,7 +43,7 @@ spec: spec: initContainers: - name: wait-for-rabbitmq - image: {{ .Values.services.silo.busyboxImage }} + image: {{ .Values.services.silo.image_busybox }} command: - /bin/sh args: diff --git a/charts/plane-enterprise/values.yaml b/charts/plane-enterprise/values.yaml index 628a1cce..a4ba5781 100644 --- a/charts/plane-enterprise/values.yaml +++ b/charts/plane-enterprise/values.yaml @@ -236,7 +236,7 @@ services: memoryRequest: 50Mi cpuRequest: 50m image: artifacts.plane.so/makeplane/silo-commercial - busyboxImage: busybox + image_busybox: busybox pullPolicy: Always assign_cluster_ip: false nodeSelector: {}