starlingx/app-rook-ceph
Code Issues Proposed changes

Updates to rook-ceph-provisioner helm chart

Browse Source 
Minor changes to the chart include
- Fix auto-version logic so that the chart changes will automatically
  bump the patch version of the chart
- Update the monitor name "mon-a" -> "mon-float"

NOTE: Another commit will be needed to clean up the old floating monitor
in this chart as we have now introduced a dedicated chart for the
floating monitor

Test Plan:
PASS - Pkg build + ISO generation
PASS - Successful AIO-DX Installation
PASS - Initial Rook deployment without floating monitor.
PASS - Initial Rook deployment with floating monitor.
PASS - Runtime override enable of Rook floating monitor + reapply
PASS - Runtime override disable of Rook floating monitor + reapply

Change-Id: I231457f9dac97e5f9bab5a76ccfdb696b366d7da
Story: 2011066
Task: 50837
Signed-off-by: Robert Church <robert.church@windriver.com>
This commit is contained in:
Robert Church 2024-08-14 13:12:09 -05:00
parent b5a6779471
commit 435e3c6372
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
helm-charts/custom/rook-ceph-provisioner-helm/debian/deb_folder/rules
View File

@ -5,9 +5,9 @@ export ROOT = debian/tmp
export APP_FOLDER = $(ROOT)/usr/lib/helm
export DEB_VERSION = $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' ')
export RELEASE = $(shell echo $(DEB_VERSION) | cut -f 1 -d '-')
export REVISION = $(shell echo $(DEB_VERSION) | cut -f 4 -d '.')
export CHART_VERSION = $(RELEASE).$(REVISION)
export PATCH_VERSION = $(shell echo $(DEB_VERSION) | cut -f 4 -d '.')
export CHART_BASE_VERSION = $(shell echo $(DEB_VERSION) | sed 's/-/./' | cut -d '.' -f 1-2)
export CHART_VERSION = $(CHART_BASE_VERSION).${PATCH_VERSION}
%:
dh $@

1
helm-charts/custom/rook-ceph-provisioner-helm/debian/meta_data.yaml
View File

@ -4,6 +4,7 @@ debver: 2.0-0
src_path: rook-ceph-provisioner-helm
revision:
dist: $STX_DIST
PKG_GITREVCOUNT: true
GITREVCOUNT:
SRC_DIR: ${MY_REPO}/stx/app-rook-ceph/helm-charts/custom/rook-ceph-provisioner-helm/rook-ceph-provisioner-helm/rook-ceph-provisioner
BASE_SRCREV: c6c693d51cdc6daa4eafe34ccab5ce35496bf516

10
helm-charts/custom/rook-ceph-provisioner-helm/rook-ceph-provisioner-helm/rook-ceph-provisioner/templates/job-ceph-mon-audit.yaml
View File

@ -29,9 +29,9 @@ data:
active=$node
fi
controller_node=$(kubectl get pods -n rook-ceph --selector=app="rook-ceph-mon,ceph_daemon_id=a" -o wide | awk '/Running.*controller/ {print $7}')
controller_node=$(kubectl get pods -n rook-ceph --selector=app="rook-ceph-mon,ceph_daemon_id=float" -o wide | awk '/Running.*controller/ {print $7}')
if [ x"$active" = x"$controller_node" ]; then
echo "mon-a pod is running on active controler"
echo "mon-float pod is running on active controler"
exit 0
fi
@ -52,9 +52,9 @@ data:
kubectl apply -f endpoint.yaml --overwrite=true
rm -f endpoint.yaml
# delete mon-a deployment and pod
kubectl delete deployments.apps -n rook-ceph rook-ceph-mon-a
kubectl delete pods -n rook-ceph --selector="app=rook-ceph-mon,ceph_daemon_id=a"
# delete mon-float deployment and pod
kubectl delete deployments.apps -n rook-ceph rook-ceph-mon-float
kubectl delete pods -n rook-ceph --selector="app=rook-ceph-mon,ceph_daemon_id=float"
kubectl delete po -n rook-ceph --selector="app=rook-ceph-operator"
---