Skip to content

refactor: create storage classes directly instead of using CRS #539

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Apr 18, 2024
Merged

refactor: create storage classes directly instead of using CRS #539

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
df283fc
refactor: create storage classes directly instead of using CRS
faiq Apr 18, 2024
b6cc108
fix: better error message
faiq Apr 18, 2024
dd2ee97
fix: apply suggestion from review
faiq Apr 18, 2024
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
46 changes: 8 additions & 38 deletions pkg/handlers/generic/lifecycle/csi/aws-ebs/handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ import (
"github.com/spf13/pflag"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
runtimehooksv1 "sigs.k8s.io/cluster-api/exp/runtime/hooks/api/v1alpha1"
ctrlclient "sigs.k8s.io/controller-runtime/pkg/client"
Expand All @@ -22,7 +21,7 @@ import (
"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/pkg/handlers/options"
)

var defaultStorageClassParams = map[string]string{
var defaultStorageClassParameters = map[string]string{
"csi.storage.k8s.io/fstype": "ext4",
"type": "gp3",
}
Expand Down Expand Up @@ -74,49 +73,20 @@ func (a *AWSEBS) Apply(
default:
return fmt.Errorf("stategy %s not implemented", strategy)
}
return a.createStorageClasses(
err := lifecycleutils.CreateStorageClassOnRemote(
ctx,
a.client,
provider.StorageClassConfig,
&req.Cluster,
defaultStorageConfig,
v1alpha1.CSIProviderAWSEBS,
v1alpha1.AWSEBSProvisioner,
defaultStorageClassParameters,
)
}

func (a *AWSEBS) createStorageClasses(ctx context.Context,
configs []v1alpha1.StorageClassConfig,
cluster *clusterv1.Cluster,
defaultStorageConfig *v1alpha1.DefaultStorage,
) error {
allStorageClasses := make([]runtime.Object, 0, len(configs))
for _, config := range configs {
setAsDefault := config.Name == defaultStorageConfig.StorageClassConfigName &&
v1alpha1.CSIProviderAWSEBS == defaultStorageConfig.ProviderName
allStorageClasses = append(allStorageClasses, lifecycleutils.CreateStorageClass(
config,
v1alpha1.AWSEBSProvisioner,
setAsDefault,
defaultStorageClassParams,
))
}
cm, err := lifecycleutils.CreateConfigMapForCRS(
fmt.Sprintf("aws-storageclass-cm-%s", cluster.Name),
a.config.DefaultsNamespace(),
allStorageClasses...,
)
if err != nil {
return err
}
err = client.ServerSideApply(ctx, a.client, cm)
if err != nil {
return err
return fmt.Errorf("error creating StorageClasses for the AWS EBS CSI driver: %w", err)
}
return lifecycleutils.EnsureCRSForClusterFromObjects(
ctx,
"aws-storageclass-crs",
a.client,
cluster,
cm,
)
return nil
}

func (a *AWSEBS) handleCRSApply(ctx context.Context,
Expand Down
46 changes: 5 additions & 41 deletions pkg/handlers/generic/lifecycle/csi/nutanix-csi/handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import (
"github.com/go-logr/logr"
"github.com/spf13/pflag"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
runtimehooksv1 "sigs.k8s.io/cluster-api/exp/runtime/hooks/api/v1alpha1"
ctrlclient "sigs.k8s.io/controller-runtime/pkg/client"
Expand Down Expand Up @@ -117,16 +116,19 @@ func (n *NutanixCSI) Apply(
}
}

err := n.createStorageClasses(
err := lifecycleutils.CreateStorageClassOnRemote(
ctx,
n.client,
provider.StorageClassConfig,
&req.Cluster,
defaultStorageConfig,
v1alpha1.CSIProviderNutanix,
v1alpha1.NutanixProvisioner,
defaultStorageClassParameters,
)
if err != nil {
return fmt.Errorf("error creating StorageClasses for the Nutanix CSI driver: %w", err)
}

return nil
}

Expand Down Expand Up @@ -222,41 +224,3 @@ func (n *NutanixCSI) handleHelmAddonApply(

return nil
}

func (n *NutanixCSI) createStorageClasses(
ctx context.Context,
configs []v1alpha1.StorageClassConfig,
cluster *clusterv1.Cluster,
defaultStorageConfig *v1alpha1.DefaultStorage,
) error {
allStorageClasses := make([]runtime.Object, 0, len(configs))
for _, config := range configs {
setAsDefault := config.Name == defaultStorageConfig.StorageClassConfigName &&
v1alpha1.CSIProviderNutanix == defaultStorageConfig.ProviderName
allStorageClasses = append(allStorageClasses, lifecycleutils.CreateStorageClass(
config,
v1alpha1.NutanixProvisioner,
setAsDefault,
defaultStorageClassParameters,
))
}
cm, err := lifecycleutils.CreateConfigMapForCRS(
fmt.Sprintf("nutanix-storageclass-cm-%s", cluster.Name),
n.config.DefaultsNamespace(),
allStorageClasses...,
)
if err != nil {
return err
}
err = client.ServerSideApply(ctx, n.client, cm)
if err != nil {
return err
}
return lifecycleutils.EnsureCRSForClusterFromObjects(
ctx,
"nutanix-storageclass-crs",
n.client,
cluster,
cm,
)
}
42 changes: 42 additions & 0 deletions pkg/handlers/generic/lifecycle/utils/scs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,18 @@
package utils

import (
"context"
"fmt"

storagev1 "k8s.io/api/storage/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/utils/ptr"
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
"sigs.k8s.io/cluster-api/controllers/remote"
ctrlclient "sigs.k8s.io/controller-runtime/pkg/client"

"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/api/v1alpha1"
"github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/common/pkg/k8s/client"
)

const (
Expand Down Expand Up @@ -50,3 +57,38 @@ func CreateStorageClass(
}
return &sc
}

func CreateStorageClassOnRemote(
ctx context.Context,
cl ctrlclient.Client,
configs []v1alpha1.StorageClassConfig,
cluster *clusterv1.Cluster,
defaultStorageConfig *v1alpha1.DefaultStorage,
csiProvider string,
provisioner v1alpha1.StorageProvisioner,
defaultParameters map[string]string,
) error {
allStorageClasses := make([]*storagev1.StorageClass, 0, len(configs))
for _, config := range configs {
setAsDefault := config.Name == defaultStorageConfig.StorageClassConfigName &&
csiProvider == defaultStorageConfig.ProviderName
allStorageClasses = append(allStorageClasses, CreateStorageClass(
config,
provisioner,
setAsDefault,
defaultParameters,
))
}
clusterKey := ctrlclient.ObjectKeyFromObject(cluster)
remoteClient, err := remote.NewClusterClient(ctx, "", cl, clusterKey)
if err != nil {
return fmt.Errorf("error creating client for remote cluster: %w", err)
}
for _, sc := range allStorageClasses {
err = client.ServerSideApply(ctx, remoteClient, sc)
if err != nil {
return fmt.Errorf("error creating storage class %v on remote cluster %w", sc, err)
}
}
return nil
}
Loading