diff --git a/SPECS/kured/kured-imagePullPolicy.patch b/SPECS/kured/kured-imagePullPolicy.patch index 39ca76e6d0..42d967e2f5 100644 --- a/SPECS/kured/kured-imagePullPolicy.patch +++ b/SPECS/kured/kured-imagePullPolicy.patch @@ -1,8 +1,9 @@ -diff -urN kured-1.4.0.old/kured-ds.yaml kured-1.4.0/kured-ds.yaml ---- kured-1.4.0.old/kured-ds.yaml 2020-04-30 18:07:30.000000000 +0200 -+++ kured-1.4.0/kured-ds.yaml 2020-05-18 09:20:34.176054210 +0200 -@@ -32,7 +32,7 @@ - image: docker.io/weaveworks/kured +diff --git a/kured-ds.yaml b/kured-ds.yaml +index 15869c4..b226865 100644 +--- a/kured-ds.yaml ++++ b/kured-ds.yaml +@@ -32,7 +32,7 @@ spec: + image: docker.io/weaveworks/kured:1.9.1 # If you find yourself here wondering why there is no # :latest tag on Docker Hub,see the FAQ in the README - imagePullPolicy: IfNotPresent diff --git a/SPECS/kured/kured.signatures.json b/SPECS/kured/kured.signatures.json index 287f13b5dd..3ff43ddd48 100644 --- a/SPECS/kured/kured.signatures.json +++ b/SPECS/kured/kured.signatures.json @@ -1,6 +1,6 @@ { "Signatures": { - "kured-1.6.1-vendor.tar.gz": "98d09cf6f513542a02aba9d7c827bd1c8ac8899af6741a3cfcfe12e334950ff6", - "kured-1.6.1.tar.gz": "0f307782e8dae3a99233d8889232aaa0fdb6d1585bc87fe99804d0f00060a0f6" + "kured-1.9.1-vendor.tar.gz": "7743175bf349081f2ece085cd5dfd996621cf4bc8e2dc9b7bfd470e16d6a9516", + "kured-1.9.1.tar.gz": "3bd411b68f482c065ff64435f6efb16f7d0e50b438d8574f7e5ce73454710a8d" } } \ No newline at end of file diff --git a/SPECS/kured/kured.spec b/SPECS/kured/kured.spec index 10318b82f2..678ee07226 100644 --- a/SPECS/kured/kured.spec +++ b/SPECS/kured/kured.spec @@ -20,12 +20,12 @@ # Remove stripping of Go binaries. %define __arch_install_post export NO_BRP_STRIP_DEBUG=true # Project upstream commit. -%define commit 685f328 +%define commit 2b36eab %global debug_package %{nil} Summary: Kubernetes daemonset to perform safe automatic node reboots Name: kured -Version: 1.6.1 -Release: 2%{?dist} +Version: 1.9.1 +Release: 1%{?dist} License: Apache-2.0 Vendor: Microsoft Corporation Distribution: Mariner @@ -47,8 +47,7 @@ Source0: %{name}-%{version}.tar.gz # -cf %%{name}-%%{version}-vendor.tar.gz vendor # Source1: %{name}-%{version}-vendor.tar.gz -Patch0: systemctl-path.patch -Patch1: kured-imagePullPolicy.patch +Patch0: kured-imagePullPolicy.patch BuildRequires: fdupes BuildRequires: go-go-md2man BuildRequires: golang @@ -79,7 +78,6 @@ kured container in a kubernetes cluster. %prep %setup -q %patch0 -p1 -%patch1 -p1 %build # create vendor folder from the vendor tarball and set vendor mode @@ -124,6 +122,11 @@ sed -i -e 's|image: .*|image: registry.opensuse.org/kubic/kured:%{version}|g' %{ %{_datarootdir}/k8s-yaml/kured/kured.yaml %changelog +* Wed Feb 09 2022 Henry Li - 1.9.1-1 +- Upgrade to version 1.9.1 +- Remove systemctl-path.patch +- Update kured-imagePullPolicy.patch + * Tue Oct 12 2021 Pawel Winogrodzki - 1.6.1-2 - Switching to using a single digit for the 'Release' tag. diff --git a/SPECS/kured/systemctl-path.patch b/SPECS/kured/systemctl-path.patch deleted file mode 100644 index b86cb0e6b1..0000000000 --- a/SPECS/kured/systemctl-path.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -urN kured-1.4.0.old/cmd/kured/main.go kured-1.4.0/cmd/kured/main.go ---- kured-1.4.0.old/cmd/kured/main.go 2020-04-30 18:07:30.000000000 +0200 -+++ kured-1.4.0/cmd/kured/main.go 2020-05-17 14:13:01.956576943 +0200 -@@ -261,7 +261,7 @@ - } - - // Relies on hostPID:true and privileged:true to enter host mount space -- rebootCmd := newCommand("/usr/bin/nsenter", "-m/proc/1/ns/mnt", "/bin/systemctl", "reboot") -+ rebootCmd := newCommand("/usr/bin/nsenter", "-m/proc/1/ns/mnt", "/usr/bin/systemctl", "reboot") - if err := rebootCmd.Run(); err != nil { - log.Fatalf("Error invoking reboot command: %v", err) - } diff --git a/cgmanifest.json b/cgmanifest.json index e55fe32014..6d7bbeebfa 100644 --- a/cgmanifest.json +++ b/cgmanifest.json @@ -8721,8 +8721,8 @@ "type": "other", "other": { "name": "kured", - "version": "1.6.1", - "downloadUrl": "https://github.com/weaveworks/kured/archive/refs/tags/1.6.1.tar.gz" + "version": "1.9.1", + "downloadUrl": "https://github.com/weaveworks/kured/archive/refs/tags/1.9.1.tar.gz" } } },