Commit Graph

609 Commits

Author SHA1 Message Date
Lucas Käldström
48c273b07e autogenerated 2018-11-09 14:47:58 +02:00
Lucas Käldström
5656338b6e Update unit tests after the rename 2018-11-09 14:47:45 +02:00
Lucas Käldström
731bcdc864 kubeadm: InitConfiguration.APIEndpoint -> LocalAPIEndpoint 2018-11-09 14:47:21 +02:00
Rafael Fernández López
47b4e04842 kubeadm: Remove cluster name from JoinConfiguration 2018-11-08 23:29:52 +01:00
k8s-ci-robot
b2b25462c1 Merge pull request #70755 from ereslibre/remove-feature-gates-from-join-configuration
kubeadm: Remove feature gates from JoinConfiguration
2018-11-08 14:27:08 -08:00
Rafael Fernández López
fb88c199cd kubeadm: Remove feature gates from JoinConfiguration
Relay on the feature gates provided by the ClusterConfiguration
when downloaded from the cluster during the join process.
2018-11-08 19:35:50 +01:00
Marek Counts
18dc529d05 Removed feature gates selfhosting, HA and store certs in secrets.
Added new alpha command to pivot to self hosted
Removed slelfhosting upgrade ability
Added warning message to self hosted pivot
added certs in secrets flag to new selfhosting comand
2018-11-07 11:44:54 -05:00
k8s-ci-robot
7ac1f8974b Merge pull request #70635 from xichengliudui/fix18110202
Modify and update the comments
2018-11-05 14:20:20 -08:00
Rostislav M. Georgiev
eb6f7b1f17 kubeadm: Add configurable control plane up timeout
Until now the control plane timeout was fixed to 4 minutes and users did not
have the ability to change it. This commit allows that timeout to be configured
via the new `timeoutForControlPlane` option in the API server config (itself a
member of the ClusterConfiguration).

The default timeout is still 4 minutes.

Signed-off-by: Rostislav M. Georgiev <rostislavg@vmware.com>
2018-11-05 12:36:28 +02:00
xichengliudui
453197c3b7 Modify the wrong function name
Modify and update the comments

Modify and update the comments
2018-11-05 05:16:33 -05:00
Rostislav M. Georgiev
6c9e347e31 kubeadm: Writable to ReadOnly in HostPathMount
Writable was added to HostPathMount in v1alpha1 in order to control if an extra
volume is mounted in read only or writable mode.
Usually, in Kubernetes, this option is referred to as ReadOnly, instead of
Writable and is defaulted to `false`. However, at the time, all extra volumes
to pods were defaulted to read-only. Therefore, to avoid changes to existing
v1alpha1 configs, this option had to be added with reversed meaning.

Hence, it's called `writable`.

Now, with the migration towards v1beta1, we can safely change this to ReadOnly
and get it in sync with the reset of Kubernetes.

Signed-off-by: Rostislav M. Georgiev <rostislavg@vmware.com>
2018-11-02 18:02:06 +02:00
k8s-ci-robot
b83a947ee9 Merge pull request #70371 from rosti/control-plane-substructs
kubeadm: Control plane config moved to substructs
2018-11-02 08:38:47 -07:00
Rostislav M. Georgiev
d14c27a347 kubeadm: Control plane config moved to substructs
In v1alpha3's, control plane component config options were nested directly into
the ClusterConfiguration structure. This is cluttering the config structure and
makes it hard to maintain. Therefore the control plane config options must be
separated into different substructures in order to graduate the format to beta.

This change does the following:

- Introduces a new structure called ControlPlaneComponent, that contains fields
  common to all control plane component types. These are currently extra args
  and extra volumes.

- Introduce a new structure called APIServer that contains
  ControlPlaneComponent and APIServerCertSANs field (from ClusterConfiguration)

- Replace all API Server, Scheduler and Controller Manager options in
  ClusterConfiguration with APIServer, ControllerManager and Scheduler fields
  of APIServer and ControlPlaneComponent types.

Signed-off-by: Rostislav M. Georgiev <rostislavg@vmware.com>
2018-11-02 11:38:56 +02:00
SataQiu
d32526fba4 improve the expression of some comments 2018-11-01 17:44:37 +08:00
Rostislav M. Georgiev
a3e7d7e038 kubeadm: APIServerEndpoints -> APIServerEndpoint
In the past the discovery configuration expected, that we can support multiple
API server endpoints. In practice, we always end up with a single API server
endpoint, because, even in HA setups, we use a load balancer scheme for API
servers.
Therefore, to reduce complexity and improve readability of the config, the
multiple API server endpoints support is removed from the bootstrap token
discovery join method and configuration.

Signed-off-by: Rostislav M. Georgiev <rostislavg@vmware.com>
2018-10-30 16:10:28 +02:00
yuexiao-wang
c0a9b4d04d add BUILD
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2018-10-30 16:23:52 +08:00
yuexiao-wang
cc303c8774 [kubeadm/app/]switch to github.com/pkg/errors
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2018-10-30 16:23:24 +08:00
k8s-ci-robot
2dc9acc23b Merge pull request #69922 from xichengliudui/fix181017
Delete repeated words and fix misspellings
2018-10-20 01:47:53 -07:00
yuexiao-wang
8af042af6d fix reference to controlManagerExtraAargs
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
2018-10-19 20:22:34 +08:00
k8s-ci-robot
1e4ad048fa Merge pull request #67763 from rosti/join-discovery-split
kubeadm: Split discovery from JoinConfiguration
2018-10-16 19:25:47 -07:00
k8s-ci-robot
ee4346651c Merge pull request #69800 from xichengliudui/fix181015
Fixing grammatical errors
2018-10-16 17:53:20 -07:00
Rostislav M. Georgiev
576b8d3f4f kubeadm: Split discovery from JoinConfiguration
This change splits out discovery fields from JoinConfiguration by performing
the following changes:

- Introduce a BootstrapTokenDiscovery structure, that houses configuration
  options needed for bootstrap token based discovery.

- Introduce a FileDiscovery structure, that houses configuration options
  (currently only a single option) needed for KubeConfig based discovery.

- Introduce a Discovery structure, that houses common options (such as
  discovery timeout and TLS bootstrap token) as well as pointer to an instance
  of either BootstrapTokenDiscovery or FileDiscovery structures.

- Replace the old discovery related JoinConfiguration members with a single
  Discovery member.

This change is required in order to cleanup the code of unnecessary logic and
make the serialized JoinConfiguration more structured (and therefore, more
intuitive).

Signed-off-by: Rostislav M. Georgiev <rostislavg@vmware.com>
2018-10-16 15:25:32 +03:00
xichengliudui
0dba66a2a1 Delete repeated words and fix misspellings
Delete repeated words and fix misspellings
2018-10-16 01:05:05 -04:00
xichengliudui
a20fbf0b5a Fix syntax error
Fixing grammatical errors
2018-10-15 06:52:55 -04:00
k8s-ci-robot
709ac9ce85 Merge pull request #69624 from bart0sh/PR0029-kubeadm-token-mix-config-with-print-join-command
kubeadm: allow usage --config with --print-join-command
2018-10-11 11:06:58 -07:00
Ed Bartosh
eacff9436e kubeadm: allow usage --config with --print-join-command
kubeadm token create  --print-join-command --config <path>
fails with Error: can not mix '--config' with arguments [print-join-command]

As print-joint command can't be put into the configuration file it
should be possible to use those 2 options at the same time.

Added print-join-command options to the list of exceptions in
ValidateMixedArguments check to allow its usage with --config option.

Fixes: kubernetes/kubeadm#1166
2018-10-10 16:00:55 +03:00
fabriziopandini
17cf652783 kubeadm-improve-apidoc 2018-10-09 17:40:05 +02:00
Christoph Blecker
97b2992dc1 Update gofmt for go1.11 2018-10-05 12:59:38 -07:00
fabriziopandini
b4092acdb6 autogenerated 2018-10-04 13:20:20 +02:00
fabriziopandini
9aec633c40 Fix tests 2018-10-04 13:20:11 +02:00
fabriziopandini
488ac6825b Automated bump from v1alpha3 references to v1beta1 2018-10-04 12:03:38 +02:00
fabriziopandini
8ae5179a7b Add a duplicated v1beta1 API 2018-10-04 12:02:50 +02:00
k8s-ci-robot
c179a9c9df Merge pull request #67356 from yliaog/master
Moved staging/src/k8s.io/client-go/tools/bootstrap to staging/src/k8s…
2018-10-02 20:35:51 -07:00
Yu Liao
fc21115c3f Moved staging/src/k8s.io/client-go/tools/bootstrap to staging/src/k8s.io/cluster-bootstrap 2018-10-02 09:46:13 -07:00
Lubomir I. Ivanov
94e4c25ae6 kubeadm: include better details about v1alpha3 godocs
- update examples in v1alpha3/doc.go
- add docs link when printing `kubeadm config print-default`
2018-10-02 19:12:41 +03:00
k8s-ci-robot
2f2b445e0b Merge pull request #69058 from fabriziopandini/kubeadm-cleanup-v1alpha3-api-conversion-and-restore-fuzzer
Kubeadm cleanup v1alpha3 api conversion and restore fuzzer
2018-10-01 18:04:24 -07:00
Ed Bartosh
b1b719fa68 kubeadm: fix kubeadm join using existing certs
If 'kubeadm join' is run with --discovery-file option it still
prompts for bootstrap token. This makes it impossible to use
existing client certificates mentioned in the discovery file.

Fixed by checking for empty bootstrap token only if discovery file
is not specified.

Fixes: kubernetes/kubeadm#1142
2018-10-01 18:20:20 +03:00
fabriziopandini
dd8a7aa257 autogenerated 2018-09-28 10:45:13 +02:00
fabriziopandini
19be8be4f3 Restore fuzzer test 2018-09-28 10:43:45 +02:00
fabriziopandini
8e887e1eee cleanup v1alpha3 conversion to internal 2018-09-28 10:42:38 +02:00
fabriziopandini
4f5374e7cc autogenerated 2018-09-26 17:39:27 +02:00
fabriziopandini
bb8eec4934 removal of v1alpha2 2018-09-26 17:39:18 +02:00
k8s-ci-robot
a67689dfca Merge pull request #68245 from jingyih/remove_tagName_in_goDoc
*: Remove comment tags in GoDoc
2018-09-25 06:13:23 -07:00
k8s-ci-robot
7568f21e60 Merge pull request #68789 from timothysc/kubeadm-1.12
Use the v1.12 branch by default
2018-09-21 08:23:54 -07:00
Timothy St. Clair
ee35211c72 Use the v1.12 branch by default
Signed-off-by: Timothy St. Clair <timothysc@gmail.com>
2018-09-20 16:41:09 -05:00
Chuck Ha
7ddc8738cb Update kubeadm v1alpha3 example configuration
closes kubernetes/kubeadm#1132

Signed-off-by: Chuck Ha <ha.chuck@gmail.com>
2018-09-20 16:13:58 -04:00
Chuck Ha
bd8f56cc01 Update kubeadm v1alpha3 example
Signed-off-by: Chuck Ha <ha.chuck@gmail.com>
2018-09-17 10:54:31 -04:00
Jingyi Hu
61117761cd *: Remove comment tags in GoDoc
Adding blank line between comment tag and package name in doc.go. So
that the comment tags such as '+k8s:deepcopy-gen=package' do not show up
in GoDoc.
2018-09-13 20:27:32 -07:00
liz
19d91db5a8 Add a completely populated yaml InitConfig to the v1lapha3 dodoc 2018-09-07 09:48:54 -04:00
Lucas Käldström
8b6a7ee075 autogenerated go code, godeps, bazel and gofmt 2018-09-02 14:38:59 +03:00