Fixed a bug for upgrading the operating system

(cherry picked from commit acc8f1bc59630ec203e209fff9c6b9a6a14d8b4d)
This commit is contained in:
lauk001 2024-05-12 01:59:02 +08:00 committed by openeuler-sync-bot
parent 3f3a02f14e
commit 125eae0e04
2 changed files with 44 additions and 2 deletions

View File

@ -0,0 +1,33 @@
From d2863e4721897c64673cee5ed0af09046e8a9f0e Mon Sep 17 00:00:00 2001
From: lauk001 <liukuo@kylinos.cn>
Date: Sun, 12 May 2024 02:50:14 +0800
Subject: [PATCH] bugfix-for-upgrading-os
---
cmd/upgrade.go | 5 -----
1 file changed, 5 deletions(-)
diff --git a/cmd/upgrade.go b/cmd/upgrade.go
index 2075df2..eb02648 100755
--- a/cmd/upgrade.go
+++ b/cmd/upgrade.go
@@ -51,16 +51,11 @@ func getFlagString(cmd *cobra.Command, flagName string) string {
func runUpgradeCmd(cmd *cobra.Command, args []string) error {
clusterId := getFlagString(cmd, "cluster-id")
- kubeVersion := getFlagString(cmd, "kube-version")
imageURL := getFlagString(cmd, "imageurl")
if clusterId == "" {
return errors.New("cluster-id is required")
}
- if kubeVersion == "" {
- return errors.New("kube-version is required")
- }
-
if imageURL == "" {
return errors.New("imageurl is required")
}
--
2.33.0

View File

@ -2,11 +2,14 @@
Name: nestos-kubernetes-deployer
Version: 0.2.2
Release: 3
Release: 4
Summary: A platform to deploy and operate k8s clusters
License: Apache-2.0
URL: https://gitee.com/openeuler/nestos-kubernetes-deployer
Source0: %{name}-%{version}.tar.gz
Patch0001: 0001-bugfix-for-upgrading-os.patch
BuildRequires: make
BuildRequires: glibc
BuildRequires: golang >= 1.17
@ -16,7 +19,7 @@ This is a deployment tool of kubernetes cluster O&M platform based on NestOS.
The goal is to provide services such as deployment, update and configuration management of the infrastructure outside of the kubernetes cluster.
%prep
%autosetup -n %{name}-%{version}
%autosetup -Sgit -n %{name}-%{version} -p1
%package -n nkd
Summary: nkd
@ -60,6 +63,12 @@ install -D -m 0644 housekeeper/daemon/files/housekeeper-daemon.service %{buildro
/usr/lib/systemd/system/housekeeper-daemon.service
%changelog
* Mon May 13 2024 liukuo <liukuo@kylinos.cn> - 0.2.2-4
- Type: bugfix
- ID:NA
- SUG:NA
- DESC: Modify bugs for upgrading the operating system
* Tue Apr 16 2024 lijian <lijian2@kylinos.cn> - 0.2.2-3
- Delete require nkd in nkd-housekeeper