Skip to content
Closed
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
11 changes: 0 additions & 11 deletions .github/workflows/k8s-native-upgrade.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -873,17 +873,6 @@ jobs:
echo "CLUSTER_SECRET=${CLUSTER_SECRET}" >> $GITHUB_ENV
echo "R25_ADMIN_POD=${ADMIN_POD}" >> $GITHUB_ENV

- name: Label worker nodes for R25 storage plane
if: ${{ github.event.inputs.use_existing_cluster != 'true' && github.event.inputs.upgrade_type == 'r25-to-r2x' }}
run: |
set -euxo pipefail
echo "=== Labeling worker nodes for R25 storage plane ==="
IFS=',' read -ra NODES <<< "${{ github.event.inputs.worker_nodes }}"
for NODE in "${NODES[@]}"; do
kubectl label node "$NODE" io.simplyblock.node-type=simplyblock-storage-plane --overwrite
echo "Labeled $NODE with io.simplyblock.node-type=simplyblock-storage-plane"
done

- name: Install spdk-csi chart for R25 storage nodes
if: ${{ github.event.inputs.use_existing_cluster != 'true' && github.event.inputs.upgrade_type == 'r25-to-r2x' }}
run: |
Expand Down
7 changes: 1 addition & 6 deletions R25_MANUAL_SETUP_STEPS.md
Original file line number Diff line number Diff line change
Expand Up @@ -157,16 +157,11 @@ fi

---

## Phase 4: Label workers + Install R25 spdk-csi chart
## Phase 4: Install R25 spdk-csi chart

```bash
NAMESPACE=simplyblock

# Label workers
for NODE in worker-0.ocp.simplyblock.ai worker-1.ocp.simplyblock.ai worker-2.ocp.simplyblock.ai worker-3.ocp.simplyblock.ai worker-4.ocp.simplyblock.ai worker-5.ocp.simplyblock.ai; do
kubectl label node "$NODE" io.simplyblock.node-type=simplyblock-storage-plane --overwrite
done

# Clone simplyblock-operator (R25 CSI chart branch)
git clone --branch v0.2.4 https://github.com/simplyblock/simplyblock-operator.git simplyblock-operator-r25

Expand Down
15 changes: 2 additions & 13 deletions UPGRADE.md
Original file line number Diff line number Diff line change
Expand Up @@ -67,18 +67,7 @@ Cluster ID: <CLUSTER_UUID>
Cluster Secret: <CLUSTER_SECRET>
```

### 1.3 Label Worker Nodes for Storage Plane

The R25 spdk-csi chart uses the `io.simplyblock.node-type` label to discover which
worker nodes should run storage node pods. Label all workers before installing the chart:

```bash
for NODE in <worker-node-1> <worker-node-2> <worker-node-3>; do
kubectl label node "$NODE" io.simplyblock.node-type=simplyblock-storage-plane --overwrite
done
```

### 1.4 Install the `spdk-csi` Helm Chart (Includes Storage Node Creation)
### 1.3 Install the `spdk-csi` Helm Chart (Includes Storage Node Creation)

This deploys the CSI driver and creates storage nodes via `storagenode.create=true`.
Use the cluster UUID, secret, and pool name from step 1.2.
Expand Down Expand Up @@ -116,7 +105,7 @@ sbcli-dev sn list

**Expected**: All storage nodes show `online` status.

### 1.5 Verify R25.x Cluster
### 1.4 Verify R25.x Cluster

```bash
# Cluster should be active
Expand Down
1 change: 0 additions & 1 deletion e2e/scripts/cleanup_upgrade_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,6 @@ echo "=== Phase 10: Remove stale node labels ==="

for NODE in "${NODES[@]}"; do
kubectl label node "$NODE" io.simplyblock.storagenodeset- 2>/dev/null || true
kubectl label node "$NODE" io.simplyblock.node-type- 2>/dev/null || true
echo " Removed labels from $NODE"
done

Expand Down
Loading