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

Move Konnectivity socket to non-persistent /run

Browse source
This commit is contained in:
Nils Hanke 2022-12-21 11:38:58 +01:00 • committed by Nils Hanke
parent d1195d1d5f
commit c4c1bd6bc5
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -113,8 +113,8 @@ func (c *KubdeadmConfiguration) InitConfiguration(externalCloudProvider bool, k8
}, },
{ {
Name: "konnectivity-uds", Name: "konnectivity-uds",
HostPath: "/etc/kubernetes/konnectivity-server", HostPath: "/run/konnectivity-server",
MountPath: "/etc/kubernetes/konnectivity-server", MountPath: "/run/konnectivity-server",
ReadOnly: false, ReadOnly: false,
PathType: corev1.HostPathDirectoryOrCreate, PathType: corev1.HostPathDirectoryOrCreate,
}, },

8
bootstrapper/internal/kubernetes/k8sapi/resources/konnectivity.go
View file

@ -60,7 +60,7 @@ func NewKonnectivityServerStaticPod() *KonnectivityServerStaticPod {
Args: []string{ Args: []string{
"--logtostderr=true", "--logtostderr=true",
// This needs to be consistent with the value set in egressSelectorConfiguration. // This needs to be consistent with the value set in egressSelectorConfiguration.
"--uds-name=/etc/kubernetes/konnectivity-server/konnectivity-server.socket", "--uds-name=/run/konnectivity-server/konnectivity-server.socket",
// The following two lines assume the Konnectivity server is // The following two lines assume the Konnectivity server is
// deployed on the same machine as the apiserver, and the certs and // deployed on the same machine as the apiserver, and the certs and
// key of the API Server are at the specified location. // key of the API Server are at the specified location.
@ -119,7 +119,7 @@ func NewKonnectivityServerStaticPod() *KonnectivityServerStaticPod {
}, },
{ {
Name: "konnectivity-uds", Name: "konnectivity-uds",
MountPath: "/etc/kubernetes/konnectivity-server", MountPath: "/run/konnectivity-server",
ReadOnly: false, ReadOnly: false,
}, },
}, },
@ -146,7 +146,7 @@ func NewKonnectivityServerStaticPod() *KonnectivityServerStaticPod {
Name: "konnectivity-uds", Name: "konnectivity-uds",
VolumeSource: corev1.VolumeSource{ VolumeSource: corev1.VolumeSource{
HostPath: &corev1.HostPathVolumeSource{ HostPath: &corev1.HostPathVolumeSource{
Path: "/etc/kubernetes/konnectivity-server", Path: "/run/konnectivity-server",
Type: &udsHostPathType, Type: &udsHostPathType,
}, },
}, },
@ -172,7 +172,7 @@ func NewEgressSelectorConfiguration() *EgressSelectorConfiguration {
ProxyProtocol: "GRPC", ProxyProtocol: "GRPC",
Transport: &apiserver.Transport{ Transport: &apiserver.Transport{
UDS: &apiserver.UDSTransport{ UDS: &apiserver.UDSTransport{
UDSName: "/etc/kubernetes/konnectivity-server/konnectivity-server.socket", UDSName: "/run/konnectivity-server/konnectivity-server.socket",
}, },
}, },
}, },