Git-Mirrors/constellation
1
0
Fork 0
mirror of https://github.com/edgelesssys/constellation.git synced 2025-06-07 14:12:57 -04:00
Code Issues Projects Releases Packages Wiki Activity

fixup! bootstrapper: pass patches to kubeadm

Browse source
This commit is contained in:
Markus Rudy 2023-12-14 17:11:27 +01:00 • committed by Leonard Cohnen
parent 36bee58b13
commit 34e15e3f93
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
bootstrapper/internal/kubernetes/k8sapi/kubeadm_config.go
View file

@ -54,7 +54,7 @@ func (c *KubdeadmConfiguration) InitConfiguration(externalCloudProvider bool, cl
LocalAPIEndpoint: kubeadm.APIEndpoint{ LocalAPIEndpoint: kubeadm.APIEndpoint{
BindPort: constants.KubernetesPort, BindPort: constants.KubernetesPort,
}, },
Patches: &kubeadm.Patches{Directory: "/opt/kubernetes/patches"}, Patches: &kubeadm.Patches{Directory: constants.KubeadmPatchDir},
}, },
// https://pkg.go.dev/k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta3#ClusterConfiguration // https://pkg.go.dev/k8s.io/kubernetes/cmd/kubeadm/app/apis/kubeadm/v1beta3#ClusterConfiguration
ClusterConfiguration: kubeadm.ClusterConfiguration{ ClusterConfiguration: kubeadm.ClusterConfiguration{
@ -180,7 +180,7 @@ func (c *KubdeadmConfiguration) JoinConfiguration(externalCloudProvider bool) Ku
Discovery: kubeadm.Discovery{ Discovery: kubeadm.Discovery{
BootstrapToken: &kubeadm.BootstrapTokenDiscovery{}, BootstrapToken: &kubeadm.BootstrapTokenDiscovery{},
}, },
Patches: &kubeadm.Patches{Directory: "/opt/kubernetes/patches"}, Patches: &kubeadm.Patches{Directory: constants.KubeadmPatchDir},
}, },
KubeletConfiguration: kubeletconf.KubeletConfiguration{ KubeletConfiguration: kubeletconf.KubeletConfiguration{
TypeMeta: metav1.TypeMeta{ TypeMeta: metav1.TypeMeta{