version: 3.3.27

Signed-off-by: Sam Batschelet <sbatsche@redhat.com>
Merge pull request #13386 from hexfusion/cp-13376-release-3.3
2021-10-15 08:32:31 -04:00 · 2021-10-04 08:40:11 +02:00 · 2021-10-04 00:48:07 -04:00 · 2021-10-03 23:48:44 -04:00 · 2021-01-16 22:16:46 +01:00 · 2020-12-14 10:53:41 -08:00
7 changed files with 31 additions and 6 deletions
--- a/3
+++ b/3
@ -1,4 +1,5 @@
-FROM alpine:latest
+# TODO: move to k8s.gcr.io/build-image/debian-base:bullseye-v1.y.z when patched
+FROM debian:bullseye-20210927

 ADD etcd /usr/local/bin/
 ADD etcdctl /usr/local/bin/
--- a/Dockerfile-release.arm64
+++ b/Dockerfile-release.arm64
@ -1,10 +1,17 @@
-FROM aarch64/ubuntu:16.04
+# TODO: move to k8s.gcr.io/build-image/debian-base-arm64:bullseye-1.y.z when patched
+FROM arm64v8/debian:bullseye-20210927

 ADD etcd /usr/local/bin/
 ADD etcdctl /usr/local/bin/
 ADD var/etcd /var/etcd
 ADD var/lib/etcd /var/lib/etcd

+# Alpine Linux doesn't use pam, which means that there is no /etc/nsswitch.conf,
+# but Golang relies on /etc/nsswitch.conf to check the order of DNS resolving
+# (see https://github.com/golang/go/commit/9dee7771f561cf6aee081c0af6658cc81fac3918)
+# To fix this we just create /etc/nsswitch.conf and add the following line:
+RUN echo 'hosts: files mdns4_minimal [NOTFOUND=return] dns mdns4' >> /etc/nsswitch.conf
+
 EXPOSE 2379 2380

 # Define default command.
--- a/Dockerfile-release.ppc64le
+++ b/Dockerfile-release.ppc64le
@ -1,10 +1,17 @@
-FROM ppc64le/ubuntu:16.04
+# TODO: move to k8s.gcr.io/build-image/debian-base-ppc64le:bullseye-1.y.z when patched
+FROM ppc64le/debian:bullseye-20210927

 ADD etcd /usr/local/bin/
 ADD etcdctl /usr/local/bin/
 ADD var/etcd /var/etcd
 ADD var/lib/etcd /var/lib/etcd

+# Alpine Linux doesn't use pam, which means that there is no /etc/nsswitch.conf,
+# but Golang relies on /etc/nsswitch.conf to check the order of DNS resolving
+# (see https://github.com/golang/go/commit/9dee7771f561cf6aee081c0af6658cc81fac3918)
+# To fix this we just create /etc/nsswitch.conf and add the following line:
+RUN echo 'hosts: files mdns4_minimal [NOTFOUND=return] dns mdns4' >> /etc/nsswitch.conf
+
 EXPOSE 2379 2380

 # Define default command.
--- a/clientv3/retry_interceptor.go
+++ b/clientv3/retry_interceptor.go
@ -105,6 +105,16 @@ func (c *Client) streamClientInterceptor(logger *zap.Logger, optFuncs ...retryOp
 	intOpts := reuseOrNewWithCallOptions(defaultOptions, optFuncs)
 	return func(ctx context.Context, desc *grpc.StreamDesc, cc *grpc.ClientConn, method string, streamer grpc.Streamer, opts ...grpc.CallOption) (grpc.ClientStream, error) {
 		ctx = withVersion(ctx)
+		// getToken automatically
+		// TODO(cfc4n): keep this code block, remove codes about getToken in client.go after pr #12165 merged.
+		if c.authTokenBundle != nil {
+			// equal to c.Username != "" && c.Password != ""
+			err := c.getToken(ctx)
+			if err != nil && rpctypes.Error(err) != rpctypes.ErrAuthNotEnabled {
+				logger.Error("clientv3/retry_interceptor: getToken failed", zap.Error(err))
+				return nil, err
+			}
+		}
 		grpcOpts, retryOpts := filterCallOptions(opts)
 		callOpts := reuseOrNewWithCallOptions(intOpts, retryOpts)
 		// short circuit for simplicity, and avoiding allocations.
--- a/pkg/fileutil/lock_linux.go
+++ b/pkg/fileutil/lock_linux.go
@ -29,7 +29,7 @@ import (
 //
 // constants from /usr/include/bits/fcntl-linux.h
 const (
-	F_OFD_GETLK  = 37
+	F_OFD_GETLK  = 36
 	F_OFD_SETLK  = 37
 	F_OFD_SETLKW = 38
 )
--- a/pkg/transport/listener.go
+++ b/pkg/transport/listener.go
@ -31,8 +31,8 @@ import (
 	"strings"
 	"time"

+	"github.com/coreos/etcd/pkg/fileutil"
 	"github.com/coreos/etcd/pkg/tlsutil"
-	"go.etcd.io/etcd/pkg/fileutil"
 )

 func NewListener(addr, scheme string, tlsinfo *TLSInfo) (l net.Listener, err error) {
--- a/version/version.go
+++ b/version/version.go
@ -26,7 +26,7 @@ import (
 var (
 	// MinClusterVersion is the min cluster version this etcd binary is compatible with.
 	MinClusterVersion = "3.0.0"
-	Version           = "3.3.24"
+	Version           = "3.3.27"
 	APIVersion        = "unknown"

 	// Git SHA Value will be set during build
Author	SHA1	Message	Date
Sam Batschelet	973882f697	version: 3.3.27 Signed-off-by: Sam Batschelet <sbatsche@redhat.com>	2021-10-15 08:32:31 -04:00
Piotr Tabor	e82c2fd178	Merge pull request #13386 from hexfusion/cp-13376-release-3.3 [release-3.3] Dockerfile: bump debian bullseye-20210927	2021-10-04 08:40:11 +02:00
Sam Batschelet	24801f5c27	Dockerfile: bump debian bullseye-20210927 fixes: CVE-2021-3711, CVE-2021-35942, CVE-2019-9893 Signed-off-by: Sam Batschelet <sbatsche@redhat.com>	2021-10-04 00:48:07 -04:00
Sam Batschelet	984d71c8f4	version: 3.3.26 Signed-off-by: Sam Batschelet <sbatsche@redhat.com>	2021-10-03 23:48:44 -04:00
Piotr Tabor	9530a81d62	Merge pull request #12552 from kolyshkin/3.3-fix-lock [3.3 backport] pkg/fileutil: fix constant for linux locking	2021-01-16 22:16:46 +01:00
Moritz Both	ec81adb216	pkg/fileutil: fix constant for linux locking The constant F_OFD_GETLK is 36, not 37, according to /usr/include/bits/fcntl-linux.h Credits go to joakim-tjernlund who digged deep enough to find this. Fixes #31182	2020-12-14 10:53:41 -08:00
Jingyi Hu	7d1277644e	Merge pull request #12357 from cfc4n/automated-cherry-pick-of-#12264-upstream-release-3.3 Automated cherry pick of #12264	2020-11-17 01:58:10 +08:00
CFC4N	c54c59d339	clientv3: get AuthToken automatically when clientConn is ready. fixes: #11954	2020-09-30 17:17:46 +08:00
Gyuho Lee	2c834459e1	version: 3.3.25 Signed-off-by: Gyuho Lee <leegyuho@amazon.com>	2020-08-24 12:33:27 -07:00
Gyuho Lee	43d6162d3f	Merge pull request #12246 from SVilgelm/fix-import-path Fix import path to fileutils in listener	2020-08-24 12:31:29 -07:00
Sergey Vilgelm	386ebbb704	Fix import path to fileutils in listener transport/listener: change the import path of fileutil Version 3.3 still uses the github.com/coreos/etcd prefix, but the transport/listener package used the go.etcd.io/etcd path prefix.	2020-08-22 07:27:15 -05:00