Skip to content
This repository was archived by the owner on Apr 11, 2024. It is now read-only.

Commit 7cd1236

Browse files
committed
fix: pass in provisioner name
1 parent 0927679 commit 7cd1236

File tree

4 files changed

+11
-39
lines changed

4 files changed

+11
-39
lines changed

pkg/handlers/generic/lifecycle/csi/aws-ebs/handler.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ import (
2020
"github.com/d2iq-labs/cluster-api-runtime-extensions-nutanix/pkg/handlers/options"
2121
)
2222

23+
const (
24+
awsEBSProvisionerName = "ebs.csi.aws.com"
25+
)
26+
2327
type AWSEBSConfig struct {
2428
*options.GlobalOptions
2529
defaultAWSEBSConfigMapName string
@@ -88,6 +92,7 @@ func (a *AWSEBS) createStorageClasses(ctx context.Context,
8892
c,
8993
cluster,
9094
a.config.GlobalOptions.DefaultsNamespace(),
95+
awsEBSProvisionerName,
9196
setAsDefault,
9297
)
9398
if err != nil {

pkg/handlers/generic/lifecycle/csi/handler_test.go

Lines changed: 0 additions & 35 deletions
This file was deleted.

pkg/handlers/generic/lifecycle/csi/nutanix-csi/handler.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ const (
2626
defaultHelmChartVersion = "v2.6.6"
2727
defaultHelmChartName = "nutanix-csi-storage"
2828
defaultHelmReleaseNameTemplate = "nutanix-csi-storage-%s"
29+
nutanixCSIProvisionerName = "csi.nutanix.com"
2930
)
3031

3132
type NutanixCSIConfig struct {
@@ -147,6 +148,7 @@ func (n *NutanixCSI) createStorageClasses(ctx context.Context,
147148
n.client,
148149
c,
149150
cluster,
151+
nutanixCSIProvisionerName,
150152
n.config.GlobalOptions.DefaultsNamespace(),
151153
setAsDefault,
152154
)

pkg/handlers/generic/lifecycle/utils/utils.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,7 @@ import (
2424
)
2525

2626
const (
27-
kindStorageClass = "StorageClass"
28-
awsEBSProvisionerName = "ebs.csi.aws.com"
27+
kindStorageClass = "StorageClass"
2928
)
3029

3130
var (
@@ -140,7 +139,8 @@ func CreateStorageClass(
140139
cl ctrlclient.Client,
141140
storageConfig v1alpha1.StorageClassConfig,
142141
cluster *clusterv1.Cluster,
143-
defaultsNamespace string,
142+
defaultsNamespace,
143+
provisionerName string,
144144
isDefault bool,
145145
) error {
146146
var volumeBindingMode *storagev1.VolumeBindingMode
@@ -173,7 +173,7 @@ func CreateStorageClass(
173173
Name: storageConfig.Name,
174174
Namespace: defaultsNamespace,
175175
},
176-
Provisioner: awsEBSProvisionerName,
176+
Provisioner: provisionerName,
177177
Parameters: params,
178178
VolumeBindingMode: volumeBindingMode,
179179
ReclaimPolicy: reclaimPolicy,

0 commit comments

Comments
 (0)