diff --git a/.drone.yml b/.drone.yml index d38a42202..864cdfe8e 100644 --- a/.drone.yml +++ b/.drone.yml @@ -2929,6 +2929,9 @@ platform: os: linux arch: amd64 +clone: + disable: true + steps: - name: slack image: plugins/slack diff --git a/Makefile b/Makefile index 0fe71dd22..d18f1b38d 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ TOOLS ?= autonomy/tools:8fdb32d # TODO(andrewrynhard): Move this logic to a shell script. BUILDKIT_VERSION ?= v0.6.0 -KUBECTL_VERSION ?= v1.16.2 +KUBECTL_VERSION ?= v1.17.0 GO_VERSION ?= 1.13 BUILDKIT_IMAGE ?= moby/buildkit:$(BUILDKIT_VERSION) BUILDKIT_HOST ?= tcp://0.0.0.0:1234 @@ -32,6 +32,15 @@ ifeq ($(UNAME_S),Darwin) GITMETA := https://github.com/talos-systems/gitmeta/releases/download/v0.1.0-alpha.3/gitmeta-darwin-amd64 endif +ifeq ($(UNAME_S),Linux) +OSCTL_DEFAULT_TARGET := osctl-linux +OSCTL_COMMAND := build/osctl-linux-amd64 +endif +ifeq ($(UNAME_S),Darwin) +OSCTL_DEFAULT_TARGET := osctl-darwin +OSCTL_COMMAND := build/osctl-darwin-amd64 +endif + BINDIR ?= ./bin CONFORM_VERSION ?= 57c9dbd @@ -119,12 +128,13 @@ generate: buildkitd $(COMMON_ARGS) .PHONY: docs -docs: buildkitd +docs: buildkitd $(OSCTL_DEFAULT_TARGET) $(BINDIR)/buildctl --addr $(BUILDKIT_HOST) \ build \ --output type=local,dest=./ \ --opt target=$@ \ $(COMMON_ARGS) + @env HOME=/home/user $(OSCTL_COMMAND) docs docs/osctl .PHONY: kernel kernel: buildkitd diff --git a/docs/osctl/osctl.md b/docs/osctl/osctl.md index 58e6a16c6..2e25b1c5a 100644 --- a/docs/osctl/osctl.md +++ b/docs/osctl/osctl.md @@ -14,7 +14,7 @@ A CLI for out-of-band management of Kubernetes nodes created by Talos -e, --endpoints strings override default endpoints in Talos configuration -h, --help help for osctl --nodes strings target the specified nodes - --talosconfig string The path to the Talos configuration file (default "/home/smira/.talos/config") + --talosconfig string The path to the Talos configuration file (default "/home/user/.talos/config") ``` ### SEE ALSO diff --git a/docs/osctl/osctl_cluster.md b/docs/osctl/osctl_cluster.md index 427484391..e42cabc1a 100644 --- a/docs/osctl/osctl_cluster.md +++ b/docs/osctl/osctl_cluster.md @@ -20,7 +20,7 @@ A collection of commands for managing local docker-based clusters --context string Context to be used in command -e, --endpoints strings override default endpoints in Talos configuration --nodes strings target the specified nodes - --talosconfig string The path to the Talos configuration file (default "/home/smira/.talos/config") + --talosconfig string The path to the Talos configuration file (default "/home/user/.talos/config") ``` ### SEE ALSO diff --git a/docs/osctl/osctl_cluster_create.md b/docs/osctl/osctl_cluster_create.md index 40d9dc08d..f26f85a15 100644 --- a/docs/osctl/osctl_cluster_create.md +++ b/docs/osctl/osctl_cluster_create.md @@ -16,8 +16,8 @@ osctl cluster create [flags] ``` --cpus string the share of CPUs as fraction (each container) (default "1.5") -h, --help help for create - --image string the image to use (default "docker.io/autonomy/talos:v0.3.0-alpha.10-51-g3a93e65b-dirty") - --kubernetes-version string desired kubernetes version to run (default "1.16.2") + --image string the image to use (default "docker.io/autonomy/talos:v0.3.0-alpha.10-58-g5fb12f73-dirty") + --kubernetes-version string desired kubernetes version to run (default "1.17.0") --masters int the number of masters to create (default 1) --memory int the limit on memory usage in MB (each container) (default 1024) --mtu string MTU of the docker bridge network (default "1500") @@ -31,7 +31,7 @@ osctl cluster create [flags] -e, --endpoints strings override default endpoints in Talos configuration --name string the name of the cluster (default "talos_default") --nodes strings target the specified nodes - --talosconfig string The path to the Talos configuration file (default "/home/smira/.talos/config") + --talosconfig string The path to the Talos configuration file (default "/home/user/.talos/config") ``` ### SEE ALSO diff --git a/docs/osctl/osctl_cluster_destroy.md b/docs/osctl/osctl_cluster_destroy.md index 6228ff67c..3a78d3bb9 100644 --- a/docs/osctl/osctl_cluster_destroy.md +++ b/docs/osctl/osctl_cluster_destroy.md @@ -24,7 +24,7 @@ osctl cluster destroy [flags] -e, --endpoints strings override default endpoints in Talos configuration --name string the name of the cluster (default "talos_default") --nodes strings target the specified nodes - --talosconfig string The path to the Talos configuration file (default "/home/smira/.talos/config") + --talosconfig string The path to the Talos configuration file (default "/home/user/.talos/config") ``` ### SEE ALSO diff --git a/docs/osctl/osctl_config.md b/docs/osctl/osctl_config.md index 15c5d0d63..c7da7df95 100644 --- a/docs/osctl/osctl_config.md +++ b/docs/osctl/osctl_config.md @@ -19,7 +19,7 @@ Manage the client configuration --context string Context to be used in command -e, --endpoints strings override default endpoints in Talos configuration --nodes strings target the specified nodes - --talosconfig string The path to the Talos configuration file (default "/home/smira/.talos/config") + --talosconfig string The path to the Talos configuration file (default "/home/user/.talos/config") ``` ### SEE ALSO diff --git a/docs/osctl/osctl_config_add.md b/docs/osctl/osctl_config_add.md index 587c4d14a..9f44f6f65 100644 --- a/docs/osctl/osctl_config_add.md +++ b/docs/osctl/osctl_config_add.md @@ -26,7 +26,7 @@ osctl config add [flags] --context string Context to be used in command -e, --endpoints strings override default endpoints in Talos configuration --nodes strings target the specified nodes - --talosconfig string The path to the Talos configuration file (default "/home/smira/.talos/config") + --talosconfig string The path to the Talos configuration file (default "/home/user/.talos/config") ``` ### SEE ALSO diff --git a/docs/osctl/osctl_config_context.md b/docs/osctl/osctl_config_context.md index 084488956..6a38612cc 100644 --- a/docs/osctl/osctl_config_context.md +++ b/docs/osctl/osctl_config_context.md @@ -23,7 +23,7 @@ osctl config context [flags] --context string Context to be used in command -e, --endpoints strings override default endpoints in Talos configuration --nodes strings target the specified nodes - --talosconfig string The path to the Talos configuration file (default "/home/smira/.talos/config") + --talosconfig string The path to the Talos configuration file (default "/home/user/.talos/config") ``` ### SEE ALSO diff --git a/docs/osctl/osctl_config_endpoint.md b/docs/osctl/osctl_config_endpoint.md index 7f7b4249e..38a41d629 100644 --- a/docs/osctl/osctl_config_endpoint.md +++ b/docs/osctl/osctl_config_endpoint.md @@ -23,7 +23,7 @@ osctl config endpoint ... [flags] --context string Context to be used in command -e, --endpoints strings override default endpoints in Talos configuration --nodes strings target the specified nodes - --talosconfig string The path to the Talos configuration file (default "/home/smira/.talos/config") + --talosconfig string The path to the Talos configuration file (default "/home/user/.talos/config") ``` ### SEE ALSO diff --git a/docs/osctl/osctl_config_generate.md b/docs/osctl/osctl_config_generate.md index fb015fae6..cad31528f 100644 --- a/docs/osctl/osctl_config_generate.md +++ b/docs/osctl/osctl_config_generate.md @@ -17,8 +17,8 @@ osctl config generate https:// [fla --additional-sans strings additional Subject-Alt-Names for the APIServer certificate -h, --help help for generate --install-disk string the disk to install to (default "/dev/sda") - --install-image string the image used to perform an installation (default "docker.io/autonomy/installer:v0.3.0-alpha.10-51-g3a93e65b-dirty") - --kubernetes-version string desired kubernetes version to run (default "1.16.2") + --install-image string the image used to perform an installation (default "docker.io/autonomy/installer:v0.3.0-alpha.10-58-g5fb12f73-dirty") + --kubernetes-version string desired kubernetes version to run (default "1.17.0") -o, --output-dir string destination to output generated files --version string the desired machine config version to generate (default "v1alpha1") ``` @@ -29,7 +29,7 @@ osctl config generate https:// [fla --context string Context to be used in command -e, --endpoints strings override default endpoints in Talos configuration --nodes strings target the specified nodes - --talosconfig string The path to the Talos configuration file (default "/home/smira/.talos/config") + --talosconfig string The path to the Talos configuration file (default "/home/user/.talos/config") ``` ### SEE ALSO diff --git a/docs/osctl/osctl_containers.md b/docs/osctl/osctl_containers.md index 47cf24ca2..217b06350 100644 --- a/docs/osctl/osctl_containers.md +++ b/docs/osctl/osctl_containers.md @@ -25,7 +25,7 @@ osctl containers [flags] --context string Context to be used in command -e, --endpoints strings override default endpoints in Talos configuration --nodes strings target the specified nodes - --talosconfig string The path to the Talos configuration file (default "/home/smira/.talos/config") + --talosconfig string The path to the Talos configuration file (default "/home/user/.talos/config") ``` ### SEE ALSO diff --git a/docs/osctl/osctl_cp.md b/docs/osctl/osctl_cp.md index be04e2449..e52543f38 100644 --- a/docs/osctl/osctl_cp.md +++ b/docs/osctl/osctl_cp.md @@ -30,7 +30,7 @@ osctl cp -| [flags] --context string Context to be used in command -e, --endpoints strings override default endpoints in Talos configuration --nodes strings target the specified nodes - --talosconfig string The path to the Talos configuration file (default "/home/smira/.talos/config") + --talosconfig string The path to the Talos configuration file (default "/home/user/.talos/config") ``` ### SEE ALSO diff --git a/docs/osctl/osctl_dmesg.md b/docs/osctl/osctl_dmesg.md index f16af78f9..cfcbc7fe6 100644 --- a/docs/osctl/osctl_dmesg.md +++ b/docs/osctl/osctl_dmesg.md @@ -23,7 +23,7 @@ osctl dmesg [flags] --context string Context to be used in command -e, --endpoints strings override default endpoints in Talos configuration --nodes strings target the specified nodes - --talosconfig string The path to the Talos configuration file (default "/home/smira/.talos/config") + --talosconfig string The path to the Talos configuration file (default "/home/user/.talos/config") ``` ### SEE ALSO diff --git a/docs/osctl/osctl_docs.md b/docs/osctl/osctl_docs.md index d5830533c..fa3461c83 100644 --- a/docs/osctl/osctl_docs.md +++ b/docs/osctl/osctl_docs.md @@ -23,7 +23,7 @@ osctl docs [flags] --context string Context to be used in command -e, --endpoints strings override default endpoints in Talos configuration --nodes strings target the specified nodes - --talosconfig string The path to the Talos configuration file (default "/home/smira/.talos/config") + --talosconfig string The path to the Talos configuration file (default "/home/user/.talos/config") ``` ### SEE ALSO diff --git a/docs/osctl/osctl_gen.md b/docs/osctl/osctl_gen.md index 936b0cf23..9253e3daf 100644 --- a/docs/osctl/osctl_gen.md +++ b/docs/osctl/osctl_gen.md @@ -19,7 +19,7 @@ Generate CAs, certificates, and private keys --context string Context to be used in command -e, --endpoints strings override default endpoints in Talos configuration --nodes strings target the specified nodes - --talosconfig string The path to the Talos configuration file (default "/home/smira/.talos/config") + --talosconfig string The path to the Talos configuration file (default "/home/user/.talos/config") ``` ### SEE ALSO diff --git a/docs/osctl/osctl_gen_ca.md b/docs/osctl/osctl_gen_ca.md index 3f46bc3c2..c9c8b2351 100644 --- a/docs/osctl/osctl_gen_ca.md +++ b/docs/osctl/osctl_gen_ca.md @@ -26,7 +26,7 @@ osctl gen ca [flags] --context string Context to be used in command -e, --endpoints strings override default endpoints in Talos configuration --nodes strings target the specified nodes - --talosconfig string The path to the Talos configuration file (default "/home/smira/.talos/config") + --talosconfig string The path to the Talos configuration file (default "/home/user/.talos/config") ``` ### SEE ALSO diff --git a/docs/osctl/osctl_gen_crt.md b/docs/osctl/osctl_gen_crt.md index 88e25a4c7..302a9ddc0 100644 --- a/docs/osctl/osctl_gen_crt.md +++ b/docs/osctl/osctl_gen_crt.md @@ -27,7 +27,7 @@ osctl gen crt [flags] --context string Context to be used in command -e, --endpoints strings override default endpoints in Talos configuration --nodes strings target the specified nodes - --talosconfig string The path to the Talos configuration file (default "/home/smira/.talos/config") + --talosconfig string The path to the Talos configuration file (default "/home/user/.talos/config") ``` ### SEE ALSO diff --git a/docs/osctl/osctl_gen_csr.md b/docs/osctl/osctl_gen_csr.md index 5cb463396..68170b76d 100644 --- a/docs/osctl/osctl_gen_csr.md +++ b/docs/osctl/osctl_gen_csr.md @@ -25,7 +25,7 @@ osctl gen csr [flags] --context string Context to be used in command -e, --endpoints strings override default endpoints in Talos configuration --nodes strings target the specified nodes - --talosconfig string The path to the Talos configuration file (default "/home/smira/.talos/config") + --talosconfig string The path to the Talos configuration file (default "/home/user/.talos/config") ``` ### SEE ALSO diff --git a/docs/osctl/osctl_gen_key.md b/docs/osctl/osctl_gen_key.md index 61cea8b30..0e4c5ac85 100644 --- a/docs/osctl/osctl_gen_key.md +++ b/docs/osctl/osctl_gen_key.md @@ -24,7 +24,7 @@ osctl gen key [flags] --context string Context to be used in command -e, --endpoints strings override default endpoints in Talos configuration --nodes strings target the specified nodes - --talosconfig string The path to the Talos configuration file (default "/home/smira/.talos/config") + --talosconfig string The path to the Talos configuration file (default "/home/user/.talos/config") ``` ### SEE ALSO diff --git a/docs/osctl/osctl_gen_keypair.md b/docs/osctl/osctl_gen_keypair.md index c4862b21b..23c96d185 100644 --- a/docs/osctl/osctl_gen_keypair.md +++ b/docs/osctl/osctl_gen_keypair.md @@ -25,7 +25,7 @@ osctl gen keypair [flags] --context string Context to be used in command -e, --endpoints strings override default endpoints in Talos configuration --nodes strings target the specified nodes - --talosconfig string The path to the Talos configuration file (default "/home/smira/.talos/config") + --talosconfig string The path to the Talos configuration file (default "/home/user/.talos/config") ``` ### SEE ALSO diff --git a/docs/osctl/osctl_install.md b/docs/osctl/osctl_install.md index 812e26855..29a738388 100644 --- a/docs/osctl/osctl_install.md +++ b/docs/osctl/osctl_install.md @@ -29,7 +29,7 @@ osctl install [flags] --context string Context to be used in command -e, --endpoints strings override default endpoints in Talos configuration --nodes strings target the specified nodes - --talosconfig string The path to the Talos configuration file (default "/home/smira/.talos/config") + --talosconfig string The path to the Talos configuration file (default "/home/user/.talos/config") ``` ### SEE ALSO diff --git a/docs/osctl/osctl_interfaces.md b/docs/osctl/osctl_interfaces.md index 129e8790e..cef96c3b8 100644 --- a/docs/osctl/osctl_interfaces.md +++ b/docs/osctl/osctl_interfaces.md @@ -23,7 +23,7 @@ osctl interfaces [flags] --context string Context to be used in command -e, --endpoints strings override default endpoints in Talos configuration --nodes strings target the specified nodes - --talosconfig string The path to the Talos configuration file (default "/home/smira/.talos/config") + --talosconfig string The path to the Talos configuration file (default "/home/user/.talos/config") ``` ### SEE ALSO diff --git a/docs/osctl/osctl_kubeconfig.md b/docs/osctl/osctl_kubeconfig.md index 90c628232..bf42199c4 100644 --- a/docs/osctl/osctl_kubeconfig.md +++ b/docs/osctl/osctl_kubeconfig.md @@ -25,7 +25,7 @@ osctl kubeconfig [local-path] [flags] --context string Context to be used in command -e, --endpoints strings override default endpoints in Talos configuration --nodes strings target the specified nodes - --talosconfig string The path to the Talos configuration file (default "/home/smira/.talos/config") + --talosconfig string The path to the Talos configuration file (default "/home/user/.talos/config") ``` ### SEE ALSO diff --git a/docs/osctl/osctl_logs.md b/docs/osctl/osctl_logs.md index 9672ea5fd..24c35de01 100644 --- a/docs/osctl/osctl_logs.md +++ b/docs/osctl/osctl_logs.md @@ -26,7 +26,7 @@ osctl logs [flags] --context string Context to be used in command -e, --endpoints strings override default endpoints in Talos configuration --nodes strings target the specified nodes - --talosconfig string The path to the Talos configuration file (default "/home/smira/.talos/config") + --talosconfig string The path to the Talos configuration file (default "/home/user/.talos/config") ``` ### SEE ALSO diff --git a/docs/osctl/osctl_ls.md b/docs/osctl/osctl_ls.md index 23f2d3a65..a1f781bb7 100644 --- a/docs/osctl/osctl_ls.md +++ b/docs/osctl/osctl_ls.md @@ -26,7 +26,7 @@ osctl ls [path] [flags] --context string Context to be used in command -e, --endpoints strings override default endpoints in Talos configuration --nodes strings target the specified nodes - --talosconfig string The path to the Talos configuration file (default "/home/smira/.talos/config") + --talosconfig string The path to the Talos configuration file (default "/home/user/.talos/config") ``` ### SEE ALSO diff --git a/docs/osctl/osctl_memory.md b/docs/osctl/osctl_memory.md index e3cff49b2..451da700e 100644 --- a/docs/osctl/osctl_memory.md +++ b/docs/osctl/osctl_memory.md @@ -24,7 +24,7 @@ osctl memory [flags] --context string Context to be used in command -e, --endpoints strings override default endpoints in Talos configuration --nodes strings target the specified nodes - --talosconfig string The path to the Talos configuration file (default "/home/smira/.talos/config") + --talosconfig string The path to the Talos configuration file (default "/home/user/.talos/config") ``` ### SEE ALSO diff --git a/docs/osctl/osctl_mounts.md b/docs/osctl/osctl_mounts.md index 61d5c3476..b6053281c 100644 --- a/docs/osctl/osctl_mounts.md +++ b/docs/osctl/osctl_mounts.md @@ -23,7 +23,7 @@ osctl mounts [flags] --context string Context to be used in command -e, --endpoints strings override default endpoints in Talos configuration --nodes strings target the specified nodes - --talosconfig string The path to the Talos configuration file (default "/home/smira/.talos/config") + --talosconfig string The path to the Talos configuration file (default "/home/user/.talos/config") ``` ### SEE ALSO diff --git a/docs/osctl/osctl_processes.md b/docs/osctl/osctl_processes.md index b454a8431..1b140e8e2 100644 --- a/docs/osctl/osctl_processes.md +++ b/docs/osctl/osctl_processes.md @@ -25,7 +25,7 @@ osctl processes [flags] --context string Context to be used in command -e, --endpoints strings override default endpoints in Talos configuration --nodes strings target the specified nodes - --talosconfig string The path to the Talos configuration file (default "/home/smira/.talos/config") + --talosconfig string The path to the Talos configuration file (default "/home/user/.talos/config") ``` ### SEE ALSO diff --git a/docs/osctl/osctl_read.md b/docs/osctl/osctl_read.md index 6fef72ad8..3ea15c1e1 100644 --- a/docs/osctl/osctl_read.md +++ b/docs/osctl/osctl_read.md @@ -23,7 +23,7 @@ osctl read [flags] --context string Context to be used in command -e, --endpoints strings override default endpoints in Talos configuration --nodes strings target the specified nodes - --talosconfig string The path to the Talos configuration file (default "/home/smira/.talos/config") + --talosconfig string The path to the Talos configuration file (default "/home/user/.talos/config") ``` ### SEE ALSO diff --git a/docs/osctl/osctl_reboot.md b/docs/osctl/osctl_reboot.md index 05c298288..9a08e0923 100644 --- a/docs/osctl/osctl_reboot.md +++ b/docs/osctl/osctl_reboot.md @@ -23,7 +23,7 @@ osctl reboot [flags] --context string Context to be used in command -e, --endpoints strings override default endpoints in Talos configuration --nodes strings target the specified nodes - --talosconfig string The path to the Talos configuration file (default "/home/smira/.talos/config") + --talosconfig string The path to the Talos configuration file (default "/home/user/.talos/config") ``` ### SEE ALSO diff --git a/docs/osctl/osctl_reset.md b/docs/osctl/osctl_reset.md index 8fd50c5b6..e8cff2eeb 100644 --- a/docs/osctl/osctl_reset.md +++ b/docs/osctl/osctl_reset.md @@ -23,7 +23,7 @@ osctl reset [flags] --context string Context to be used in command -e, --endpoints strings override default endpoints in Talos configuration --nodes strings target the specified nodes - --talosconfig string The path to the Talos configuration file (default "/home/smira/.talos/config") + --talosconfig string The path to the Talos configuration file (default "/home/user/.talos/config") ``` ### SEE ALSO diff --git a/docs/osctl/osctl_restart.md b/docs/osctl/osctl_restart.md index 5b1eca3a7..508d70485 100644 --- a/docs/osctl/osctl_restart.md +++ b/docs/osctl/osctl_restart.md @@ -25,7 +25,7 @@ osctl restart [flags] --context string Context to be used in command -e, --endpoints strings override default endpoints in Talos configuration --nodes strings target the specified nodes - --talosconfig string The path to the Talos configuration file (default "/home/smira/.talos/config") + --talosconfig string The path to the Talos configuration file (default "/home/user/.talos/config") ``` ### SEE ALSO diff --git a/docs/osctl/osctl_routes.md b/docs/osctl/osctl_routes.md index a959b9f8b..f4ccf7c81 100644 --- a/docs/osctl/osctl_routes.md +++ b/docs/osctl/osctl_routes.md @@ -23,7 +23,7 @@ osctl routes [flags] --context string Context to be used in command -e, --endpoints strings override default endpoints in Talos configuration --nodes strings target the specified nodes - --talosconfig string The path to the Talos configuration file (default "/home/smira/.talos/config") + --talosconfig string The path to the Talos configuration file (default "/home/user/.talos/config") ``` ### SEE ALSO diff --git a/docs/osctl/osctl_service.md b/docs/osctl/osctl_service.md index e5ccacf53..803a8bc7d 100644 --- a/docs/osctl/osctl_service.md +++ b/docs/osctl/osctl_service.md @@ -25,7 +25,7 @@ osctl service [ [start|stop|restart|status]] [flags] --context string Context to be used in command -e, --endpoints strings override default endpoints in Talos configuration --nodes strings target the specified nodes - --talosconfig string The path to the Talos configuration file (default "/home/smira/.talos/config") + --talosconfig string The path to the Talos configuration file (default "/home/user/.talos/config") ``` ### SEE ALSO diff --git a/docs/osctl/osctl_shutdown.md b/docs/osctl/osctl_shutdown.md index aa4fac8d2..9ef140844 100644 --- a/docs/osctl/osctl_shutdown.md +++ b/docs/osctl/osctl_shutdown.md @@ -23,7 +23,7 @@ osctl shutdown [flags] --context string Context to be used in command -e, --endpoints strings override default endpoints in Talos configuration --nodes strings target the specified nodes - --talosconfig string The path to the Talos configuration file (default "/home/smira/.talos/config") + --talosconfig string The path to the Talos configuration file (default "/home/user/.talos/config") ``` ### SEE ALSO diff --git a/docs/osctl/osctl_stats.md b/docs/osctl/osctl_stats.md index d6cde2a61..6565650c3 100644 --- a/docs/osctl/osctl_stats.md +++ b/docs/osctl/osctl_stats.md @@ -25,7 +25,7 @@ osctl stats [flags] --context string Context to be used in command -e, --endpoints strings override default endpoints in Talos configuration --nodes strings target the specified nodes - --talosconfig string The path to the Talos configuration file (default "/home/smira/.talos/config") + --talosconfig string The path to the Talos configuration file (default "/home/user/.talos/config") ``` ### SEE ALSO diff --git a/docs/osctl/osctl_time.md b/docs/osctl/osctl_time.md index 43a204f12..d42e06205 100644 --- a/docs/osctl/osctl_time.md +++ b/docs/osctl/osctl_time.md @@ -24,7 +24,7 @@ osctl time [--check server] [flags] --context string Context to be used in command -e, --endpoints strings override default endpoints in Talos configuration --nodes strings target the specified nodes - --talosconfig string The path to the Talos configuration file (default "/home/smira/.talos/config") + --talosconfig string The path to the Talos configuration file (default "/home/user/.talos/config") ``` ### SEE ALSO diff --git a/docs/osctl/osctl_upgrade.md b/docs/osctl/osctl_upgrade.md index 01afa1082..31822ae37 100644 --- a/docs/osctl/osctl_upgrade.md +++ b/docs/osctl/osctl_upgrade.md @@ -24,7 +24,7 @@ osctl upgrade [flags] --context string Context to be used in command -e, --endpoints strings override default endpoints in Talos configuration --nodes strings target the specified nodes - --talosconfig string The path to the Talos configuration file (default "/home/smira/.talos/config") + --talosconfig string The path to the Talos configuration file (default "/home/user/.talos/config") ``` ### SEE ALSO diff --git a/docs/osctl/osctl_validate.md b/docs/osctl/osctl_validate.md index 47027fb13..e197975d4 100644 --- a/docs/osctl/osctl_validate.md +++ b/docs/osctl/osctl_validate.md @@ -25,7 +25,7 @@ osctl validate [flags] --context string Context to be used in command -e, --endpoints strings override default endpoints in Talos configuration --nodes strings target the specified nodes - --talosconfig string The path to the Talos configuration file (default "/home/smira/.talos/config") + --talosconfig string The path to the Talos configuration file (default "/home/user/.talos/config") ``` ### SEE ALSO diff --git a/docs/osctl/osctl_version.md b/docs/osctl/osctl_version.md index 7d4e83299..fa1ca2dad 100644 --- a/docs/osctl/osctl_version.md +++ b/docs/osctl/osctl_version.md @@ -25,7 +25,7 @@ osctl version [flags] --context string Context to be used in command -e, --endpoints strings override default endpoints in Talos configuration --nodes strings target the specified nodes - --talosconfig string The path to the Talos configuration file (default "/home/smira/.talos/config") + --talosconfig string The path to the Talos configuration file (default "/home/user/.talos/config") ``` ### SEE ALSO diff --git a/docs/website/content/v0.3/en/configuration/v1alpha1.md b/docs/website/content/v0.3/en/configuration/v1alpha1.md index 89d642cd3..36f003893 100644 --- a/docs/website/content/v0.3/en/configuration/v1alpha1.md +++ b/docs/website/content/v0.3/en/configuration/v1alpha1.md @@ -35,7 +35,7 @@ machine: force: false cluster: controlPlane: - version: 1.16.2 + version: 1.17.0 endpoint: https://1.2.3.4 clusterName: example network: @@ -341,7 +341,7 @@ Examples: ```yaml controlPlane: - version: 1.16.2 + version: 1.17.0 endpoint: https://1.2.3.4 localAPIServerPort: 443 @@ -688,7 +688,7 @@ Type: `string` Examples: ```yaml -1.16.2 +1.17.0 ``` > Note: The version must be of the format `major.minor.patch`, _without_ a leading `v`. diff --git a/go.mod b/go.mod index 82b9adf90..8c7d76cb6 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.13 replace ( github.com/docker/distribution v2.7.1+incompatible => github.com/docker/distribution v2.7.1-0.20190205005809-0d3efadf0154+incompatible github.com/jsimonetti/rtnetlink => github.com/bradbeam/rtnetlink v0.0.0-20191116224831-33eac9dd89f6 - github.com/kubernetes-sigs/bootkube => github.com/talos-systems/bootkube v0.14.1-0.20191209231016-df7ca3993392 + github.com/kubernetes-sigs/bootkube => github.com/talos-systems/bootkube v0.14.1-0.20191210195608-7606a2efb62d github.com/opencontainers/runtime-spec v1.0.1 => github.com/opencontainers/runtime-spec v0.1.2-0.20180301181910-fa4b36aa9c99 ) @@ -69,8 +69,8 @@ require ( gopkg.in/fsnotify.v1 v1.4.7 gopkg.in/yaml.v2 v2.2.5 gotest.tools v2.2.0+incompatible - k8s.io/api v0.0.0-20191109101513-0171b7c15da1 - k8s.io/apimachinery v0.0.0-20191111054156-6eb29fdf75dc - k8s.io/client-go v0.0.0-20191016111102-bec269661e48 - k8s.io/cri-api v0.0.0-20190828162817-608eb1dad4ac + k8s.io/api v0.0.0-20191204082340-384b28a90b2b + k8s.io/apimachinery v0.0.0-20191121175448-79c2a76c473a + k8s.io/client-go v0.0.0-20191204083517-ea72ff2b5b2f + k8s.io/cri-api v0.0.0-20191121183020-775aa3c1cf73 ) diff --git a/go.sum b/go.sum index 27b05c714..e6799d0d1 100644 --- a/go.sum +++ b/go.sum @@ -223,6 +223,7 @@ github.com/gophercloud/gophercloud v0.6.0/go.mod h1:GICNByuaEBibcjmjvI7QvYJSZEbG github.com/gorilla/websocket v1.4.1 h1:q7AeDBpnBk8AogcD4DSag/Ukw/KV+YhzLj2bP5HvKCM= github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= github.com/gregjones/httpcache v0.0.0-20170728041850-787624de3eb7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= +github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA= github.com/grpc-ecosystem/go-grpc-middleware v1.1.0 h1:THDBEeQ9xZ8JEaCLyLQqXMMdRqNr0QAUJTIkQAUtFjg= github.com/grpc-ecosystem/go-grpc-middleware v1.1.0/go.mod h1:f5nM7jw/oeRSadq3xCzHAvxcr8HZnzsqU6ILg/0NiiE= @@ -426,8 +427,8 @@ github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81P github.com/syndtr/gocapability v0.0.0-20170704070218-db04d3cc01c8/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2 h1:b6uOv7YOFK0TYG7HtkIgExQo+2RdLuwRft63jn2HWj8= github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2/go.mod h1:hkRG7XYTFWNJGYcbNJQlaLq0fg1yr4J4t/NcTQtrfww= -github.com/talos-systems/bootkube v0.14.1-0.20191209231016-df7ca3993392 h1:XCaV3gGfLUCUpSAQgHVaJS/TgpMjBMVIZCA6PWTse9o= -github.com/talos-systems/bootkube v0.14.1-0.20191209231016-df7ca3993392/go.mod h1:CIpoNLW4Lm9zNVFRgqQIylnbZi/x9TnulTEA8edC0O4= +github.com/talos-systems/bootkube v0.14.1-0.20191210195608-7606a2efb62d h1:84Lc1mjR85Afl8tZ75BcdAwelW7JLgiyIvMPuy+fpuQ= +github.com/talos-systems/bootkube v0.14.1-0.20191210195608-7606a2efb62d/go.mod h1:CIpoNLW4Lm9zNVFRgqQIylnbZi/x9TnulTEA8edC0O4= github.com/talos-systems/grpc-proxy v0.0.0-20191129165806-5c579a7a6147 h1:Sf4q46/8IkNY+JaYoBV0peSYsO5quJlvvmv2AytJlLI= github.com/talos-systems/grpc-proxy v0.0.0-20191129165806-5c579a7a6147/go.mod h1:sm97Vc/z2cok3pu6ruNeszQej4KDxFrDgfWs4C1mtC4= github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5 h1:LnC5Kc/wtumK+WB441p7ynQJzVuNRJiqddSIE3IlSEQ= @@ -473,6 +474,7 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190605123033-f99c8df09eb5/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20190611184440-5c40567a22f8/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= +golang.org/x/crypto v0.0.0-20190820162420-60c769a6c586/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI= golang.org/x/crypto v0.0.0-20191108234033-bd318be0434a h1:R/qVym5WAxsZWQqZCwDY/8sdVKV1m1WgU4/S5IRQAzc= golang.org/x/crypto v0.0.0-20191108234033-bd318be0434a/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= @@ -633,6 +635,7 @@ google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiq google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= +google.golang.org/grpc v1.23.1/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1 h1:wdKvqQk7IttEw92GoRyKG2IDrUIpgpj6H6m81yfeMW0= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= @@ -669,16 +672,22 @@ honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt k8s.io/api v0.0.0-20191016110408-35e52d86657a/go.mod h1:/L5qH+AD540e7Cetbui1tuJeXdmNhO8jM6VkXeDdDhQ= k8s.io/api v0.0.0-20191109101513-0171b7c15da1 h1:/0DAbJQIStcv+Np2Er1n/pA8UqyUWxbnr+oSPjAh6Pg= k8s.io/api v0.0.0-20191109101513-0171b7c15da1/go.mod h1:VJq7+38rpM4TSUbRiZX4P5UVAKK2UQpNQLZClkFQkpE= +k8s.io/api v0.0.0-20191204082340-384b28a90b2b h1:jL1wKG/+jnjig+ILXaZqucW1joNIQaXGyJRIijyVs/k= +k8s.io/api v0.0.0-20191204082340-384b28a90b2b/go.mod h1:vYpRfxYkMrmPPSesoHEkGNHxNKTk96REAwqm/inQbs0= k8s.io/apiextensions-apiserver v0.0.0-20190202013456-d4288ab64945 h1:Pe28P7O5zLn49N72o4HkP0U9fmCABO9Y4nPhSSix2MM= k8s.io/apiextensions-apiserver v0.0.0-20190202013456-d4288ab64945/go.mod h1:IxkesAMoaCRoLrPJdZNZUQp9NfZnzqaVzLhb2VEQzXE= k8s.io/apimachinery v0.0.0-20191004115801-a2eda9f80ab8/go.mod h1:llRdnznGEAqC3DcNm6yEj472xaFVfLM7hnYofMb12tQ= k8s.io/apimachinery v0.0.0-20191109100837-dffb012825f2/go.mod h1:+6CX7hP4aLfX2sb91JYDMIp0VqDSog2kZu0BHe+lP+s= k8s.io/apimachinery v0.0.0-20191111054156-6eb29fdf75dc h1:hC0UI7qlplCVlRexiPMHwcOCT3IPk9Pgo599vKGOOS4= k8s.io/apimachinery v0.0.0-20191111054156-6eb29fdf75dc/go.mod h1:+6CX7hP4aLfX2sb91JYDMIp0VqDSog2kZu0BHe+lP+s= +k8s.io/apimachinery v0.0.0-20191121175448-79c2a76c473a h1:MKZ0fjdPJKv8Ipp9QxlR+tpYpffS3hp6PX8lqCZ4MeM= +k8s.io/apimachinery v0.0.0-20191121175448-79c2a76c473a/go.mod h1:b9qmWdKlLuU9EBh+06BtLcSf/Mu89rWL33naRxs1uZg= k8s.io/client-go v0.0.0-20191016111102-bec269661e48 h1:C2XVy2z0dV94q9hSSoCuTPp1KOG7IegvbdXuz9VGxoU= k8s.io/client-go v0.0.0-20191016111102-bec269661e48/go.mod h1:hrwktSwYGI4JK+TJA3dMaFyyvHVi/aLarVHpbs8bgCU= -k8s.io/cri-api v0.0.0-20190828162817-608eb1dad4ac h1:ikDtGPX1DVIhl4E36+khq6RVyA65ycfiieBHecQiaX0= -k8s.io/cri-api v0.0.0-20190828162817-608eb1dad4ac/go.mod h1:BvtUaNBr0fEpzb11OfrQiJLsLPtqbmulpo1fPwcpP6Q= +k8s.io/client-go v0.0.0-20191204083517-ea72ff2b5b2f h1:euWfLCddhQwSUuaSdZUaeGZ3lsZdMKgOn1n66cMgk5U= +k8s.io/client-go v0.0.0-20191204083517-ea72ff2b5b2f/go.mod h1:42lN0EZwd9wIA8wfQO/IqmKYCAFoCAfXDIaNi+kJUWU= +k8s.io/cri-api v0.0.0-20191121183020-775aa3c1cf73 h1:Ay5EJ9pFGtQaRBfKHPjFB7Qv7AsdwyVVwFoN7z+M4aQ= +k8s.io/cri-api v0.0.0-20191121183020-775aa3c1cf73/go.mod h1:BzAkbBHHp81d+aXzbiIcUbilLkbXa40B8mUHOk6EX3s= k8s.io/gengo v0.0.0-20190128074634-0689ccc1d7d6/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20191108084044-e500ee069b5c/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/klog v0.0.0-20181102134211-b9b56d5dfc92/go.mod h1:Gq+BEi5rUBO/HRz0bTSXDUcqjScdoY3a9IHpCEIOOfk= @@ -693,6 +702,8 @@ k8s.io/kubernetes v1.13.0/go.mod h1:ocZa8+6APFNC2tX1DZASIbocyYT5jHzqFVsY5aoB7Jk= k8s.io/utils v0.0.0-20190801114015-581e00157fb1/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew= k8s.io/utils v0.0.0-20191030222137-2b95a09bc58d h1:1P0iBJsBzxRmR+dIFnM+Iu4aLxnoa7lBqozW/0uHbT8= k8s.io/utils v0.0.0-20191030222137-2b95a09bc58d/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew= +k8s.io/utils v0.0.0-20191114184206-e782cd3c129f h1:GiPwtSzdP43eI1hpPCbROQCCIgCuiMMNF8YUVLF3vJo= +k8s.io/utils v0.0.0-20191114184206-e782cd3c129f/go.mod h1:sZAwmy6armz5eXlNoLmJcl4F1QuKu7sr+mFQ0byX7Ew= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= sigs.k8s.io/structured-merge-diff v0.0.0-20190525122527-15d366b2352e/go.mod h1:wWxsB5ozmmv/SG7nM11ayaAW51xMvak/t1r0CSlcokI= sigs.k8s.io/structured-merge-diff v1.0.0/go.mod h1:IIgPezJWb76P0hotTxzDbWsMYB8APh18qZnxkomBpxA= diff --git a/hack/drone.jsonnet b/hack/drone.jsonnet index 261108428..213a38315 100644 --- a/hack/drone.jsonnet +++ b/hack/drone.jsonnet @@ -109,7 +109,7 @@ local Step(name, image='', target='', depends_on=[], environment={}) = { // Pipeline is a way to standardize the creation of pipelines. It supports // using and existing pipeline as a base. -local Pipeline(name, steps=[], depends_on=[], with_buildkit=false, with_docker=true) = { +local Pipeline(name, steps=[], depends_on=[], with_buildkit=false, with_docker=true, disable_clone=false) = { local node = { 'node-role.kubernetes.io/ci': '' }, kind: 'pipeline', @@ -119,6 +119,9 @@ local Pipeline(name, steps=[], depends_on=[], with_buildkit=false, with_docker=t if with_docker then docker, if with_buildkit then buildkit, ], + [ if disable_clone then 'clone']: { + disable: true, + }, steps: steps, volumes: volumes.ForPipeline(), depends_on: [x.name for x in depends_on], @@ -435,7 +438,7 @@ local notify_depends_on = { ], }; -local notify_pipeline = Pipeline('notify', notify_steps, [default_pipeline, e2e_pipeline, conformance_pipeline, nightly_pipeline, release_pipeline], false, false) + notify_trigger; +local notify_pipeline = Pipeline('notify', notify_steps, [default_pipeline, e2e_pipeline, conformance_pipeline, nightly_pipeline, release_pipeline], false, false, true) + notify_trigger; // Final configuration file definition. diff --git a/hack/test/basic-integration.sh b/hack/test/basic-integration.sh index c314858c0..c0616aa84 100755 --- a/hack/test/basic-integration.sh +++ b/hack/test/basic-integration.sh @@ -3,7 +3,7 @@ set -eou pipefail -export KUBERNETES_VERSION=v1.16.2 +export KUBERNETES_VERSION=v1.17.0 export TALOS_IMG="docker.io/autonomy/talos:${TAG}" export TMP="/tmp/e2e" export TALOSCONFIG="${TMP}/talosconfig" @@ -32,7 +32,7 @@ run() { --rm \ --interactive \ --net=integration \ - --entrypoint=bash \ + --entrypoint=/bin/bash \ --mount type=bind,source=${TMP},target=${TMP} \ -v ${OSCTL}:/bin/osctl:ro \ -v ${INTEGRATIONTEST}:/bin/integration-test:ro \ diff --git a/hack/test/e2e-runner.sh b/hack/test/e2e-runner.sh index 47347e364..b8c4d2727 100755 --- a/hack/test/e2e-runner.sh +++ b/hack/test/e2e-runner.sh @@ -1,5 +1,5 @@ # NB: There is a known bug that causes CRD scaling issues in 1.15 kubectl or later. -export KUBERNETES_VERSION=v1.16.2 +export KUBERNETES_VERSION=v1.17.0 export TALOS_IMG="docker.io/autonomy/talos:${TAG}" export TMP="/tmp/e2e" export TMPPLATFORM="${TMP}/${PLATFORM}" @@ -37,7 +37,7 @@ e2e_run() { --rm \ --interactive \ --net=integration \ - --entrypoint=bash \ + --entrypoint=/bin/bash \ --mount type=bind,source=${TMP},target=${TMP} \ --mount type=bind,source=${PWD}/hack/test/manifests,target=/e2emanifests \ -v ${OSCTL}:/bin/osctl:ro \ diff --git a/hack/test/integration/libvirt.sh b/hack/test/integration/libvirt.sh index e0d785c65..c1676d94d 100755 --- a/hack/test/integration/libvirt.sh +++ b/hack/test/integration/libvirt.sh @@ -81,7 +81,7 @@ function down { } function workspace { - docker run --rm -it -v $PWD:/workspace -v $PWD/../../../build/osctl-linux-amd64:/bin/osctl:ro --network talos --dns 172.28.1.1 -w /workspace/matchbox/assets -e TALOSCONFIG='/workspace/matchbox/assets/talosconfig' -e KUBECONFIG='/workspace/matchbox/assets/kubeconfig' k8s.gcr.io/hyperkube:v1.16.2 bash + docker run --rm -it -v $PWD:/workspace -v $PWD/../../../build/osctl-linux-amd64:/bin/osctl:ro --network talos --dns 172.28.1.1 -w /workspace/matchbox/assets -e TALOSCONFIG='/workspace/matchbox/assets/talosconfig' -e KUBECONFIG='/workspace/matchbox/assets/kubeconfig' --entrypoint /bin/bash k8s.gcr.io/hyperkube:v1.17.0 } main $@ diff --git a/hack/test/manifests/aws-cluster.yaml b/hack/test/manifests/aws-cluster.yaml index edad623c8..34ff0a82c 100644 --- a/hack/test/manifests/aws-cluster.yaml +++ b/hack/test/manifests/aws-cluster.yaml @@ -59,7 +59,7 @@ spec: kind: AWSMachine name: talos-e2e-{{TAG}}-aws-controlplane-0 namespace: default - version: 1.16.2 + version: 1.17.0 --- apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2 kind: AWSMachine @@ -108,7 +108,7 @@ spec: kind: AWSMachine name: talos-e2e-{{TAG}}-aws-controlplane-1 namespace: default - version: 1.16.2 + version: 1.17.0 --- apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2 kind: AWSMachine @@ -157,7 +157,7 @@ spec: kind: AWSMachine name: talos-e2e-{{TAG}}-aws-controlplane-2 namespace: default - version: 1.16.2 + version: 1.17.0 --- apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2 kind: AWSMachine @@ -219,7 +219,7 @@ spec: kind: AWSMachineTemplate name: talos-e2e-{{TAG}}-aws-workers namespace: default - version: 1.16.2 + version: 1.17.0 --- apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2 kind: AWSMachineTemplate @@ -237,4 +237,4 @@ spec: id: "subnet-c4e9b3a0" additionalSecurityGroups: - id: "sg-ebe8e59f" - publicIP: true \ No newline at end of file + publicIP: true diff --git a/hack/test/manifests/gcp-cluster.yaml b/hack/test/manifests/gcp-cluster.yaml index 79be3be05..9039fe379 100644 --- a/hack/test/manifests/gcp-cluster.yaml +++ b/hack/test/manifests/gcp-cluster.yaml @@ -57,7 +57,7 @@ spec: kind: GCPMachine name: talos-e2e-{{TAG}}-gcp-controlplane-0 namespace: default - version: 1.16.2 + version: 1.17.0 --- apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2 kind: GCPMachine @@ -104,7 +104,7 @@ spec: kind: GCPMachine name: talos-e2e-{{TAG}}-gcp-controlplane-1 namespace: default - version: 1.16.2 + version: 1.17.0 --- apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2 kind: GCPMachine @@ -151,7 +151,7 @@ spec: kind: GCPMachine name: talos-e2e-{{TAG}}-gcp-controlplane-2 namespace: default - version: 1.16.2 + version: 1.17.0 --- apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2 kind: GCPMachine @@ -210,7 +210,7 @@ spec: kind: GCPMachineTemplate name: talos-e2e-{{TAG}}-gcp-workers namespace: default - version: 1.16.2 + version: 1.17.0 --- apiVersion: infrastructure.cluster.x-k8s.io/v1alpha2 kind: GCPMachineTemplate diff --git a/internal/test-framework/internal/pkg/runner/runner.go b/internal/test-framework/internal/pkg/runner/runner.go index 4b658e815..551013f6c 100644 --- a/internal/test-framework/internal/pkg/runner/runner.go +++ b/internal/test-framework/internal/pkg/runner/runner.go @@ -44,7 +44,8 @@ func CommandLocal(command string) error { // CommandInContainer simply runs a bash command in the hyperkube containers // nolint: gocyclo func CommandInContainer(ctx context.Context, client *client.Client, runnerConfig *ContainerConfigs, command string) error { - runnerConfig.ContainerConfig.Cmd = []string{"bash", "-c", command} + runnerConfig.ContainerConfig.Entrypoint = []string{"/bin/bash"} + runnerConfig.ContainerConfig.Cmd = []string{"-c", command} log.Println("issuing container command : '" + command + "'") // List networks and fish out the integration network ID diff --git a/pkg/config/types/v1alpha1/doc.go b/pkg/config/types/v1alpha1/doc.go index df91836d5..982cc5339 100644 --- a/pkg/config/types/v1alpha1/doc.go +++ b/pkg/config/types/v1alpha1/doc.go @@ -34,7 +34,7 @@ machine: force: false cluster: controlPlane: - version: 1.16.2 + version: 1.17.0 endpoint: https://1.2.3.4 clusterName: example network: diff --git a/pkg/config/types/v1alpha1/v1alpha1_types.go b/pkg/config/types/v1alpha1/v1alpha1_types.go index bcbbb9ebd..0726f05d9 100644 --- a/pkg/config/types/v1alpha1/v1alpha1_types.go +++ b/pkg/config/types/v1alpha1/v1alpha1_types.go @@ -182,7 +182,7 @@ type ClusterConfig struct { // examples: // - | // controlPlane: - // version: 1.16.2 + // version: 1.17.0 // endpoint: https://1.2.3.4 // localAPIServerPort: 443 ControlPlane *ControlPlaneConfig `yaml:"controlPlane"` @@ -421,7 +421,7 @@ type ControlPlaneConfig struct { // description: | // Indicates which version of Kubernetes for all control plane components. // examples: - // - 1.16.2 + // - 1.17.0 Version string `yaml:"version"` // Note: The version must be of the format `major.minor.patch`, _without_ a leading `v`. // description: | // Endpoint is the canonical controlplane endpoint, which can be an IP address or a DNS hostname. diff --git a/pkg/constants/constants.go b/pkg/constants/constants.go index a1d8ab88d..e863ab367 100644 --- a/pkg/constants/constants.go +++ b/pkg/constants/constants.go @@ -127,7 +127,7 @@ const ( KubeletBootstrapKubeconfig = "/etc/kubernetes/bootstrap-kubeconfig" // DefaultKubernetesVersion is the default target version of the control plane. - DefaultKubernetesVersion = "1.16.2" + DefaultKubernetesVersion = "1.17.0" // KubernetesImage is the enforced hyperkube image to use for the control plane. KubernetesImage = "k8s.gcr.io/hyperkube"