Skip to content

Commit b985fe3

Browse files
committed
fix
1 parent 327736c commit b985fe3

File tree

2 files changed

+25
-3
lines changed

2 files changed

+25
-3
lines changed

infrastructure/server-setup/k8s.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,7 @@
6363
hosts: master
6464
vars:
6565
new_sans:
66-
- 10.1.1.1
67-
- 91.99.202.110
66+
- 5.78.158.131
6867
tasks:
6968
- name:
7069
include_tasks: tasks/user-kubeconfig.yml

infrastructure/server-setup/tasks/user-kubeconfig.yml

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
command: >
44
kubectl -n kube-system get configmap kubeadm-config -o jsonpath='{.data.ClusterConfiguration}'
55
environment:
6-
KUBECONFIG: /home/provision/.kube/config
6+
KUBECONFIG: /etc/kubernetes/admin.conf
77
register: clusterconfig_raw
88

99
- name: Save kubeadm config to file
@@ -36,3 +36,26 @@
3636
loop:
3737
- crt
3838
- key
39+
40+
- name: Generate new apiserver certificate with updated SANs
41+
command: kubeadm init phase certs apiserver --config /root/kubeadm-config.yaml
42+
environment:
43+
KUBECONFIG: /etc/kubernetes/admin.conf
44+
45+
- name: Delete kube-apiserver pods to restart with new certs
46+
command: kubectl -n kube-system delete pod -l component=kube-apiserver
47+
register: kubectl_result
48+
failed_when: kubectl_result.rc != 0 and "NotFound" not in kubectl_result.stderr
49+
50+
- name: Show result of restart
51+
debug:
52+
var: kubectl_result.stdout
53+
54+
- name: Remove existing kube config if it exists
55+
shell: sudo rm -f /home/provision/.kube/config
56+
57+
- name: Copy admin.conf to provision user's kube config
58+
shell: sudo cp -i /etc/kubernetes/admin.conf /home/provision/.kube/config
59+
60+
- name: Change ownership of kube config to provision user
61+
shell: sudo chown provision:provision /home/provision/.kube/config

0 commit comments

Comments
 (0)