feat: Upgrade kubernetes to 1.17.0
Primarily doc/constant changes. Added additionnal bits to `docs` target in makefile to generate osctl docs as well as config files. Explicitly define a HOME variable so we get consistent home directories for talosconfig variables in our docs. Signed-off-by: Brad Beam <brad.beam@talos-systems.com>
This commit is contained in:
parent
5fb12f735a
commit
9584b47cd7
@ -2929,6 +2929,9 @@ platform:
|
||||
os: linux
|
||||
arch: amd64
|
||||
|
||||
clone:
|
||||
disable: true
|
||||
|
||||
steps:
|
||||
- name: slack
|
||||
image: plugins/slack
|
||||
|
14
Makefile
14
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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -26,7 +26,7 @@ osctl config add <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
|
||||
|
@ -23,7 +23,7 @@ osctl config context <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
|
||||
|
@ -23,7 +23,7 @@ osctl config endpoint <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
|
||||
|
@ -17,8 +17,8 @@ osctl config generate <cluster name> https://<load balancer IP or DNS name> [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 <cluster name> https://<load balancer IP or DNS name> [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
|
||||
|
@ -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
|
||||
|
@ -30,7 +30,7 @@ osctl cp <src-path> -|<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
|
||||
|
@ -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
|
||||
|
@ -23,7 +23,7 @@ osctl docs <output> [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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -26,7 +26,7 @@ osctl logs <id> [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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -23,7 +23,7 @@ osctl read <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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -25,7 +25,7 @@ osctl service [<id> [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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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`.
|
||||
|
10
go.mod
10
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
|
||||
)
|
||||
|
19
go.sum
19
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=
|
||||
|
@ -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.
|
||||
|
||||
|
@ -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 \
|
||||
|
@ -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 \
|
||||
|
@ -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 $@
|
||||
|
@ -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
|
||||
publicIP: true
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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:
|
||||
|
@ -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.
|
||||
|
@ -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"
|
||||
|
Loading…
x
Reference in New Issue
Block a user