🌱 Add flag to reserve memory #3130
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| apiVersion: kustomize.config.k8s.io/v1beta1 | ||
| kind: Kustomization | ||
| resources: | ||
| - ../base | ||
| patches: | ||
| - target: | ||
| kind: VSphereMachineTemplate | ||
| patch: |- | ||
| - op: add | ||
| path: /spec/template/spec/memoryReservationLockedToMax | ||
|
There was a problem hiding this comment. may be enough to add this to an existing test to not increase the runtime There was a problem hiding this comment. Would it then make sense to add default variable in env package: or directly set value in generators: There was a problem hiding this comment. let's just add it to one test, not to all :-) There was a problem hiding this comment. I reviewed the code, and it seems that if I want to integrate this with an existing test, like the |
||
| value: true | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -0,0 +1,115 @@ | ||||||
| /* | ||||||
| Copyright 2022 The Kubernetes Authors. | ||||||
|
There was a problem hiding this comment.
Suggested change
new file |
||||||
|
|
||||||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||||||
| you may not use this file except in compliance with the License. | ||||||
| You may obtain a copy of the License at | ||||||
|
|
||||||
| http://www.apache.org/licenses/LICENSE-2.0 | ||||||
|
|
||||||
| Unless required by applicable law or agreed to in writing, software | ||||||
| distributed under the License is distributed on an "AS IS" BASIS, | ||||||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||||||
| See the License for the specific language governing permissions and | ||||||
| limitations under the License. | ||||||
| */ | ||||||
|
|
||||||
| package e2e | ||||||
|
|
||||||
| import ( | ||||||
| "context" | ||||||
| "fmt" | ||||||
|
|
||||||
| . "github.com/onsi/ginkgo/v2" | ||||||
| . "github.com/onsi/gomega" | ||||||
| "github.com/vmware/govmomi/object" | ||||||
| "github.com/vmware/govmomi/vim25/mo" | ||||||
| corev1 "k8s.io/api/core/v1" | ||||||
| "sigs.k8s.io/cluster-api/test/framework" | ||||||
| "sigs.k8s.io/cluster-api/test/framework/clusterctl" | ||||||
| . "sigs.k8s.io/cluster-api/test/framework/ginkgoextensions" | ||||||
| "sigs.k8s.io/cluster-api/util" | ||||||
| ) | ||||||
|
|
||||||
| type MemoryReservationLockedSpecInput struct { | ||||||
|
There was a problem hiding this comment.
Suggested change
There was a problem hiding this comment. I've been following the naming conventions from other tests, such as There was a problem hiding this comment.
yes |
||||||
| InfraClients | ||||||
| Global GlobalInput | ||||||
| SpecName string | ||||||
| Namespace *corev1.Namespace | ||||||
| // Allows to inject a function to be run after test namespace is created. | ||||||
| // If not specified, this is a no-op. | ||||||
| PostNamespaceCreated func(managementClusterProxy framework.ClusterProxy, workloadClusterNamespace string) | ||||||
| } | ||||||
|
|
||||||
| var _ = Describe("Set memory reservation locked to max on VMs", func() { | ||||||
| const specName = "memory-reservation-locked" | ||||||
| Setup(specName, func(testSpecificSettingsGetter func() testSettings) { | ||||||
| var ( | ||||||
| namespace *corev1.Namespace | ||||||
| ) | ||||||
|
|
||||||
| BeforeEach(func() { | ||||||
| Expect(bootstrapClusterProxy).NotTo(BeNil(), "BootstrapClusterProxy can't be nil") | ||||||
| namespace = setupSpecNamespace(specName, testSpecificSettingsGetter().PostNamespaceCreatedFunc) | ||||||
| }) | ||||||
|
|
||||||
| AfterEach(func() { | ||||||
| cleanupSpecNamespace(namespace) | ||||||
| }) | ||||||
|
|
||||||
| It("Creates a workload cluster whose VMs have memory reservation locked set to true", func() { | ||||||
| VerfiyMemoryReservationLockToMax(ctx, MemoryReservationLockedSpecInput{ | ||||||
| SpecName: specName, | ||||||
| Namespace: namespace, | ||||||
| InfraClients: InfraClients{ | ||||||
| Client: vsphereClient, | ||||||
| RestClient: restClient, | ||||||
| Finder: vsphereFinder, | ||||||
| }, | ||||||
| Global: GlobalInput{ | ||||||
| BootstrapClusterProxy: bootstrapClusterProxy, | ||||||
| ClusterctlConfigPath: testSpecificSettingsGetter().ClusterctlConfigPath, | ||||||
| E2EConfig: e2eConfig, | ||||||
| ArtifactFolder: artifactFolder, | ||||||
| }, | ||||||
| }) | ||||||
| }) | ||||||
| }) | ||||||
| }) | ||||||
|
|
||||||
| func VerfiyMemoryReservationLockToMax(ctx context.Context, input MemoryReservationLockedSpecInput) { | ||||||
| var ( | ||||||
| specName = input.SpecName | ||||||
| namespace = input.Namespace | ||||||
| clusterResources = new(clusterctl.ApplyClusterTemplateAndWaitResult) | ||||||
| ) | ||||||
|
|
||||||
| clusterName := fmt.Sprintf("%s-%s", specName, util.RandomString(6)) | ||||||
| By("Creating a workload cluster") | ||||||
| configCluster := defaultConfigCluster(clusterName, namespace.Name, specName, 1, 1, input.Global) | ||||||
|
|
||||||
| clusterctl.ApplyClusterTemplateAndWait(ctx, clusterctl.ApplyClusterTemplateAndWaitInput{ | ||||||
| ClusterProxy: input.Global.BootstrapClusterProxy, | ||||||
| ConfigCluster: configCluster, | ||||||
| WaitForClusterIntervals: input.Global.E2EConfig.GetIntervals(specName, "wait-cluster"), | ||||||
| WaitForControlPlaneIntervals: input.Global.E2EConfig.GetIntervals(specName, "wait-control-plane"), | ||||||
| WaitForMachineDeployments: input.Global.E2EConfig.GetIntervals(specName, "wait-worker-nodes"), | ||||||
| }, clusterResources) | ||||||
|
|
||||||
| Byf("Fetching the VSphereVM objects for the cluster %s", clusterName) | ||||||
| vms := getVSphereVMsForCluster(clusterName, namespace.Name) | ||||||
|
|
||||||
| By("Verifying memory reservation locked to max is set to true") | ||||||
| for _, vm := range vms.Items { | ||||||
| vmObj, err := input.Finder.VirtualMachine(ctx, vm.Name) | ||||||
| Expect(err).ToNot(HaveOccurred(), "expected to find VM %s", vm.Name) | ||||||
| Expect(getMemoryReservationLockedToMaxFromObj(vmObj)).To(Equal(true), "expected memory reservation locked to max to be set to true") | ||||||
|
Check failure on line 106 in test/e2e/memory_reservation_locked_test.go
|
||||||
| } | ||||||
| } | ||||||
|
|
||||||
| func getMemoryReservationLockedToMaxFromObj(vmObj *object.VirtualMachine) *bool { | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| var virtualMachine mo.VirtualMachine | ||||||
| Expect(vmObj.Properties(ctx, vmObj.Reference(), []string{"config.memoryReservationLockedToMax"}, &virtualMachine)).To(Succeed()) | ||||||
| Expect(virtualMachine.Config.MemoryReservationLockedToMax).ToNot(BeEmpty()) | ||||||
| return virtualMachine.Config.MemoryReservationLockedToMax | ||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||
| } | ||||||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
please update it everywhere.