Compare commits
11 Commits
d01dda54dd
...
973882f697
Author | SHA1 | Date |
---|---|---|
Sam Batschelet | 973882f697 | |
Piotr Tabor | e82c2fd178 | |
Sam Batschelet | 24801f5c27 | |
Sam Batschelet | 984d71c8f4 | |
Piotr Tabor | 9530a81d62 | |
Moritz Both | ec81adb216 | |
Jingyi Hu | 7d1277644e | |
CFC4N | c54c59d339 | |
Gyuho Lee | 2c834459e1 | |
Gyuho Lee | 43d6162d3f | |
Sergey Vilgelm | 386ebbb704 |
|
@ -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 etcd /usr/local/bin/
|
||||||
ADD etcdctl /usr/local/bin/
|
ADD etcdctl /usr/local/bin/
|
||||||
|
|
|
@ -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 etcd /usr/local/bin/
|
||||||
ADD etcdctl /usr/local/bin/
|
ADD etcdctl /usr/local/bin/
|
||||||
ADD var/etcd /var/etcd
|
ADD var/etcd /var/etcd
|
||||||
ADD var/lib/etcd /var/lib/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
|
EXPOSE 2379 2380
|
||||||
|
|
||||||
# Define default command.
|
# Define default command.
|
||||||
|
|
|
@ -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 etcd /usr/local/bin/
|
||||||
ADD etcdctl /usr/local/bin/
|
ADD etcdctl /usr/local/bin/
|
||||||
ADD var/etcd /var/etcd
|
ADD var/etcd /var/etcd
|
||||||
ADD var/lib/etcd /var/lib/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
|
EXPOSE 2379 2380
|
||||||
|
|
||||||
# Define default command.
|
# Define default command.
|
||||||
|
|
|
@ -105,6 +105,16 @@ func (c *Client) streamClientInterceptor(logger *zap.Logger, optFuncs ...retryOp
|
||||||
intOpts := reuseOrNewWithCallOptions(defaultOptions, optFuncs)
|
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) {
|
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)
|
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)
|
grpcOpts, retryOpts := filterCallOptions(opts)
|
||||||
callOpts := reuseOrNewWithCallOptions(intOpts, retryOpts)
|
callOpts := reuseOrNewWithCallOptions(intOpts, retryOpts)
|
||||||
// short circuit for simplicity, and avoiding allocations.
|
// short circuit for simplicity, and avoiding allocations.
|
||||||
|
|
|
@ -29,7 +29,7 @@ import (
|
||||||
//
|
//
|
||||||
// constants from /usr/include/bits/fcntl-linux.h
|
// constants from /usr/include/bits/fcntl-linux.h
|
||||||
const (
|
const (
|
||||||
F_OFD_GETLK = 37
|
F_OFD_GETLK = 36
|
||||||
F_OFD_SETLK = 37
|
F_OFD_SETLK = 37
|
||||||
F_OFD_SETLKW = 38
|
F_OFD_SETLKW = 38
|
||||||
)
|
)
|
||||||
|
|
|
@ -31,8 +31,8 @@ import (
|
||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
|
||||||
|
"github.com/coreos/etcd/pkg/fileutil"
|
||||||
"github.com/coreos/etcd/pkg/tlsutil"
|
"github.com/coreos/etcd/pkg/tlsutil"
|
||||||
"go.etcd.io/etcd/pkg/fileutil"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
func NewListener(addr, scheme string, tlsinfo *TLSInfo) (l net.Listener, err error) {
|
func NewListener(addr, scheme string, tlsinfo *TLSInfo) (l net.Listener, err error) {
|
||||||
|
|
|
@ -26,7 +26,7 @@ import (
|
||||||
var (
|
var (
|
||||||
// MinClusterVersion is the min cluster version this etcd binary is compatible with.
|
// MinClusterVersion is the min cluster version this etcd binary is compatible with.
|
||||||
MinClusterVersion = "3.0.0"
|
MinClusterVersion = "3.0.0"
|
||||||
Version = "3.3.24"
|
Version = "3.3.27"
|
||||||
APIVersion = "unknown"
|
APIVersion = "unknown"
|
||||||
|
|
||||||
// Git SHA Value will be set during build
|
// Git SHA Value will be set during build
|
||||||
|
|
Loading…
Reference in New Issue