From 14c5b8e0750aaed0075d9351258e7673a36d444c Mon Sep 17 00:00:00 2001 From: Praveenrajmani Date: Tue, 1 Oct 2024 13:47:28 +0530 Subject: [PATCH] done --- functests/migration-tests-kustomize.sh | 72 +++++++++++++++++++ .../directpv-chart/templates/CSIDriver.yaml | 1 - .../directpv-chart/templates/ClusterRole.yaml | 1 - .../templates/ClusterRoleBinding.yaml | 1 - .../directpv-chart/templates/DaemonSet.yaml | 3 - .../directpv-chart/templates/Deployment.yaml | 3 - .../directpv-chart/templates/Namespace.yaml | 2 - .../directpv-chart/templates/Role.yaml | 1 - .../directpv-chart/templates/RoleBinding.yaml | 1 - .../templates/ServiceAccount.yaml | 1 - .../templates/StorageClass.yaml | 2 - pkg/admin/installer/args.go | 10 --- pkg/admin/installer/csidriver.go | 11 +-- pkg/admin/installer/daemonset.go | 7 +- pkg/admin/installer/deployment.go | 7 +- pkg/admin/installer/namespace.go | 8 +-- pkg/admin/installer/rbac.go | 10 +-- pkg/admin/installer/storageclass.go | 14 ++-- pkg/apis/directpv.min.io/types/label.go | 8 --- resources/base/CSIDriver.yaml | 2 - resources/base/ClusterRole.yaml | 1 - resources/base/ClusterRoleBinding.yaml | 1 - resources/base/DaemonSet.yaml | 3 - resources/base/Deployment.yaml | 3 - resources/base/Namespace.yaml | 2 - resources/base/Role.yaml | 1 - resources/base/RoleBinding.yaml | 1 - resources/base/ServiceAccount.yaml | 2 - resources/base/StorageClass.yaml | 2 - resources/base/kustomization.yaml | 13 ---- resources/legacy/CSIDriver.yaml | 2 - resources/legacy/DaemonSet.yaml | 3 - resources/legacy/Deployment.yaml | 3 - resources/legacy/StorageClass.yaml | 2 - resources/legacy/kustomization.yaml | 13 ---- 35 files changed, 83 insertions(+), 134 deletions(-) create mode 100644 functests/migration-tests-kustomize.sh diff --git a/functests/migration-tests-kustomize.sh b/functests/migration-tests-kustomize.sh new file mode 100644 index 00000000..09b3dac9 --- /dev/null +++ b/functests/migration-tests-kustomize.sh @@ -0,0 +1,72 @@ +#!/usr/bin/env bash +# +# This file is part of MinIO DirectPV +# Copyright (c) 2022 MinIO, Inc. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . + +if [ "$#" -ne 1 ]; then + echo "usage: migration-tests-kustomize.sh " + exit 255 +fi + +LEGACY_VERSION="$1" +LEGACY_FILE="kubectl-direct_csi_${LEGACY_VERSION:1}_linux_amd64" + +set -ex + +# shellcheck source=/dev/null +source "common.sh" + +sed -e s:directpv-min-io:direct-csi-min-io:g -e s:directpv.min.io:direct.csi.min.io:g minio.yaml > directcsi-minio.yaml + +# usage: migrate_test +function migrate_test() { + directcsi_client="$1" + legacy_pod_count=$(( $2 + ACTIVE_NODES - 1 )) + pod_count=$(( 6 + ACTIVE_NODES * 2 )) + + setup_lvm + setup_luks + + install_directcsi "${directcsi_client}" "${legacy_pod_count}" + + "${directcsi_client}" drives format --all --force + + deploy_minio directcsi-minio.yaml + + uninstall_directcsi "${directcsi_client}" "${legacy_pod_count}" + + install_directpv_kustomize "${DIRECTPV_DIR}/kubectl-directpv" "${pod_count}" "true" + + delete_minio directcsi-minio.yaml + + deploy_minio directcsi-minio.yaml + + uninstall_minio "${DIRECTPV_DIR}/kubectl-directpv" directcsi-minio.yaml + + force_uninstall_directcsi "${directcsi_client}" + + remove_drives "${DIRECTPV_DIR}/kubectl-directpv" + uninstall_directpv "${DIRECTPV_DIR}/kubectl-directpv" "${pod_count}" "true" + + unmount_directpv + + remove_luks + remove_lvm +} + +curl --silent --location --insecure --fail --output "${LEGACY_FILE}" "https://github.com/minio/directpv/releases/download/${LEGACY_VERSION}/${LEGACY_FILE}" +chmod a+x "${LEGACY_FILE}" +migrate_test "./${LEGACY_FILE}" 4 diff --git a/operator/helm-charts/directpv-chart/templates/CSIDriver.yaml b/operator/helm-charts/directpv-chart/templates/CSIDriver.yaml index c96c394d..bae60543 100644 --- a/operator/helm-charts/directpv-chart/templates/CSIDriver.yaml +++ b/operator/helm-charts/directpv-chart/templates/CSIDriver.yaml @@ -3,7 +3,6 @@ apiVersion: storage.k8s.io/v1 kind: CSIDriver metadata: annotations: - directpv.min.io/plugin-version: v4.0.10 creationTimestamp: null labels: application-name: directpv.min.io diff --git a/operator/helm-charts/directpv-chart/templates/ClusterRole.yaml b/operator/helm-charts/directpv-chart/templates/ClusterRole.yaml index 49d4011d..d399a604 100644 --- a/operator/helm-charts/directpv-chart/templates/ClusterRole.yaml +++ b/operator/helm-charts/directpv-chart/templates/ClusterRole.yaml @@ -3,7 +3,6 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: annotations: - directpv.min.io/plugin-version: v4.0.10 rbac.authorization.kubernetes.io/autoupdate: "true" creationTimestamp: null labels: diff --git a/operator/helm-charts/directpv-chart/templates/ClusterRoleBinding.yaml b/operator/helm-charts/directpv-chart/templates/ClusterRoleBinding.yaml index db2c81ec..448cb692 100644 --- a/operator/helm-charts/directpv-chart/templates/ClusterRoleBinding.yaml +++ b/operator/helm-charts/directpv-chart/templates/ClusterRoleBinding.yaml @@ -3,7 +3,6 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: annotations: - directpv.min.io/plugin-version: v4.0.10 rbac.authorization.kubernetes.io/autoupdate: "true" creationTimestamp: null labels: diff --git a/operator/helm-charts/directpv-chart/templates/DaemonSet.yaml b/operator/helm-charts/directpv-chart/templates/DaemonSet.yaml index 2ab988df..0dca4aaa 100644 --- a/operator/helm-charts/directpv-chart/templates/DaemonSet.yaml +++ b/operator/helm-charts/directpv-chart/templates/DaemonSet.yaml @@ -2,9 +2,6 @@ apiVersion: apps/v1 kind: DaemonSet metadata: - annotations: - directpv.min.io/image-tag: v4.0.10 - directpv.min.io/plugin-version: v4.0.10 creationTimestamp: null labels: application-name: directpv.min.io diff --git a/operator/helm-charts/directpv-chart/templates/Deployment.yaml b/operator/helm-charts/directpv-chart/templates/Deployment.yaml index 27bd9a02..8551c57a 100644 --- a/operator/helm-charts/directpv-chart/templates/Deployment.yaml +++ b/operator/helm-charts/directpv-chart/templates/Deployment.yaml @@ -2,9 +2,6 @@ apiVersion: apps/v1 kind: Deployment metadata: - annotations: - directpv.min.io/image-tag: v4.0.10 - directpv.min.io/plugin-version: v4.0.10 creationTimestamp: null labels: application-name: directpv.min.io diff --git a/operator/helm-charts/directpv-chart/templates/Namespace.yaml b/operator/helm-charts/directpv-chart/templates/Namespace.yaml index ddbe0581..32bcf0d6 100644 --- a/operator/helm-charts/directpv-chart/templates/Namespace.yaml +++ b/operator/helm-charts/directpv-chart/templates/Namespace.yaml @@ -1,8 +1,6 @@ apiVersion: v1 kind: Namespace metadata: - annotations: - directpv.min.io/plugin-version: v4.0.10 creationTimestamp: null finalizers: - foregroundDeletion diff --git a/operator/helm-charts/directpv-chart/templates/Role.yaml b/operator/helm-charts/directpv-chart/templates/Role.yaml index 6c24f897..9fb48aa1 100644 --- a/operator/helm-charts/directpv-chart/templates/Role.yaml +++ b/operator/helm-charts/directpv-chart/templates/Role.yaml @@ -3,7 +3,6 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: annotations: - directpv.min.io/plugin-version: v4.0.10 rbac.authorization.kubernetes.io/autoupdate: "true" creationTimestamp: null labels: diff --git a/operator/helm-charts/directpv-chart/templates/RoleBinding.yaml b/operator/helm-charts/directpv-chart/templates/RoleBinding.yaml index 50a12e97..c79239fe 100644 --- a/operator/helm-charts/directpv-chart/templates/RoleBinding.yaml +++ b/operator/helm-charts/directpv-chart/templates/RoleBinding.yaml @@ -3,7 +3,6 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: annotations: - directpv.min.io/plugin-version: v4.0.10 rbac.authorization.kubernetes.io/autoupdate: "true" creationTimestamp: null labels: diff --git a/operator/helm-charts/directpv-chart/templates/ServiceAccount.yaml b/operator/helm-charts/directpv-chart/templates/ServiceAccount.yaml index a4687439..44991512 100644 --- a/operator/helm-charts/directpv-chart/templates/ServiceAccount.yaml +++ b/operator/helm-charts/directpv-chart/templates/ServiceAccount.yaml @@ -3,7 +3,6 @@ apiVersion: v1 kind: ServiceAccount metadata: annotations: - directpv.min.io/plugin-version: v4.0.10 creationTimestamp: null labels: application-name: directpv.min.io diff --git a/operator/helm-charts/directpv-chart/templates/StorageClass.yaml b/operator/helm-charts/directpv-chart/templates/StorageClass.yaml index 300c8aa4..97ecc0e8 100644 --- a/operator/helm-charts/directpv-chart/templates/StorageClass.yaml +++ b/operator/helm-charts/directpv-chart/templates/StorageClass.yaml @@ -8,8 +8,6 @@ allowedTopologies: apiVersion: storage.k8s.io/v1 kind: StorageClass metadata: - annotations: - directpv.min.io/plugin-version: v4.0.10 creationTimestamp: null finalizers: - foregroundDeletion diff --git a/pkg/admin/installer/args.go b/pkg/admin/installer/args.go index 91f68074..635e9418 100644 --- a/pkg/admin/installer/args.go +++ b/pkg/admin/installer/args.go @@ -21,7 +21,6 @@ import ( "fmt" "io" "path" - "regexp" "github.com/minio/directpv/pkg/utils" corev1 "k8s.io/api/core/v1" @@ -80,18 +79,10 @@ type Args struct { nodeDriverRegistrarImage string livenessProbeImage string csiResizerImage string - imageTag string } -var imageTagRegex = regexp.MustCompile(`:([^/]+)$`) - // NewArgs creates arguments for DirectPV installation. func NewArgs(image string) *Args { - imageTag := "dev" - matchIndex := imageTagRegex.FindStringSubmatchIndex(image) - if len(matchIndex) > 0 && len(image) > matchIndex[0]+1 { - imageTag = image[matchIndex[0]+1:] - } return &Args{ image: image, Registry: "quay.io", @@ -101,7 +92,6 @@ func NewArgs(image string) *Args { nodeDriverRegistrarImage: nodeDriverRegistrarImage, livenessProbeImage: livenessProbeImage, csiResizerImage: csiResizerImage, - imageTag: imageTag, } } diff --git a/pkg/admin/installer/csidriver.go b/pkg/admin/installer/csidriver.go index 7cce21ac..0437dae4 100644 --- a/pkg/admin/installer/csidriver.go +++ b/pkg/admin/installer/csidriver.go @@ -21,7 +21,6 @@ import ( "errors" "fmt" - directpvtypes "github.com/minio/directpv/pkg/apis/directpv.min.io/types" "github.com/minio/directpv/pkg/client" "github.com/minio/directpv/pkg/consts" legacyclient "github.com/minio/directpv/pkg/legacy/client" @@ -95,10 +94,7 @@ func (t csiDriverTask) doCreateCSIDriver(ctx context.Context, args *Args, versio ObjectMeta: metav1.ObjectMeta{ Name: name, Namespace: metav1.NamespaceNone, - Annotations: map[string]string{ - string(directpvtypes.PluginVersionLabelKey): args.PluginVersion, - }, - Labels: defaultLabels, + Labels: defaultLabels, }, Spec: storagev1.CSIDriverSpec{ PodInfoOnMount: &podInfoOnMount, @@ -128,10 +124,7 @@ func (t csiDriverTask) doCreateCSIDriver(ctx context.Context, args *Args, versio ObjectMeta: metav1.ObjectMeta{ Name: name, Namespace: metav1.NamespaceNone, - Annotations: map[string]string{ - string(directpvtypes.PluginVersionLabelKey): args.PluginVersion, - }, - Labels: defaultLabels, + Labels: defaultLabels, }, Spec: storagev1beta1.CSIDriverSpec{ PodInfoOnMount: &podInfoOnMount, diff --git a/pkg/admin/installer/daemonset.go b/pkg/admin/installer/daemonset.go index c3c6d546..791cf699 100644 --- a/pkg/admin/installer/daemonset.go +++ b/pkg/admin/installer/daemonset.go @@ -20,7 +20,6 @@ import ( "context" "fmt" - directpvtypes "github.com/minio/directpv/pkg/apis/directpv.min.io/types" "github.com/minio/directpv/pkg/client" "github.com/minio/directpv/pkg/consts" "github.com/minio/directpv/pkg/k8s" @@ -215,11 +214,7 @@ func newDaemonset(podSpec corev1.PodSpec, name, selectorValue string, args *Args ObjectMeta: metav1.ObjectMeta{ Name: name, Namespace: namespace, - Annotations: map[string]string{ - string(directpvtypes.ImageTagLabelKey): args.imageTag, - string(directpvtypes.PluginVersionLabelKey): args.PluginVersion, - }, - Labels: defaultLabels, + Labels: defaultLabels, }, Spec: appsv1.DaemonSetSpec{ Selector: metav1.AddLabelToSelector(&metav1.LabelSelector{}, selectorKey, selectorValue), diff --git a/pkg/admin/installer/deployment.go b/pkg/admin/installer/deployment.go index 1b14c272..e64cc3db 100644 --- a/pkg/admin/installer/deployment.go +++ b/pkg/admin/installer/deployment.go @@ -20,7 +20,6 @@ import ( "context" "fmt" - directpvtypes "github.com/minio/directpv/pkg/apis/directpv.min.io/types" "github.com/minio/directpv/pkg/client" "github.com/minio/directpv/pkg/consts" "github.com/minio/directpv/pkg/k8s" @@ -207,11 +206,7 @@ func (t deploymentTask) doCreateDeployment(ctx context.Context, args *Args, lega ObjectMeta: metav1.ObjectMeta{ Name: name, Namespace: namespace, - Annotations: map[string]string{ - string(directpvtypes.ImageTagLabelKey): args.imageTag, - string(directpvtypes.PluginVersionLabelKey): args.PluginVersion, - }, - Labels: defaultLabels, + Labels: defaultLabels, }, Spec: appsv1.DeploymentSpec{ Replicas: &replicas, diff --git a/pkg/admin/installer/namespace.go b/pkg/admin/installer/namespace.go index 5e7a1fb8..233a3170 100644 --- a/pkg/admin/installer/namespace.go +++ b/pkg/admin/installer/namespace.go @@ -19,7 +19,6 @@ package installer import ( "context" - directpvtypes "github.com/minio/directpv/pkg/apis/directpv.min.io/types" "github.com/minio/directpv/pkg/client" corev1 "k8s.io/api/core/v1" apierrors "k8s.io/apimachinery/pkg/api/errors" @@ -90,11 +89,8 @@ func (t namespaceTask) createNamespace(ctx context.Context, args *Args) (err err Kind: "Namespace", }, ObjectMeta: metav1.ObjectMeta{ - Name: namespace, - Namespace: metav1.NamespaceNone, - Annotations: map[string]string{ - string(directpvtypes.PluginVersionLabelKey): args.PluginVersion, - }, + Name: namespace, + Namespace: metav1.NamespaceNone, Labels: labels, Finalizers: []string{metav1.FinalizerDeleteDependents}, }, diff --git a/pkg/admin/installer/rbac.go b/pkg/admin/installer/rbac.go index 4bd1773b..c06f4084 100644 --- a/pkg/admin/installer/rbac.go +++ b/pkg/admin/installer/rbac.go @@ -19,7 +19,6 @@ package installer import ( "context" - directpvtypes "github.com/minio/directpv/pkg/apis/directpv.min.io/types" "github.com/minio/directpv/pkg/client" "github.com/minio/directpv/pkg/consts" corev1 "k8s.io/api/core/v1" @@ -99,10 +98,7 @@ func (t rbacTask) createServiceAccount(ctx context.Context, args *Args) (err err ObjectMeta: metav1.ObjectMeta{ Name: consts.Identity, Namespace: namespace, - Annotations: map[string]string{ - string(directpvtypes.PluginVersionLabelKey): args.PluginVersion, - }, - Labels: defaultLabels, + Labels: defaultLabels, }, Secrets: []corev1.ObjectReference{}, ImagePullSecrets: []corev1.LocalObjectReference{}, @@ -142,7 +138,6 @@ func (t rbacTask) createClusterRole(ctx context.Context, args *Args) (err error) Namespace: metav1.NamespaceNone, Annotations: map[string]string{ "rbac.authorization.kubernetes.io/autoupdate": "true", - string(directpvtypes.PluginVersionLabelKey): args.PluginVersion, }, Labels: defaultLabels, }, @@ -209,7 +204,6 @@ func (t rbacTask) createClusterRoleBinding(ctx context.Context, args *Args) (err Namespace: metav1.NamespaceNone, Annotations: map[string]string{ "rbac.authorization.kubernetes.io/autoupdate": "true", - string(directpvtypes.PluginVersionLabelKey): args.PluginVersion, }, Labels: defaultLabels, }, @@ -260,7 +254,6 @@ func (t rbacTask) createRole(ctx context.Context, args *Args) (err error) { Namespace: namespace, Annotations: map[string]string{ "rbac.authorization.kubernetes.io/autoupdate": "true", - string(directpvtypes.PluginVersionLabelKey): args.PluginVersion, }, Labels: defaultLabels, }, @@ -302,7 +295,6 @@ func (t rbacTask) createRoleBinding(ctx context.Context, args *Args) (err error) Namespace: namespace, Annotations: map[string]string{ "rbac.authorization.kubernetes.io/autoupdate": "true", - string(directpvtypes.PluginVersionLabelKey): args.PluginVersion, }, Labels: defaultLabels, }, diff --git a/pkg/admin/installer/storageclass.go b/pkg/admin/installer/storageclass.go index 8c4fce60..65142f04 100644 --- a/pkg/admin/installer/storageclass.go +++ b/pkg/admin/installer/storageclass.go @@ -101,11 +101,8 @@ func (t storageClassTask) doCreateStorageClass(ctx context.Context, args *Args, storageClass := &storagev1.StorageClass{ TypeMeta: metav1.TypeMeta{APIVersion: "storage.k8s.io/v1", Kind: "StorageClass"}, ObjectMeta: metav1.ObjectMeta{ - Name: name, - Namespace: metav1.NamespaceNone, - Annotations: map[string]string{ - string(directpvtypes.PluginVersionLabelKey): args.PluginVersion, - }, + Name: name, + Namespace: metav1.NamespaceNone, Labels: defaultLabels, Finalizers: []string{metav1.FinalizerDeleteDependents}, }, @@ -135,11 +132,8 @@ func (t storageClassTask) doCreateStorageClass(ctx context.Context, args *Args, storageClass := &storagev1beta1.StorageClass{ TypeMeta: metav1.TypeMeta{APIVersion: "storage.k8s.io/v1beta1", Kind: "StorageClass"}, ObjectMeta: metav1.ObjectMeta{ - Name: name, - Namespace: metav1.NamespaceNone, - Annotations: map[string]string{ - string(directpvtypes.PluginVersionLabelKey): args.PluginVersion, - }, + Name: name, + Namespace: metav1.NamespaceNone, Labels: defaultLabels, Finalizers: []string{metav1.FinalizerDeleteDependents}, }, diff --git a/pkg/apis/directpv.min.io/types/label.go b/pkg/apis/directpv.min.io/types/label.go index 72425b63..df569fe5 100644 --- a/pkg/apis/directpv.min.io/types/label.go +++ b/pkg/apis/directpv.min.io/types/label.go @@ -88,12 +88,6 @@ const ( // ClaimIDLabelKey label key to denote the claim id of the volumes ClaimIDLabelKey LabelKey = consts.GroupName + "/claim-id" - - // ImageTagLabelKey denotes the tag of the directpv container image - ImageTagLabelKey LabelKey = consts.GroupName + "/image-tag" - - // PluginVersionLabelKey denotes the plugin version - PluginVersionLabelKey LabelKey = consts.GroupName + "/plugin-version" ) var reservedLabelKeys = map[LabelKey]struct{}{ @@ -115,8 +109,6 @@ var reservedLabelKeys = map[LabelKey]struct{}{ SuspendLabelKey: {}, VolumeClaimIDLabelKey: {}, ClaimIDLabelKey: {}, - ImageTagLabelKey: {}, - PluginVersionLabelKey: {}, } // IsReserved returns if the key is a reserved key diff --git a/resources/base/CSIDriver.yaml b/resources/base/CSIDriver.yaml index 5b78952c..795d9485 100644 --- a/resources/base/CSIDriver.yaml +++ b/resources/base/CSIDriver.yaml @@ -2,8 +2,6 @@ apiVersion: storage.k8s.io/v1 kind: CSIDriver metadata: - annotations: - directpv.min.io/plugin-version: v4.1.4 creationTimestamp: null labels: application-name: directpv.min.io diff --git a/resources/base/ClusterRole.yaml b/resources/base/ClusterRole.yaml index e5fc7c50..9ded91a6 100644 --- a/resources/base/ClusterRole.yaml +++ b/resources/base/ClusterRole.yaml @@ -3,7 +3,6 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: annotations: - directpv.min.io/plugin-version: v4.1.4 rbac.authorization.kubernetes.io/autoupdate: "true" creationTimestamp: null labels: diff --git a/resources/base/ClusterRoleBinding.yaml b/resources/base/ClusterRoleBinding.yaml index eafde0c9..66e53a38 100644 --- a/resources/base/ClusterRoleBinding.yaml +++ b/resources/base/ClusterRoleBinding.yaml @@ -3,7 +3,6 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding metadata: annotations: - directpv.min.io/plugin-version: v4.1.4 rbac.authorization.kubernetes.io/autoupdate: "true" creationTimestamp: null labels: diff --git a/resources/base/DaemonSet.yaml b/resources/base/DaemonSet.yaml index f97f4d84..7659901a 100644 --- a/resources/base/DaemonSet.yaml +++ b/resources/base/DaemonSet.yaml @@ -2,9 +2,6 @@ apiVersion: apps/v1 kind: DaemonSet metadata: - annotations: - directpv.min.io/image-tag: v4.1.4 - directpv.min.io/plugin-version: v4.1.4 creationTimestamp: null labels: application-name: directpv.min.io diff --git a/resources/base/Deployment.yaml b/resources/base/Deployment.yaml index b07e34d0..75d2c9a4 100644 --- a/resources/base/Deployment.yaml +++ b/resources/base/Deployment.yaml @@ -2,9 +2,6 @@ apiVersion: apps/v1 kind: Deployment metadata: - annotations: - directpv.min.io/image-tag: v4.1.4 - directpv.min.io/plugin-version: v4.1.4 creationTimestamp: null labels: application-name: directpv.min.io diff --git a/resources/base/Namespace.yaml b/resources/base/Namespace.yaml index 224ae629..8ed8d806 100644 --- a/resources/base/Namespace.yaml +++ b/resources/base/Namespace.yaml @@ -1,8 +1,6 @@ apiVersion: v1 kind: Namespace metadata: - annotations: - directpv.min.io/plugin-version: v4.1.4 creationTimestamp: null finalizers: - foregroundDeletion diff --git a/resources/base/Role.yaml b/resources/base/Role.yaml index ec53d0f4..afe125e3 100644 --- a/resources/base/Role.yaml +++ b/resources/base/Role.yaml @@ -3,7 +3,6 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: Role metadata: annotations: - directpv.min.io/plugin-version: v4.1.4 rbac.authorization.kubernetes.io/autoupdate: "true" creationTimestamp: null labels: diff --git a/resources/base/RoleBinding.yaml b/resources/base/RoleBinding.yaml index 828e5c4a..b1f5f46a 100644 --- a/resources/base/RoleBinding.yaml +++ b/resources/base/RoleBinding.yaml @@ -3,7 +3,6 @@ apiVersion: rbac.authorization.k8s.io/v1 kind: RoleBinding metadata: annotations: - directpv.min.io/plugin-version: v4.1.4 rbac.authorization.kubernetes.io/autoupdate: "true" creationTimestamp: null labels: diff --git a/resources/base/ServiceAccount.yaml b/resources/base/ServiceAccount.yaml index 2b6b91fe..f0ccf775 100644 --- a/resources/base/ServiceAccount.yaml +++ b/resources/base/ServiceAccount.yaml @@ -2,8 +2,6 @@ apiVersion: v1 kind: ServiceAccount metadata: - annotations: - directpv.min.io/plugin-version: v4.1.4 creationTimestamp: null labels: application-name: directpv.min.io diff --git a/resources/base/StorageClass.yaml b/resources/base/StorageClass.yaml index 549c975c..05c3ea01 100644 --- a/resources/base/StorageClass.yaml +++ b/resources/base/StorageClass.yaml @@ -8,8 +8,6 @@ allowedTopologies: apiVersion: storage.k8s.io/v1 kind: StorageClass metadata: - annotations: - directpv.min.io/plugin-version: v4.1.4 creationTimestamp: null finalizers: - foregroundDeletion diff --git a/resources/base/kustomization.yaml b/resources/base/kustomization.yaml index f3c06b54..813ffd06 100644 --- a/resources/base/kustomization.yaml +++ b/resources/base/kustomization.yaml @@ -33,16 +33,3 @@ images: - name: quay.io/minio/csi-resizer digest: sha256:58fa627393f20892b105a137d27e236dfaec233a3a64980f84dcb15f38c21533 -patches: - - patch: |- - - op: replace - path: /metadata/annotations/directpv.min.io~1plugin-version - value: v4.1.4 - target: - annotationSelector: directpv.min.io/plugin-version - - patch: |- - - op: replace - path: /metadata/annotations/directpv.min.io~1image-tag - value: v4.1.4 - target: - annotationSelector: directpv.min.io/image-tag diff --git a/resources/legacy/CSIDriver.yaml b/resources/legacy/CSIDriver.yaml index 2258c1a0..7ac84861 100644 --- a/resources/legacy/CSIDriver.yaml +++ b/resources/legacy/CSIDriver.yaml @@ -2,8 +2,6 @@ apiVersion: storage.k8s.io/v1 kind: CSIDriver metadata: - annotations: - directpv.min.io/plugin-version: v4.1.4 creationTimestamp: null labels: application-name: directpv.min.io diff --git a/resources/legacy/DaemonSet.yaml b/resources/legacy/DaemonSet.yaml index c21689c6..1dbf1156 100644 --- a/resources/legacy/DaemonSet.yaml +++ b/resources/legacy/DaemonSet.yaml @@ -1,9 +1,6 @@ apiVersion: apps/v1 kind: DaemonSet metadata: - annotations: - directpv.min.io/image-tag: v4.1.4 - directpv.min.io/plugin-version: v4.1.4 creationTimestamp: null labels: application-name: directpv.min.io diff --git a/resources/legacy/Deployment.yaml b/resources/legacy/Deployment.yaml index 9a37ad80..0b1ae1c8 100644 --- a/resources/legacy/Deployment.yaml +++ b/resources/legacy/Deployment.yaml @@ -2,9 +2,6 @@ apiVersion: apps/v1 kind: Deployment metadata: - annotations: - directpv.min.io/image-tag: v4.1.4 - directpv.min.io/plugin-version: v4.1.4 creationTimestamp: null labels: application-name: directpv.min.io diff --git a/resources/legacy/StorageClass.yaml b/resources/legacy/StorageClass.yaml index 1ba1cb15..692e93e7 100644 --- a/resources/legacy/StorageClass.yaml +++ b/resources/legacy/StorageClass.yaml @@ -8,8 +8,6 @@ allowedTopologies: apiVersion: storage.k8s.io/v1 kind: StorageClass metadata: - annotations: - directpv.min.io/plugin-version: v4.1.4 creationTimestamp: null finalizers: - foregroundDeletion diff --git a/resources/legacy/kustomization.yaml b/resources/legacy/kustomization.yaml index f8258e64..61aa767c 100644 --- a/resources/legacy/kustomization.yaml +++ b/resources/legacy/kustomization.yaml @@ -24,16 +24,3 @@ images: - name: quay.io/minio/csi-resizer digest: sha256:58fa627393f20892b105a137d27e236dfaec233a3a64980f84dcb15f38c21533 -patches: - - patch: |- - - op: replace - path: /metadata/annotations/directpv.min.io~1plugin-version - value: v4.1.4 - target: - annotationSelector: directpv.min.io/plugin-version - - patch: |- - - op: replace - path: /metadata/annotations/directpv.min.io~1image-tag - value: v4.1.4 - target: - annotationSelector: directpv.min.io/image-tag