diff --git a/kubernetes/etcd/debian/deb_folder/changelog b/kubernetes/etcd/debian/deb_folder/changelog index 71d868ab2..b19339501 100644 --- a/kubernetes/etcd/debian/deb_folder/changelog +++ b/kubernetes/etcd/debian/deb_folder/changelog @@ -1,3 +1,9 @@ +etcd (3.4.36-1) unstable; urgency=medium + + * Updated for stx debian packaging + + -- Kaustubh Dhokte Tue, 08 Apr 2025 16:41:53 +0000 + etcd (3.4.27-1) unstable; urgency=medium * Updated for stx debian packaging diff --git a/kubernetes/etcd/debian/deb_folder/etcd-client.install b/kubernetes/etcd/debian/deb_folder/etcd-client.install index 457d7b1c1..c07aebadf 100644 --- a/kubernetes/etcd/debian/deb_folder/etcd-client.install +++ b/kubernetes/etcd/debian/deb_folder/etcd-client.install @@ -1 +1 @@ -usr/bin/etcdctl +etcdctl usr/bin/ diff --git a/kubernetes/etcd/debian/deb_folder/etcd-server.install b/kubernetes/etcd/debian/deb_folder/etcd-server.install index 007f820b0..b7e27d376 100644 --- a/kubernetes/etcd/debian/deb_folder/etcd-server.install +++ b/kubernetes/etcd/debian/deb_folder/etcd-server.install @@ -1 +1 @@ -usr/bin/etcd +etcd usr/bin/ diff --git a/kubernetes/etcd/debian/deb_folder/golang-etcd-server-dev.install b/kubernetes/etcd/debian/deb_folder/golang-etcd-server-dev.install deleted file mode 100644 index 653271ba9..000000000 --- a/kubernetes/etcd/debian/deb_folder/golang-etcd-server-dev.install +++ /dev/null @@ -1 +0,0 @@ -/usr/share/gocode/src diff --git a/kubernetes/etcd/debian/deb_folder/patches/0001-Increate-health-check-timeout.patch b/kubernetes/etcd/debian/deb_folder/patches/0001-Increate-health-check-timeout.patch deleted file mode 100644 index dc56a6b35..000000000 --- a/kubernetes/etcd/debian/deb_folder/patches/0001-Increate-health-check-timeout.patch +++ /dev/null @@ -1,32 +0,0 @@ -From ec992b6080f5fff7545a2d5026f444674ae1b0f1 Mon Sep 17 00:00:00 2001 -From: Andy Ning -Date: Fri, 19 Apr 2024 11:28:39 -0400 -Subject: [PATCH 1/1] Increate health check timeout - -Under high load, the /health check QGET times out occasionally. -This change increase the timeout value to 5s. - -Signed-off-by: Andy Ning ---- - etcdserver/api/etcdhttp/metrics.go | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/etcdserver/api/etcdhttp/metrics.go b/etcdserver/api/etcdhttp/metrics.go -index e5c062e..d12ead0 100644 ---- a/etcdserver/api/etcdhttp/metrics.go -+++ b/etcdserver/api/etcdhttp/metrics.go -@@ -134,7 +134,10 @@ func checkHealth(srv etcdserver.ServerV2, excludedAlarms AlarmSet) Health { - } - - if h.Health == "true" { -- ctx, cancel := context.WithTimeout(context.Background(), time.Second) -+ time_out := time.Second*5 -+ plog.Debugf("/health check; QGET timeout: %v", time_out) -+ -+ ctx, cancel := context.WithTimeout(context.Background(), time_out) - _, err := srv.Do(ctx, etcdserverpb.Request{Method: "QGET"}) - cancel() - if err != nil { --- -2.25.1 - diff --git a/kubernetes/etcd/debian/deb_folder/patches/series b/kubernetes/etcd/debian/deb_folder/patches/series deleted file mode 100644 index 766ca7647..000000000 --- a/kubernetes/etcd/debian/deb_folder/patches/series +++ /dev/null @@ -1 +0,0 @@ -0001-Increate-health-check-timeout.patch diff --git a/kubernetes/etcd/debian/deb_folder/rules b/kubernetes/etcd/debian/deb_folder/rules index bfa3dbdb8..12b6d47d5 100755 --- a/kubernetes/etcd/debian/deb_folder/rules +++ b/kubernetes/etcd/debian/deb_folder/rules @@ -1,13 +1,7 @@ #!/usr/bin/make -f - -export DH_GOLANG_GO_GENERATE := 0 +# See debhelper(7) (uncomment to enable) +# output every command that modifies files on the build system. +export DH_VERBOSE = 1 %: - dh $@ --buildsystem=golang --with=golang --builddirectory=_build - -# There is a script named "build" in the upstream source. -# So let us be explicit about the .PHONY target here to avoid conflicts. -build: - dh build --buildsystem=golang --with=golang --builddirectory=_build - -.PHONY: build + dh $@ diff --git a/kubernetes/etcd/debian/meta_data.yaml b/kubernetes/etcd/debian/meta_data.yaml index 758bfb781..7c6e7852d 100644 --- a/kubernetes/etcd/debian/meta_data.yaml +++ b/kubernetes/etcd/debian/meta_data.yaml @@ -1,11 +1,11 @@ --- debname: etcd -debver: 3.4.27 +debver: 3.4.36 dl_path: - name: etcd-3.4.27.tar.gz - url: https://github.com/etcd-io/etcd/archive/refs/tags/v3.4.27.tar.gz - md5sum: 8337cfbd8c437107b0b95fef06fe1d18 - sha256sum: aad42ea0635bc6481b04eb6e279c6122ccd72117018296aab32d0f9d6d606243 + name: etcd-3.4.36.tar.gz + url: https://github.com/etcd-io/etcd/releases/download/v3.4.36/etcd-v3.4.36-linux-amd64.tar.gz + md5sum: a00d13822c46ca6c6224b537499f62b2 + sha256sum: 077e2054cefb5015089d76b8a665827c3965ac275e23faacb34ef5878f768550 revision: dist: $STX_DIST GITREVCOUNT: