Skip to content

Commit 81a757e

Browse files
chore: pr comments
1 parent 276042a commit 81a757e

File tree

3 files changed

+2
-5
lines changed

3 files changed

+2
-5
lines changed

pkg/components/storage.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ func startCSIPlugin(ctx context.Context, cfg *config.Config, kubeconfigPath stri
6262
// deleteLegacyResources deletes the legacy resources of TopoLVM.
6363
// TODO: Remove this function in the next release.
6464
func deleteLegacyResources(ctx context.Context, kubeconfigPath string) error {
65-
klog.Infof("Deleting legacy resources of TopoLVM (this is a migration operation and will disappear in the future release)")
65+
klog.Infof("Deleting legacy resources of TopoLVM (this is a migration operation and will disappear in the next release)")
6666
return assets.DeleteGeneric(ctx, []runtime.Object{
6767
&appsv1.Deployment{ObjectMeta: metav1.ObjectMeta{Name: "topolvm-controller", Namespace: "openshift-storage"}},
6868
&appsv1.DaemonSet{ObjectMeta: metav1.ObjectMeta{Name: "topolvm-node", Namespace: "openshift-storage"}},
@@ -218,7 +218,6 @@ func loadCSIPluginConfig(ctx context.Context,
218218
watcher, err := fsnotify.NewWatcher()
219219
if err != nil {
220220
klog.Errorf("unable to set up file watcher: %v", err)
221-
cancel(err)
222221
return
223222
}
224223
defer func() {
@@ -228,7 +227,6 @@ func loadCSIPluginConfig(ctx context.Context,
228227
}()
229228
if err = watcher.Add(usrCfgDir); err != nil {
230229
klog.Errorf("unable to add file path to watcher: %v", err)
231-
cancel(err)
232230
return
233231
}
234232

scripts/auto-rebase/rebase-lvms.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ patch_namespace() {
184184
if [[ $(yq e ".metadata.namespace == \"${namespace}\"" "${file}") == "false" ]]; then
185185
echo "patching .metadata.namespace to \"${namespace}\" in ${file}"
186186
# Set the .metadata.namespace to the specified value
187-
yq e '.metadata.namespace = "'"${namespace}"'"' -i "${file}"
187+
yq e ".metadata.namespace == \"${namespace}\"" -i "${file}"
188188
fi
189189
fi
190190
}

scripts/auto-rebase/rebase_job_entrypoint.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ pullspec_release_lvms="registry.redhat.io/lvms4/lvms-operator-bundle:${release_l
7171
# the latest lvms release candidate replicated from CPaaS into quay
7272
pullspec_release_lvms_fallback="quay.io/lvms_dev/lvms4-lvms-operator-bundle:${release_lvms}"
7373

74-
# You can also pass the version as a command-line argument
7574
lvms_is_candidate_build=$(check_semver_suffix "${release_lvms}")
7675
if [ "$lvms_is_candidate_build" == "false" ]; then
7776
./scripts/auto-rebase/rebase-lvms.sh to "${pullspec_release_lvms}"

0 commit comments

Comments
 (0)