Compare commits

..

10 Commits

Author SHA1 Message Date
openeuler-ci-bot
aa5b5d5501
!16 Fixed a bug for upgrading the operating system
From: @lauk001 
Reviewed-by: @duyiwei7w 
Signed-off-by: @duyiwei7w
2024-05-13 10:42:18 +00:00
lauk001
acc8f1bc59 Fixed a bug for upgrading the operating system 2024-05-12 02:52:58 +08:00
openeuler-ci-bot
b4a9ec25ac
!13 Delete require nkd in nkd-housekeeper
From: @jianli-97 
Reviewed-by: @duyiwei7w 
Signed-off-by: @duyiwei7w
2024-04-17 01:11:44 +00:00
openeuler-ci-bot
9519a03938
!10 Add README.md README.en.md LICENSE and new require kubernetes-client
From: @jianli-97 
Reviewed-by: @duyiwei7w 
Signed-off-by: @duyiwei7w
2024-04-16 06:00:43 +00:00
jianli-97
d70ac01d8b Delete require nkd in nkd-housekeeper 2024-04-16 13:34:01 +08:00
jianli-97
713a77c225 Add README.md README.en.md LICENSE and new require kubernetes-client 2024-04-16 12:36:37 +08:00
openeuler-ci-bot
bedbc0006a
!8 [sync] PR-5: Upgrade to 0.2.2
From: @openeuler-sync-bot 
Reviewed-by: @duyiwei7w 
Signed-off-by: @duyiwei7w
2024-03-21 08:42:49 +00:00
jianli-97
0c43655438 Upgrade to 0.2.2
(cherry picked from commit fa293c5be6152740ffe8826951ae3e45381f9dc1)
2024-03-21 16:28:34 +08:00
openeuler-ci-bot
6f4ebb0b75
!6 [sync] PR-4: add require opentofu
From: @openeuler-sync-bot 
Reviewed-by: @duyiwei7w 
Signed-off-by: @duyiwei7w
2024-03-21 08:27:40 +00:00
jianli-97
4b19854c01 add require opentofu
(cherry picked from commit 34ef12cb585bd7a451f9d92cfb754f96671bee22)
2024-03-21 15:33:45 +08:00
3 changed files with 65 additions and 3 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

@ -1,24 +1,30 @@
%define debug_package %{nil} %define debug_package %{nil}
Name: nestos-kubernetes-deployer Name: nestos-kubernetes-deployer
Version: 0.2.1 Version: 0.2.2
Release: 1 Release: 4
Summary: A platform to deploy and operate k8s clusters Summary: A platform to deploy and operate k8s clusters
License: Apache-2.0 License: Apache-2.0
URL: https://gitee.com/openeuler/nestos-kubernetes-deployer URL: https://gitee.com/openeuler/nestos-kubernetes-deployer
Source0: %{name}-%{version}.tar.gz Source0: %{name}-%{version}.tar.gz
Patch0001: 0001-bugfix-for-upgrading-os.patch
BuildRequires: make BuildRequires: make
BuildRequires: glibc BuildRequires: glibc
BuildRequires: golang >= 1.17 BuildRequires: golang >= 1.17
%description %description
This is a deployment tool of kubernetes cluster O&M platform based on NestOS. 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. The goal is to provide services such as deployment, update and configuration management of the infrastructure outside of the kubernetes cluster.
%prep %prep
%autosetup -n %{name}-%{version} %autosetup -Sgit -n %{name}-%{version} -p1
%package -n nkd %package -n nkd
Summary: nkd Summary: nkd
Requires: opentofu
Requires: kubernetes-client
Provides: nkd = %{version}-%{release} Provides: nkd = %{version}-%{release}
%description -n nkd %description -n nkd
Deployment tool. Deployment tool.
@ -45,6 +51,10 @@ install -D -m 0555 nkd %{buildroot}%{_bindir}/nkd
install -D -m 0555 housekeeper/bin/housekeeper-daemon %{buildroot}%{_bindir}/housekeeper-daemon 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 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 %files -n nkd
%{_bindir}/nkd %{_bindir}/nkd
@ -53,6 +63,25 @@ install -D -m 0644 housekeeper/daemon/files/housekeeper-daemon.service %{buildro
/usr/lib/systemd/system/housekeeper-daemon.service /usr/lib/systemd/system/housekeeper-daemon.service
%changelog %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 * Fri Feb 23 2024 lijian <lijian2@kylinos.cn> - 0.2.1-1
- Bugfix for v0.2.0 - Bugfix for v0.2.0