Compare commits

..

No commits in common. "aa5b5d5501154f477375bd5636c2adad75196a97" and "d343477b3df20c68a90d505075875e17bb4bd5ac" have entirely different histories.

3 changed files with 3 additions and 65 deletions

View File

@ -1,33 +0,0 @@
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

@ -1,30 +1,24 @@
%define debug_package %{nil}
Name: nestos-kubernetes-deployer
Version: 0.2.2
Release: 4
Version: 0.2.1
Release: 1
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
%description
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 -Sgit -n %{name}-%{version} -p1
%autosetup -n %{name}-%{version}
%package -n nkd
Summary: nkd
Requires: opentofu
Requires: kubernetes-client
Provides: nkd = %{version}-%{release}
%description -n nkd
Deployment tool.
@ -51,10 +45,6 @@ install -D -m 0555 nkd %{buildroot}%{_bindir}/nkd
install -D -m 0555 housekeeper/bin/housekeeper-daemon %{buildroot}%{_bindir}/housekeeper-daemon
install -D -m 0644 housekeeper/daemon/files/housekeeper-daemon.service %{buildroot}/usr/lib/systemd/system/housekeeper-daemon.service
%files
%doc README.md README.en.md
%license LICENSE
%files -n nkd
%{_bindir}/nkd
@ -63,25 +53,6 @@ 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
* Tue Apr 16 2024 lijian <lijian2@kylinos.cn> - 0.2.2-2
- Add README.md README.en.md LICENSE
- Add new require kubernetes-client
* Thu Mar 21 2024 lijian <lijian2@kylinos.cn> - 0.2.2-1
- Upgrade to 0.2.2
* Thu Mar 21 2024 lijian <lijian2@kylinos.cn> - 0.2.1-2
- Add require opentofu
* Fri Feb 23 2024 lijian <lijian2@kylinos.cn> - 0.2.1-1
- Bugfix for v0.2.0