Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix data race in OperatingSystemConfig component #5516

Merged
merged 1 commit into from
Mar 4, 2022
Merged

Fix data race in OperatingSystemConfig component #5516

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 5 additions & 8 deletions pkg/operation/botanist/component/extensions/operatingsystemconfig/operatingsystemconfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,12 +115,9 @@ type OriginalValues struct {
Images map[string]*imagevector.Image
// KubeletCACertificate is the certificate authority for the kubelet.
KubeletCACertificate string
// KubeletCLIFlags is the set of configurable kubelet CLI flags. If the respective worker pool provides kubelet
// configuration as well then this might get overwritten.
KubeletCLIFlags components.ConfigurableKubeletCLIFlags
// KubeletConfigParameters is the set of configurable kubelet config parameters. If the respective worker pool
// provides kubelet configuration as well then this might get overwritten.
KubeletConfigParameters components.ConfigurableKubeletConfigParameters
// KubeletConfig is the default kubelet configuration for all worker pools. Individual worker pools might overwrite
// this configuration.
KubeletConfig *gardencorev1beta1.KubeletConfig
// MachineTypes is a list of machine types.
MachineTypes []gardencorev1beta1.MachineType
// SSHPublicKeys is a list of public SSH keys.
Expand Down Expand Up @@ -476,8 +473,8 @@ func (o *operatingSystemConfig) newDeployer(osc *extensionsv1alpha1.OperatingSys
}
}

kubeletConfigParameters := o.values.KubeletConfigParameters
kubeletCLIFlags := o.values.KubeletCLIFlags
kubeletConfigParameters := components.KubeletConfigParametersFromCoreV1beta1KubeletConfig(o.values.KubeletConfig)
kubeletCLIFlags := components.KubeletCLIFlagsFromCoreV1beta1KubeletConfig(o.values.KubeletConfig)
if worker.Kubernetes != nil && worker.Kubernetes.Kubelet != nil {
kubeletConfigParameters = components.KubeletConfigParametersFromCoreV1beta1KubeletConfig(worker.Kubernetes.Kubelet)
kubeletCLIFlags = components.KubeletCLIFlagsFromCoreV1beta1KubeletConfig(worker.Kubernetes.Kubelet)
Expand Down
66 changes: 36 additions & 30 deletions ...eration/botanist/component/extensions/operatingsystemconfig/operatingsystemconfig_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,14 +73,18 @@ var _ = Describe("OperatingSystemConfig", func() {
mockNow *mocktime.MockNow
now time.Time

apiServerURL = "https://url-to-apiserver"
caBundle = pointer.String("ca-bundle")
clusterDNSAddress = "cluster-dns"
clusterDomain = "cluster-domain"
images = map[string]*imagevector.Image{"foo": {}}
kubeletCACertificate = "kubelet-ca"
kubeletCLIFlags = components.ConfigurableKubeletCLIFlags{}
kubeletConfigParameters = components.ConfigurableKubeletConfigParameters{}
apiServerURL = "https://url-to-apiserver"
caBundle = pointer.String("ca-bundle")
clusterDNSAddress = "cluster-dns"
clusterDomain = "cluster-domain"
images = map[string]*imagevector.Image{"foo": {}}
kubeletCACertificate = "kubelet-ca"
evictionHardMemoryAvailable = "100Mi"
kubeletConfig = &gardencorev1beta1.KubeletConfig{
EvictionHard: &gardencorev1beta1.KubeletConfigEviction{
MemoryAvailable: &evictionHardMemoryAvailable,
},
}
kubeletDataVolumeName = "foo"
machineTypes []gardencorev1beta1.MachineType
sshPublicKeys = []string{"ssh-public-key", "ssh-public-key-b"}
Expand Down Expand Up @@ -177,16 +181,15 @@ var _ = Describe("OperatingSystemConfig", func() {
APIServerURL: apiServerURL,
},
OriginalValues: OriginalValues{
CABundle: caBundle,
ClusterDNSAddress: clusterDNSAddress,
ClusterDomain: clusterDomain,
Images: images,
KubeletCACertificate: kubeletCACertificate,
KubeletConfigParameters: kubeletConfigParameters,
KubeletCLIFlags: kubeletCLIFlags,
MachineTypes: machineTypes,
SSHPublicKeys: sshPublicKeys,
PromtailEnabled: promtailEnabled,
CABundle: caBundle,
ClusterDNSAddress: clusterDNSAddress,
ClusterDomain: clusterDomain,
Images: images,
KubeletConfig: kubeletConfig,
KubeletCACertificate: kubeletCACertificate,
MachineTypes: machineTypes,
SSHPublicKeys: sshPublicKeys,
PromtailEnabled: promtailEnabled,
},
}

Expand Down Expand Up @@ -219,18 +222,21 @@ var _ = Describe("OperatingSystemConfig", func() {
apiServerURL,
)
originalUnits, originalFiles, _ := originalConfigFn(components.Context{
CABundle: caBundle,
ClusterDNSAddress: clusterDNSAddress,
ClusterDomain: clusterDomain,
CRIName: criName,
Images: images,
KubeletCACertificate: kubeletCACertificate,
KubeletCLIFlags: kubeletCLIFlags,
KubeletConfigParameters: kubeletConfigParameters,
KubeletDataVolumeName: &kubeletDataVolumeName,
KubernetesVersion: k8sVersion,
SSHPublicKeys: sshPublicKeys,
PromtailEnabled: promtailEnabled,
CABundle: caBundle,
ClusterDNSAddress: clusterDNSAddress,
ClusterDomain: clusterDomain,
CRIName: criName,
Images: images,
KubeletCACertificate: kubeletCACertificate,
KubeletConfigParameters: components.ConfigurableKubeletConfigParameters{
EvictionHard: map[string]string{
"memory.available": evictionHardMemoryAvailable,
},
},
KubeletDataVolumeName: &kubeletDataVolumeName,
KubernetesVersion: k8sVersion,
SSHPublicKeys: sshPublicKeys,
PromtailEnabled: promtailEnabled,
})

oscDownloader := &extensionsv1alpha1.OperatingSystemConfig{
Expand Down
16 changes: 7 additions & 9 deletions pkg/operation/botanist/operatingsystemconfig.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ import (
"github.com/gardener/gardener/pkg/operation/botanist/component/extensions/operatingsystemconfig"
"github.com/gardener/gardener/pkg/operation/botanist/component/extensions/operatingsystemconfig/downloader"
"github.com/gardener/gardener/pkg/operation/botanist/component/extensions/operatingsystemconfig/executor"
"github.com/gardener/gardener/pkg/operation/botanist/component/extensions/operatingsystemconfig/original/components"
"github.com/gardener/gardener/pkg/operation/botanist/component/nodelocaldns"
"github.com/gardener/gardener/pkg/utils/flow"
"github.com/gardener/gardener/pkg/utils/images"
Expand Down Expand Up @@ -70,14 +69,13 @@ func (b *Botanist) DefaultOperatingSystemConfig() (operatingsystemconfig.Interfa
KubernetesVersion: b.Shoot.KubernetesVersion,
Workers: b.Shoot.GetInfo().Spec.Provider.Workers,
OriginalValues: operatingsystemconfig.OriginalValues{
ClusterDNSAddress: clusterDNSAddress,
ClusterDomain: gardencorev1beta1.DefaultDomain,
Images: oscImages,
KubeletConfigParameters: components.KubeletConfigParametersFromCoreV1beta1KubeletConfig(b.Shoot.GetInfo().Spec.Kubernetes.Kubelet),
KubeletCLIFlags: components.KubeletCLIFlagsFromCoreV1beta1KubeletConfig(b.Shoot.GetInfo().Spec.Kubernetes.Kubelet),
MachineTypes: b.Shoot.CloudProfile.Spec.MachineTypes,
PromtailEnabled: promtailEnabled,
LokiIngressHostName: lokiIngressHost,
ClusterDNSAddress: clusterDNSAddress,
ClusterDomain: gardencorev1beta1.DefaultDomain,
Images: oscImages,
KubeletConfig: b.Shoot.GetInfo().Spec.Kubernetes.Kubelet,
MachineTypes: b.Shoot.CloudProfile.Spec.MachineTypes,
PromtailEnabled: promtailEnabled,
LokiIngressHostName: lokiIngressHost,
},
},
operatingsystemconfig.DefaultInterval,
Expand Down