diff --git a/README.md b/README.md index abaa25b..2b6dc5f 100644 --- a/README.md +++ b/README.md @@ -9,5 +9,3 @@ Deploy kubernetes https://pkg.go.dev/k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta2?tab=doc https://kubernetes.io/docs/reference/setup-tools/kubeadm/kubeadm-init/ - -https://github.com/XenitAB/spegel diff --git a/templates/kubeadm-config.yaml.j2 b/templates/kubeadm-config.yaml.j2 index 8dc8a7e..0dcf866 100644 --- a/templates/kubeadm-config.yaml.j2 +++ b/templates/kubeadm-config.yaml.j2 @@ -1,4 +1,4 @@ -apiVersion: kubeadm.k8s.io/v1beta3 +apiVersion: kubeadm.k8s.io/v1beta2 kind: InitConfiguration {% if kubetoken is defined %} bootstrapTokens: @@ -14,9 +14,8 @@ nodeRegistration: {% elif kubernetes_cri == "docker" %} criSocket: "/var/run/docker.sock" {% endif %} - name: {{ ansible_hostname }} {% if false %} - imagePullPolicy: IfNotPresent + name: "ec2-10-100-0-1" taints: - key: "kubeadmNode" value: "master" @@ -34,7 +33,7 @@ nodeRegistration: container-runtime-endpoint: "unix:///var/run/crio/crio.sock" {% endif %} node-ip: {{ lookup('vars', 'ansible_' + kubernetes_interface ).ipv4.address }} - read-only-port: "10255" +# read-only-port: "10255" ignorePreflightErrors: - SystemVerification {% if (kubernetes_master|bool and not kubernetes_master_taint|bool) %} @@ -51,7 +50,7 @@ certificateKey: "{{ kubernetes_certificateKey.stdout }}" {% endif %} {% if kubernetes_master|bool and groups['KubernetesMasterConfigured_' ~ kubernetes_cluster_name] is not defined %} --- -apiVersion: kubeadm.k8s.io/v1beta3 +apiVersion: kubeadm.k8s.io/v1beta2 kind: ClusterConfiguration kubernetesVersion: stable {% if lbip_kubeapiserver is defined %} @@ -100,13 +99,12 @@ scheduler: bind-address: 0.0.0.0 etcd: local: - dataDir: /var/lib/etcd extraArgs: listen-metrics-urls: http://0.0.0.0:2381 {% endif %} {% if not kubernetes_master|bool or kubernetes_master|bool and groups['KubernetesMasterConfigured_' ~ kubernetes_cluster_name] is defined %} --- -apiVersion: kubeadm.k8s.io/v1beta3 +apiVersion: kubeadm.k8s.io/v1beta2 kind: JoinConfiguration {% if kubernetes_master|bool %} controlPlane: