Sync from khs1994-docker/lnmp@f04e7d7 by PCIT

.github/workflows/setup-k8s.yaml

@@ -46,7 +46,7 @@ jobs:
       # next version
        - os: ubuntu
          dist: 20.04
-         CI_KUBERNETES_VERSION: 1.30.0-alpha.1
+         CI_KUBERNETES_VERSION: 1.30.0-alpha.2
          LNMP_K8S_GET: --url
          GENERATE_CLI_HELP: "true"
 
@@ -544,8 +544,8 @@ jobs:
          export PATH=${K8S_ROOT:-/opt/k8s}/bin:$PATH
          BASE_BRANCH=v1.29.0-alpha.1-config
          BASE_BRANCH=master
-         BASE_BRANCH=v1.28.0-config
-         if [ $CI_KUBERNETES_VERSION != '1.30.0-alpha.1' ];then
+         #  BASE_BRANCH=v1.28.0-config
+         if [ $CI_KUBERNETES_VERSION != '1.30.0-alpha.2' ];then
            exit 0
          fi
 

cli/cri-containerd.txt

@@ -13,12 +13,12 @@ USAGE:
    cri-containerd [global options] command [command options] [arguments...]
 
 VERSION:
-   v1.6.8
+   v1.7.0
 
 DESCRIPTION:
 
 containerd is a high performance container runtime whose daemon can be started
-by using this command. If none of the *config*, *publish*, or *help* commands
+by using this command. If none of the *config*, *publish*, *oci-hook*, or *help* commands
 are specified, the default action of the **containerd** command is to start the
 containerd daemon in the foreground.
 
@@ -29,15 +29,15 @@ generate the default configuration for containerd. The output of that command
 can be used and modified as necessary as a custom configuration.
 
 COMMANDS:
-   config    information on the containerd config
-   publish   binary to publish events to containerd
-   oci-hook  provides a base for OCI runtime hooks to allow arguments to be injected.
+   config    Information on the containerd config
+   publish   Binary to publish events to containerd
+   oci-hook  Provides a base for OCI runtime hooks to allow arguments to be injected.
    help, h   Shows a list of commands or help for one command
 
 GLOBAL OPTIONS:
-   --config value, -c value     path to the configuration file (default: "/etc/containerd/config.toml")
-   --log-level value, -l value  set the logging level [trace, debug, info, warn, error, fatal, panic]
-   --address value, -a value    address for containerd's GRPC server
+   --config value, -c value     Path to the configuration file (default: "/etc/containerd/config.toml")
+   --log-level value, -l value  Set the logging level [trace, debug, info, warn, error, fatal, panic]
+   --address value, -a value    Address for containerd's GRPC server
    --root value                 containerd root directory
    --state value                containerd state directory
    --help, -h                   show help

cli/docker.txt

@@ -27,9 +27,9 @@ Options:
 Management Commands:
   app*        Docker App (Docker Inc., v0.9.1-beta3)
   builder     Manage builds
-  buildx*     Docker Buildx (Docker Inc., v0.10.4-docker)
+  buildx*     Docker Buildx (Docker Inc., v0.11.2)
   checkpoint  Manage checkpoints
-  compose*    Docker Compose (Docker Inc., v2.17.2)
+  compose*    Docker Compose (Docker Inc., v2.21.0)
   config      Manage Docker configs
   container   Manage containers
   context     Manage contexts

cli/etcd.txt

@@ -37,7 +37,9 @@ Member:
   --listen-peer-urls 'http://localhost:2380'
     List of URLs to listen on for peer traffic.
   --listen-client-urls 'http://localhost:2379'
-    List of URLs to listen on for client traffic.
+    List of URLs to listen on for client grpc traffic and http as long as --listen-client-http-urls is not specified.
+  --listen-client-http-urls ''
+    List of URLs to listen on for http only client traffic. Enabling this flag removes http services from --listen-client-urls.
   --max-snapshots '5'
     Maximum number of snapshot files to retain (0 is unlimited).
   --max-wals '5'
@@ -54,6 +56,8 @@ Member:
     Maximum number of operations permitted in a transaction.
   --max-request-bytes '1572864'
     Maximum client request size in bytes the server will accept.
+  --max-concurrent-streams 'math.MaxUint32'
+    Maximum concurrent streams that each client can open at a time.
   --grpc-keepalive-min-time '5s'
     Minimum duration interval that a client should wait before pinging server.
   --grpc-keepalive-interval '2h'
@@ -146,6 +150,10 @@ Security:
     Comma-separated whitelist of origins for CORS, or cross-origin resource sharing, (empty or * means allow all).
   --host-whitelist '*'
     Acceptable hostnames from HTTP client requests, if server is not secure (empty or * means allow all).
+  --tls-min-version 'TLS1.2'
+    Minimum TLS version supported by etcd. Possible values: TLS1.2, TLS1.3.
+  --tls-max-version ''
+    Maximum TLS version supported by etcd. Possible values: TLS1.2, TLS1.3 (empty will be auto-populated by Go).
 
 Auth:
   --auth-token 'simple'