Skip to content

Commit

Permalink
Merge pull request #332 from Xartos/betaTemplate
Browse files Browse the repository at this point in the history
Fixed v1beta1 JoinConfiguration template to match the documentation
  • Loading branch information
florindragos authored Aug 28, 2019
2 parents 08c999b + 72450d0 commit f7c5674
Showing 1 changed file with 1 addition and 9 deletions.
10 changes: 1 addition & 9 deletions templates/v1beta1/config_worker.yaml.erb
Original file line number Diff line number Diff line change
@@ -1,19 +1,15 @@
apiVersion: kubeadm.k8s.io/v1beta1
caCertPath: /etc/kubernetes/pki/ca.crt
kind: JoinConfiguration
<%- if @kubernetes_cluster_name != "kubernetes" -%>
clusterName: <%= @kubernetes_cluster_name %>
<%- end -%>

discovery:
timeout: 5m0s
tlsBootstrapToken: <%= @tls_bootstrap_token %>
bootstrapToken:
token: <%= @discovery_token %>
apiServerEndpoint: '<%= @controller_address %>'
unsafeSkipCAVerification: false
caCertHashes:
- 'sha256:<%= @discovery_token_hash %>'
token: <%= @discovery_token %>
nodeRegistration:
name: <%= @node_name %>
<%- if @container_runtime == "cri_containerd" -%>
Expand All @@ -30,7 +26,3 @@ nodeRegistration:
<%- @kubelet_extra_arguments.each do |arg| -%>
<%= arg %>
<%- end %>
<% if @feature_gates -%>
featureGates: <%= @feature_gates %>
<% end -%>
tlsBootstrapToken: <%= @tls_bootstrap_token %>

0 comments on commit f7c5674

Please sign in to comment.