csi: remove code related to betav1CsiDriver

This commit removes code related to betav1CsiDriver
since minimum k8s version support by rook is now
k8s v1.22 which does not support betav1 csi driver crd.

Signed-off-by: Rakshith R <rar@redhat.com>
This commit is contained in:
Rakshith R committed 2023-07-06 15:55:57 +05:30
1 parent d6b8a8f380
commit 76f4b1f586
3 files changed
+2 -153

No files matched your search

-124
View File
@@ -1,124 +0,0 @@
/*
Copyright 2021 The Rook Authors. All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
/*
TODO: storage.k8s.io/v1beta1 CSIDriver is deprecated in Kubernetes v1.19+, unavailable in v1.22+;
Once the support of older Kubernetes releases are removed in Rook, delete the file to
remove the support for the betav1 CSIDriver object.
*/
package csi
import (
"context"
"github.com/pkg/errors"
betav1k8scsi "k8s.io/api/storage/v1beta1"
apierrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/client-go/kubernetes"
"k8s.io/client-go/kubernetes/typed/storage/v1beta1"
)
type beta1CsiDriver struct {
csiDriver *betav1k8scsi.CSIDriver
csiClient v1beta1.CSIDriverInterface
}
// createCSIDriverInfo Registers CSI driver by creating a CSIDriver object
func (d beta1CsiDriver) createCSIDriverInfo(
ctx context.Context,
clientset kubernetes.Interface,
name, fsGroupPolicy string,
attachRequired, seLinuxMountRequired bool) error {
mountInfo := false
// Create CSIDriver object
csiDriver := &betav1k8scsi.CSIDriver{
ObjectMeta: metav1.ObjectMeta{
Name: name,
},
Spec: betav1k8scsi.CSIDriverSpec{
AttachRequired: &attachRequired,
PodInfoOnMount: &mountInfo,
},
}
if fsGroupPolicy != "" {
if fsGroupPolicy == "File" {
// fsGroupPolicy: File was added in Kubernetes 1.19, considering beta1CsiDriver
// life exist before 1.19, we are falling back to `ReadWriteOnceWithFStype`.
fsGroupPolicy = "ReadWriteOnceWithFSType"
}
policy := betav1k8scsi.FSGroupPolicy(fsGroupPolicy)
csiDriver.Spec.FSGroupPolicy = &policy
}
csidrivers := clientset.StorageV1beta1().CSIDrivers()
driver, err := csidrivers.Get(ctx, name, metav1.GetOptions{})
if err != nil {
if apierrors.IsNotFound(err) {
_, err = csidrivers.Create(ctx, csiDriver, metav1.CreateOptions{})
if err != nil {
return err
}
logger.Infof("CSIDriver object created for driver %q", name)
}
return err
}
// As FSGroupPolicy and AttachRequired fields are immutable, should be set only during create time.
// if the request is to change the FSGroupPolicy or AttachRequired, we are deleting the CSIDriver object and creating it.
if (driver.Spec.FSGroupPolicy != nil && csiDriver.Spec.FSGroupPolicy != nil && *driver.Spec.FSGroupPolicy != *csiDriver.Spec.FSGroupPolicy) || *driver.Spec.AttachRequired != *csiDriver.Spec.AttachRequired {
d.csiClient = csidrivers
d.csiDriver = csiDriver
return d.reCreateCSIDriverInfo(ctx)
}
// For csidriver we need to provide the resourceVersion when updating the object.
// From the docs (https://github.com/kubernetes/community/blob/master/contributors/devel/sig-architecture/api-conventions.md#metadata)
// > "This value MUST be treated as opaque by clients and passed unmodified back to the server"
csiDriver.ObjectMeta.ResourceVersion = driver.ObjectMeta.ResourceVersion
_, err = csidrivers.Update(ctx, csiDriver, metav1.UpdateOptions{})
if err != nil {
return err
}
logger.Infof("CSIDriver object updated for driver %q", name)
return nil
}
func (d beta1CsiDriver) reCreateCSIDriverInfo(ctx context.Context) error {
err := d.csiClient.Delete(ctx, d.csiDriver.Name, metav1.DeleteOptions{})
if err != nil {
return errors.Wrapf(err, "failed to delete CSIDriver object for driver %q", d.csiDriver.Name)
}
logger.Infof("CSIDriver object deleted for driver %q", d.csiDriver.Name)
_, err = d.csiClient.Create(ctx, d.csiDriver, metav1.CreateOptions{})
if err != nil {
return errors.Wrapf(err, "failed to recreate CSIDriver object for driver %q", d.csiDriver.Name)
}
logger.Infof("CSIDriver object recreated for driver %q", d.csiDriver.Name)
return nil
}
// deleteCSIDriverInfo deletes CSIDriverInfo and returns the error if any
func (d beta1CsiDriver) deleteCSIDriverInfo(ctx context.Context, clientset kubernetes.Interface, name string) error {
err := clientset.StorageV1beta1().CSIDrivers().Delete(ctx, name, metav1.DeleteOptions{})
if err != nil {
if apierrors.IsNotFound(err) {
logger.Debugf("%q CSIDriver not found; skipping deletion.", name)
return nil
}
}
return err
}
-6
View File
@@ -27,12 +27,6 @@ import (
v1 "k8s.io/client-go/kubernetes/typed/storage/v1"
)
type csiDriver interface {
createCSIDriverInfo(ctx context.Context, clientset kubernetes.Interface, name, fsGroupPolicy string, attachRequired, seLinuxMountRequired bool) error
reCreateCSIDriverInfo(ctx context.Context) error
deleteCSIDriverInfo(ctx context.Context, clientset kubernetes.Interface, name string) error
}
type v1CsiDriver struct {
csiDriver *v1k8scsi.CSIDriver
csiClient v1.CSIDriverInterface
+2 -23
View File
@@ -127,8 +127,6 @@ var (
// configuration map for csi
ConfigName = "rook-ceph-csi-config"
ConfigKey = "csi-cluster-config-json"
csiDriverobj csiDriver
)
// Specify default images as var instead of const so that they can be overridden with the Go
@@ -179,7 +177,6 @@ var (
const (
kubeMinMajor = "1"
kubeMaxVerForBeta1csiDriver = "21"
kubeMinVerForCSIDriverSeLinuxMount = "25"
// common tolerations and node affinity
@@ -294,6 +291,7 @@ func (r *ReconcileCSI) startDrivers(ver *version.Info, ownerInfo *k8sutil.OwnerI
rbdPlugin, cephfsPlugin, nfsPlugin *apps.DaemonSet
rbdProvisionerDeployment, cephfsProvisionerDeployment, nfsProvisionerDeployment *apps.Deployment
rbdService, cephfsService *corev1.Service
csiDriverobj v1CsiDriver
)
enabledDrivers := make([]driverDetails, 0)
@@ -311,25 +309,6 @@ func (r *ReconcileCSI) startDrivers(ver *version.Info, ownerInfo *k8sutil.OwnerI
tp.Param.MountCustomCephConf = CustomCSICephConfigExists
csiDriverobj = v1CsiDriver{}
// In case of an k8s version upgrade, delete the beta CSIDriver object;
// before the creation of updated v1 object to avoid conflicts.
// Also, attempt betav1 driver object deletion only if version is less
// than maximum supported version for betav1 object.(unavailable in v1.22+)
// Ignore if not found.
if EnableRBD && ver.Minor <= kubeMaxVerForBeta1csiDriver {
err = beta1CsiDriver{}.deleteCSIDriverInfo(r.opManagerContext, r.context.Clientset, RBDDriverName)
if err != nil {
logger.Errorf("failed to delete %q Driver Info. %v", RBDDriverName, err)
}
}
if EnableCephFS && ver.Minor <= kubeMaxVerForBeta1csiDriver {
err = beta1CsiDriver{}.deleteCSIDriverInfo(r.opManagerContext, r.context.Clientset, CephFSDriverName)
if err != nil {
logger.Errorf("failed to delete %q Driver Info. %v", CephFSDriverName, err)
}
}
if EnableRBD {
rbdPlugin, err = templateToDaemonSet("rbdplugin", RBDPluginTemplatePath, tp)
if err != nil {
@@ -706,7 +685,7 @@ func (r *ReconcileCSI) stopDrivers(ver *version.Info) error {
}
func (r *ReconcileCSI) deleteCSIDriverResources(ver *version.Info, daemonset, deployment, service, driverName string) error {
csiDriverobj = v1CsiDriver{}
csiDriverobj := v1CsiDriver{}
err := k8sutil.DeleteDaemonset(r.opManagerContext, r.context.Clientset, r.opConfig.OperatorNamespace, daemonset)
if err != nil {
return errors.Wrapf(err, "failed to delete the %q", daemonset)