Skip to content

Commit 6ccd27f

Browse files
committed
Adding csi image tag
1 parent 518948f commit 6ccd27f

4 files changed

Lines changed: 60 additions & 4 deletions

File tree

‎.github/workflows/k8s-native-e2e-add-node.yaml‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,12 @@ on:
2424
description: 'Operator image tag'
2525
required: false
2626
default: 'main'
27+
csi_repository:
28+
description: 'CSI driver image repository (leave empty for chart default)'
29+
required: false
30+
csi_tag:
31+
description: 'CSI driver image tag (leave empty for chart default)'
32+
required: false
2733
spdk_image:
2834
description: 'SPDK container image'
2935
required: true
@@ -556,6 +562,14 @@ jobs:
556562
TLS_FLAGS="--set tls.enabled=true --set tls.mutual_enabled=true"
557563
fi
558564
565+
CSI_FLAGS=""
566+
if [ -n "${{ github.event.inputs.csi_repository }}" ]; then
567+
CSI_FLAGS="$CSI_FLAGS --set image.csi.repository=${{ github.event.inputs.csi_repository }}"
568+
fi
569+
if [ -n "${{ github.event.inputs.csi_tag }}" ]; then
570+
CSI_FLAGS="$CSI_FLAGS --set image.csi.tag=${{ github.event.inputs.csi_tag }}"
571+
fi
572+
559573
helm upgrade --install spdk-csi ./ \
560574
--namespace simplyblock \
561575
--create-namespace \
@@ -575,7 +589,7 @@ jobs:
575589
--set opensearch.persistence.storageClass=local-hostpath \
576590
--set image.simplyblock.pullPolicy=IfNotPresent \
577591
--set image.operator.pullPolicy=IfNotPresent \
578-
$TLS_FLAGS
592+
$TLS_FLAGS $CSI_FLAGS
579593
580594
- name: Grant OpenShift SCC to all service accounts (post-helm)
581595
if: ${{ github.event.inputs.use_existing_cluster != 'true' && (github.event.inputs.cluster_environment == 'aws-openshift' || github.event.inputs.cluster_environment == 'openshift-local') }}

‎.github/workflows/k8s-native-e2e-node-migration.yaml‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,12 @@ on:
2424
description: 'Operator image tag'
2525
required: false
2626
default: 'main'
27+
csi_repository:
28+
description: 'CSI driver image repository (leave empty for chart default)'
29+
required: false
30+
csi_tag:
31+
description: 'CSI driver image tag (leave empty for chart default)'
32+
required: false
2733
spdk_image:
2834
description: 'SPDK container image'
2935
required: true
@@ -554,6 +560,14 @@ jobs:
554560
TLS_FLAGS="--set tls.enabled=true --set tls.mutual_enabled=true"
555561
fi
556562
563+
CSI_FLAGS=""
564+
if [ -n "${{ github.event.inputs.csi_repository }}" ]; then
565+
CSI_FLAGS="$CSI_FLAGS --set image.csi.repository=${{ github.event.inputs.csi_repository }}"
566+
fi
567+
if [ -n "${{ github.event.inputs.csi_tag }}" ]; then
568+
CSI_FLAGS="$CSI_FLAGS --set image.csi.tag=${{ github.event.inputs.csi_tag }}"
569+
fi
570+
557571
helm upgrade --install spdk-csi ./ \
558572
--namespace simplyblock \
559573
--create-namespace \
@@ -573,7 +587,7 @@ jobs:
573587
--set opensearch.persistence.storageClass=local-hostpath \
574588
--set image.simplyblock.pullPolicy=IfNotPresent \
575589
--set image.operator.pullPolicy=IfNotPresent \
576-
$TLS_FLAGS
590+
$TLS_FLAGS $CSI_FLAGS
577591
578592
- name: Grant OpenShift SCC to all service accounts (post-helm)
579593
if: ${{ github.event.inputs.use_existing_cluster != 'true' && (github.event.inputs.cluster_environment == 'aws-openshift' || github.event.inputs.cluster_environment == 'openshift-local') }}

‎.github/workflows/k8s-native-e2e.yaml‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,12 @@ on:
2424
description: 'Operator image tag'
2525
required: false
2626
default: 'main'
27+
csi_repository:
28+
description: 'CSI driver image repository (leave empty for chart default)'
29+
required: false
30+
csi_tag:
31+
description: 'CSI driver image tag (leave empty for chart default)'
32+
required: false
2733
spdk_image:
2834
description: 'SPDK container image'
2935
required: true
@@ -630,6 +636,14 @@ jobs:
630636
TLS_FLAGS="--set tls.enabled=true --set tls.mutual_enabled=true"
631637
fi
632638
639+
CSI_FLAGS=""
640+
if [ -n "${{ github.event.inputs.csi_repository }}" ]; then
641+
CSI_FLAGS="$CSI_FLAGS --set image.csi.repository=${{ github.event.inputs.csi_repository }}"
642+
fi
643+
if [ -n "${{ github.event.inputs.csi_tag }}" ]; then
644+
CSI_FLAGS="$CSI_FLAGS --set image.csi.tag=${{ github.event.inputs.csi_tag }}"
645+
fi
646+
633647
helm upgrade --install spdk-csi ./ \
634648
--namespace simplyblock \
635649
--create-namespace \
@@ -647,7 +661,7 @@ jobs:
647661
--set prometheus.server.persistentVolume.storageClass=local-hostpath \
648662
--set controlplane.observability.enabled=true \
649663
--set opensearch.persistence.storageClass=local-hostpath \
650-
$TLS_FLAGS
664+
$TLS_FLAGS $CSI_FLAGS
651665
652666
- name: Grant OpenShift SCC to all service accounts (post-helm)
653667
if: ${{ github.event.inputs.use_existing_cluster != 'true' && (github.event.inputs.cluster_environment == 'aws-openshift' || github.event.inputs.cluster_environment == 'openshift-local') }}

‎.github/workflows/k8s-native-stress.yaml‎

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,12 @@ on:
2424
description: 'Operator image tag'
2525
required: false
2626
default: 'main'
27+
csi_repository:
28+
description: 'CSI driver image repository (leave empty for chart default)'
29+
required: false
30+
csi_tag:
31+
description: 'CSI driver image tag (leave empty for chart default)'
32+
required: false
2733
spdk_image:
2834
description: 'SPDK container image'
2935
required: true
@@ -595,6 +601,14 @@ jobs:
595601
TLS_FLAGS="--set tls.enabled=true --set tls.mutual_enabled=true"
596602
fi
597603
604+
CSI_FLAGS=""
605+
if [ -n "${{ github.event.inputs.csi_repository }}" ]; then
606+
CSI_FLAGS="$CSI_FLAGS --set image.csi.repository=${{ github.event.inputs.csi_repository }}"
607+
fi
608+
if [ -n "${{ github.event.inputs.csi_tag }}" ]; then
609+
CSI_FLAGS="$CSI_FLAGS --set image.csi.tag=${{ github.event.inputs.csi_tag }}"
610+
fi
611+
598612
helm upgrade --install spdk-csi ./ \
599613
--namespace simplyblock \
600614
--create-namespace \
@@ -612,7 +626,7 @@ jobs:
612626
--set prometheus.server.persistentVolume.storageClass=local-hostpath \
613627
--set controlplane.observability.enabled=true \
614628
--set opensearch.persistence.storageClass=local-hostpath \
615-
$TLS_FLAGS
629+
$TLS_FLAGS $CSI_FLAGS
616630
617631
- name: Grant OpenShift SCC to all service accounts (post-helm)
618632
if: ${{ github.event.inputs.use_existing_cluster != 'true' && (github.event.inputs.cluster_environment == 'aws-openshift' || github.event.inputs.cluster_environment == 'openshift-local') }}

0 commit comments

Comments
 (0)