Set kubeconfig volume path for kube-vip static pod based on OS

aws · Jan 29, 2024 · 31e7d1e · 31e7d1e
1 parent 5ef28bb
commit 31e7d1e
Show file tree

Hide file tree

Showing 19 changed files with 25 additions and 17 deletions.
diff --git a/pkg/providers/tinkerbell/config/template-cp.yaml b/pkg/providers/tinkerbell/config/template-cp.yaml
@@ -296,7 +296,11 @@ spec:
             hostNetwork: true
             volumes:
             - hostPath:
+{{- if (eq .format "bottlerocket") }}
+                path: /var/lib/kubeadm/admin.conf
+{{- else }}
                 path: /etc/kubernetes/admin.conf
+{{- end }}
               name: kubeconfig
           status: {}
         owner: root:root

diff --git a/pkg/providers/tinkerbell/testdata/expected_results_bottlerocket_cert_bundles_config_cp.yaml b/pkg/providers/tinkerbell/testdata/expected_results_bottlerocket_cert_bundles_config_cp.yaml
@@ -211,7 +211,7 @@ spec:
             hostNetwork: true
             volumes:
             - hostPath:
-                path: /etc/kubernetes/admin.conf
+                path: /var/lib/kubeadm/admin.conf
               name: kubeconfig
           status: {}
         owner: root:root

diff --git a/pkg/providers/tinkerbell/testdata/expected_results_bottlerocket_kernel_config_cp.yaml b/pkg/providers/tinkerbell/testdata/expected_results_bottlerocket_kernel_config_cp.yaml
@@ -177,7 +177,7 @@ spec:
             hostNetwork: true
             volumes:
             - hostPath:
-                path: /etc/kubernetes/admin.conf
+                path: /var/lib/kubeadm/admin.conf
               name: kubeconfig
           status: {}
         owner: root:root

diff --git a/pkg/providers/tinkerbell/testdata/expected_results_bottlerocket_ntp_config_cp.yaml b/pkg/providers/tinkerbell/testdata/expected_results_bottlerocket_ntp_config_cp.yaml
@@ -151,7 +151,7 @@ spec:
             hostNetwork: true
             volumes:
             - hostPath:
-                path: /etc/kubernetes/admin.conf
+                path: /var/lib/kubeadm/admin.conf
               name: kubeconfig
           status: {}
         owner: root:root

diff --git a/pkg/providers/tinkerbell/testdata/expected_results_bottlerocket_settings_config_cp.yaml b/pkg/providers/tinkerbell/testdata/expected_results_bottlerocket_settings_config_cp.yaml
@@ -169,7 +169,7 @@ spec:
             hostNetwork: true
             volumes:
             - hostPath:
-                path: /etc/kubernetes/admin.conf
+                path: /var/lib/kubeadm/admin.conf
               name: kubeconfig
           status: {}
         owner: root:root

diff --git a/...ers/tinkerbell/testdata/expected_results_bottlerocket_upgrade_cert_bundles_config_cp.yaml b/...ers/tinkerbell/testdata/expected_results_bottlerocket_upgrade_cert_bundles_config_cp.yaml
@@ -160,7 +160,7 @@ spec:
           hostNetwork: true
           volumes:
           - hostPath:
-              path: /etc/kubernetes/admin.conf
+              path: /var/lib/kubeadm/admin.conf
             name: kubeconfig
         status: {}
       owner: root:root

diff --git a/...testdata/expected_results_cluster_tinkerbell_bottlerocket_cp_minimal_registry_mirror.yaml b/...testdata/expected_results_cluster_tinkerbell_bottlerocket_cp_minimal_registry_mirror.yaml
@@ -155,7 +155,7 @@ spec:
             hostNetwork: true
             volumes:
             - hostPath:
-                path: /etc/kubernetes/admin.conf
+                path: /var/lib/kubeadm/admin.conf
               name: kubeconfig
           status: {}
         owner: root:root

diff --git a/...stdata/expected_results_cluster_tinkerbell_bottlerocket_cp_registry_mirror_with_auth.yaml b/...stdata/expected_results_cluster_tinkerbell_bottlerocket_cp_registry_mirror_with_auth.yaml
@@ -191,7 +191,7 @@ spec:
             hostNetwork: true
             volumes:
             - hostPath:
-                path: /etc/kubernetes/admin.conf
+                path: /var/lib/kubeadm/admin.conf
               name: kubeconfig
           status: {}
         owner: root:root

diff --git a/...stdata/expected_results_cluster_tinkerbell_bottlerocket_cp_registry_mirror_with_cert.yaml b/...stdata/expected_results_cluster_tinkerbell_bottlerocket_cp_registry_mirror_with_cert.yaml
@@ -191,7 +191,7 @@ spec:
             hostNetwork: true
             volumes:
             - hostPath:
-                path: /etc/kubernetes/admin.conf
+                path: /var/lib/kubeadm/admin.conf
               name: kubeconfig
           status: {}
         owner: root:root

diff --git a/pkg/providers/vsphere/config/template-cp.yaml b/pkg/providers/vsphere/config/template-cp.yaml
@@ -283,7 +283,11 @@ spec:
           hostNetwork: true
           volumes:
           - hostPath:
+{{- if (eq .format "bottlerocket") }}
+              path: /var/lib/kubeadm/admin.conf
+{{- else }}
               path: /etc/kubernetes/admin.conf
+{{- end }}
             name: kubeconfig
         status: {}
       owner: root:root

diff --git a/pkg/providers/vsphere/testdata/expected_results_bottlerocket_boot_settings_config_cp.yaml b/pkg/providers/vsphere/testdata/expected_results_bottlerocket_boot_settings_config_cp.yaml
@@ -199,7 +199,7 @@ spec:
           hostNetwork: true
           volumes:
           - hostPath:
-              path: /etc/kubernetes/admin.conf
+              path: /var/lib/kubeadm/admin.conf
             name: kubeconfig
         status: {}
       owner: root:root

diff --git a/pkg/providers/vsphere/testdata/expected_results_bottlerocket_cert_bundles_config_cp.yaml b/pkg/providers/vsphere/testdata/expected_results_bottlerocket_cert_bundles_config_cp.yaml
@@ -208,7 +208,7 @@ spec:
           hostNetwork: true
           volumes:
           - hostPath:
-              path: /etc/kubernetes/admin.conf
+              path: /var/lib/kubeadm/admin.conf
             name: kubeconfig
         status: {}
       owner: root:root

diff --git a/pkg/providers/vsphere/testdata/expected_results_bottlerocket_external_etcd_cp.yaml b/pkg/providers/vsphere/testdata/expected_results_bottlerocket_external_etcd_cp.yaml
@@ -194,7 +194,7 @@ spec:
           hostNetwork: true
           volumes:
           - hostPath:
-              path: /etc/kubernetes/admin.conf
+              path: /var/lib/kubeadm/admin.conf
             name: kubeconfig
         status: {}
       owner: root:root

diff --git a/pkg/providers/vsphere/testdata/expected_results_bottlerocket_kernel_config_cp.yaml b/pkg/providers/vsphere/testdata/expected_results_bottlerocket_kernel_config_cp.yaml
@@ -192,7 +192,7 @@ spec:
           hostNetwork: true
           volumes:
           - hostPath:
-              path: /etc/kubernetes/admin.conf
+              path: /var/lib/kubeadm/admin.conf
             name: kubeconfig
         status: {}
       owner: root:root

diff --git a/pkg/providers/vsphere/testdata/expected_results_bottlerocket_mirror_config_cp.yaml b/pkg/providers/vsphere/testdata/expected_results_bottlerocket_mirror_config_cp.yaml
@@ -189,7 +189,7 @@ spec:
           hostNetwork: true
           volumes:
           - hostPath:
-              path: /etc/kubernetes/admin.conf
+              path: /var/lib/kubeadm/admin.conf
             name: kubeconfig
         status: {}
       owner: root:root

diff --git a/pkg/providers/vsphere/testdata/expected_results_bottlerocket_mirror_config_with_auth_cp.yaml b/pkg/providers/vsphere/testdata/expected_results_bottlerocket_mirror_config_with_auth_cp.yaml
@@ -207,7 +207,7 @@ spec:
           hostNetwork: true
           volumes:
           - hostPath:
-              path: /etc/kubernetes/admin.conf
+              path: /var/lib/kubeadm/admin.conf
             name: kubeconfig
         status: {}
       owner: root:root

diff --git a/pkg/providers/vsphere/testdata/expected_results_bottlerocket_mirror_config_with_cert_cp.yaml b/pkg/providers/vsphere/testdata/expected_results_bottlerocket_mirror_config_with_cert_cp.yaml
@@ -207,7 +207,7 @@ spec:
           hostNetwork: true
           volumes:
           - hostPath:
-              path: /etc/kubernetes/admin.conf
+              path: /var/lib/kubeadm/admin.conf
             name: kubeconfig
         status: {}
       owner: root:root

diff --git a/pkg/providers/vsphere/testdata/expected_results_bottlerocket_ntp_config_cp.yaml b/pkg/providers/vsphere/testdata/expected_results_bottlerocket_ntp_config_cp.yaml
@@ -187,7 +187,7 @@ spec:
           hostNetwork: true
           volumes:
           - hostPath:
-              path: /etc/kubernetes/admin.conf
+              path: /var/lib/kubeadm/admin.conf
             name: kubeconfig
         status: {}
       owner: root:root

diff --git a/pkg/providers/vsphere/testdata/expected_results_bottlerocket_settings_config_cp.yaml b/pkg/providers/vsphere/testdata/expected_results_bottlerocket_settings_config_cp.yaml
@@ -196,7 +196,7 @@ spec:
           hostNetwork: true
           volumes:
           - hostPath:
-              path: /etc/kubernetes/admin.conf
+              path: /var/lib/kubeadm/admin.conf
             name: kubeconfig
         status: {}
       owner: root:root