Skip to content

Commit 03e44b3

Browse files
committed
ci: collect logs to verify changes
Signed-off-by: subhamkrai <srai@redhat.com>
1 parent c246317 commit 03e44b3

File tree

3 files changed

+13
-2
lines changed

3 files changed

+13
-2
lines changed

.github/workflows/integration-test-multi-cluster-suite.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ jobs:
5353
export BLOCK="/dev/${DEVICE_NAME}"
5454
export TEST_SCRATCH_DEVICE="/dev/${DEVICE_NAME}1"
5555
export DEVICE_FILTER="$DEVICE_NAME"
56+
kubectl create -f deploy/examples/csi-operator.yaml
5657
go test -v -timeout 1800s -failfast -run CephMultiClusterDeploySuite github.com/rook/rook/tests/integration
5758
5859
- name: collect common logs
@@ -65,7 +66,7 @@ jobs:
6566
6667
- name: Artifact
6768
uses: actions/upload-artifact@4cec3d8aa04e39d1a68397de0c4cd6fb9dce8ec1 # v4.6.1
68-
if: failure()
69+
if: always()
6970
with:
7071
name: ceph-multi-cluster-deploy-suite-artifact-${{ matrix.kubernetes-versions }}
7172
path: /home/runner/work/rook/rook/tests/integration/_output/tests/

pkg/operator/ceph/cluster/cluster_external.go

+10
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,16 @@ func (c *ClusterController) configureExternalCephCluster(cluster *cluster) error
176176
}
177177
}
178178

179+
logger.Info("create cephConnection and defaultClientProfile for external mode")
180+
err = csi.CreateUpdateCephConnection(c.context.Client, cluster.ClusterInfo, *cluster.Spec)
181+
if err != nil {
182+
return errors.Wrap(err, "failed to create/update cephConnection")
183+
}
184+
err = csi.CreateDefaultClientProfile(c.context.Client, cluster.ClusterInfo, cluster.ClusterInfo.NamespacedName())
185+
if err != nil {
186+
return errors.Wrap(err, "failed to create/update default client profile")
187+
}
188+
179189
// We don't update the connection status since it is done by the health go routine
180190
return nil
181191
}

pkg/operator/ceph/cluster/mon/mon.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1174,7 +1174,7 @@ func (c *Cluster) saveMonConfig() error {
11741174
return errors.Wrap(err, "failed to update csi cluster config")
11751175
}
11761176

1177-
if (csi.EnableCSIOperator() || c.spec.External.Enable) && len(c.ClusterInfo.AllMonitors()) > 0 {
1177+
if csi.EnableCSIOperator() && len(c.ClusterInfo.AllMonitors()) > 0 {
11781178
err := csi.CreateUpdateCephConnection(c.context.Client, c.ClusterInfo, c.spec)
11791179
if err != nil {
11801180
return errors.Wrap(err, "failed to create/update cephConnection")

0 commit comments

Comments
 (0)