Improve ceph-mgr-provision job in rook-ceph app

This change includes an improvement related to the timeout when running
the ceph-mgr-provision job. If the ceph cluster takes longer than
5/7 minutes to become available, the job will fail and cause the
application to get stuck at 67%.

Test Plan:
 - PASS: Upload/Apply rook-ceph app

Story: 2011066
Task: 50930

Change-Id: Ib4ce9ee48e1a8e663fa882485bd5108ecd476274
Signed-off-by: Gustavo Ornaghi Antunes <gustavo.ornaghiantunes@windriver.com>
This commit is contained in:
Gustavo Ornaghi Antunes
2024-08-28 16:48:57 -03:00
parent aa7b2c2bd6
commit 63894e875a
3 changed files with 11 additions and 1 deletions

View File

@@ -123,6 +123,7 @@ spec:
chart: "{{.Chart.Name}}"
app.starlingx.io/component: platform
spec:
serviceAccountName: {{ .Values.rbac.serviceAccount }}
tolerations:
- effect: NoSchedule
operator: Exists
@@ -160,6 +161,12 @@ spec:
mountPath: /etc/ceph
- name: config-key-provision
mountPath: /tmp/mount
- name: init-wait-cephcluster-ready
image: {{ .Values.images.tags.kubectl | quote }}
command:
- /bin/bash
- -c
- kubectl wait -n rook-ceph cephcluster/rook-ceph --for=jsonpath='{.status.phase}'=Ready --timeout {{ .Values.mgr_provision.timeout_ceph }}
containers:
- name: provision
image: {{ .Values.images.tags.ceph_config_helper | quote }}

View File

@@ -24,5 +24,5 @@ rules:
verbs: ["get", "create", "list", "update"]
- apiGroups: ["ceph.rook.io"]
resources: ["*"]
verbs: [ "get", "list", "patch" ]
verbs: [ "get", "list", "patch", "watch" ]
{{- end}}

View File

@@ -36,6 +36,7 @@ images:
ceph_config_helper: docker.io/openstackhelm/ceph-config-helper:ubuntu_jammy_18.2.2-1-20240312
stx_ceph_manager: docker.io/starlingx/stx-ceph-manager:stx.10.0-v18.2.2-0
k8s_entrypoint: quay.io/airshipit/kubernetes-entrypoint:v1.0.0
kubectl: docker.io/bitnami/kubectl:1.29
provisionStorage:
@@ -81,6 +82,8 @@ host_provision:
controller_hosts:
- controller-0
mgr_provision:
timeout_ceph: 240s
ceph_audit_jobs:
floatIP: 192.168.204.2