-
Notifications
You must be signed in to change notification settings - Fork 38
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.
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
Awscapi #342
Open
huali9
wants to merge
2
commits into
openshift:master
Choose a base branch
from
huali9:awscapi
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Awscapi #342
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,239 @@ | ||
| package capi | ||
|
|
||
| import ( | ||
| "context" | ||
|
|
||
| . "github.com/onsi/ginkgo/v2" | ||
| . "github.com/onsi/gomega" | ||
| configv1 "github.com/openshift/api/config/v1" | ||
| mapiv1 "github.com/openshift/api/machine/v1beta1" | ||
| "github.com/openshift/cluster-api-actuator-pkg/pkg/framework" | ||
| "github.com/openshift/cluster-api-actuator-pkg/pkg/framework/gatherer" | ||
| capiinfrastructurev1beta2resourcebuilder "github.com/openshift/cluster-api-actuator-pkg/testutils/resourcebuilder/cluster-api/infrastructure/v1beta2" | ||
| corev1 "k8s.io/api/core/v1" | ||
| awsv1 "sigs.k8s.io/cluster-api-provider-aws/v2/api/v1beta2" | ||
| clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1" | ||
|
|
||
| "sigs.k8s.io/controller-runtime/pkg/client/config" | ||
|
|
||
| "sigs.k8s.io/controller-runtime/pkg/client" | ||
| yaml "sigs.k8s.io/yaml" | ||
| ) | ||
|
|
||
| const ( | ||
| awsMachineTemplateName = "aws-machine-template" | ||
| infrastructureName = "cluster" | ||
| infraAPIVersion = "infrastructure.cluster.x-k8s.io/v1beta1" | ||
| ) | ||
|
|
||
| var _ = Describe("Cluster API AWS MachineSet", framework.LabelCAPI, framework.LabelDisruptive, Ordered, func() { | ||
| var ( | ||
| cl client.Client | ||
| ctx = context.Background() | ||
| platform configv1.PlatformType | ||
| clusterName string | ||
| oc *gatherer.CLI | ||
| awsMachineTemplate *awsv1.AWSMachineTemplate | ||
| machineSetParams framework.CAPIMachineSetParams | ||
| machineSet *clusterv1.MachineSet | ||
| mapiDefaultProviderSpec *mapiv1.AWSMachineProviderConfig | ||
| err error | ||
| ) | ||
|
|
||
| BeforeAll(func() { | ||
| cfg, err := config.GetConfig() | ||
| Expect(err).ToNot(HaveOccurred(), "Failed to GetConfig") | ||
|
|
||
| cl, err = client.New(cfg, client.Options{}) | ||
| Expect(err).ToNot(HaveOccurred(), "Failed to create Kubernetes client for test") | ||
|
|
||
| infra := &configv1.Infrastructure{} | ||
| infraName := client.ObjectKey{ | ||
| Name: infrastructureName, | ||
| } | ||
| Expect(cl.Get(ctx, infraName, infra)).To(Succeed(), "Failed to get cluster infrastructure object") | ||
| Expect(infra.Status.PlatformStatus).ToNot(BeNil(), "expected the infrastructure Status.PlatformStatus to not be nil") | ||
| clusterName = infra.Status.InfrastructureName | ||
| platform = infra.Status.PlatformStatus.Type | ||
| if platform != configv1.AWSPlatformType { | ||
| Skip("Skipping AWS E2E tests") | ||
| } | ||
| oc, err = framework.NewCLI() | ||
| Expect(err).ToNot(HaveOccurred(), "Failed to new CLI") | ||
| framework.SkipIfNotTechPreviewNoUpgrade(oc, cl) | ||
| _, mapiDefaultProviderSpec = getDefaultAWSMAPIProviderSpec(cl) | ||
| machineSetParams = framework.NewCAPIMachineSetParams( | ||
| "aws-machineset", | ||
| clusterName, | ||
| mapiDefaultProviderSpec.Placement.AvailabilityZone, | ||
| 1, | ||
| corev1.ObjectReference{ | ||
| Kind: "AWSMachineTemplate", | ||
| APIVersion: infraAPIVersion, | ||
| Name: awsMachineTemplateName, | ||
| }, | ||
| ) | ||
| framework.CreateCoreCluster(ctx, cl, clusterName, "AWSCluster") | ||
| }) | ||
|
|
||
| AfterEach(func() { | ||
| framework.DeleteCAPIMachineSets(ctx, cl, machineSet) | ||
| framework.WaitForCAPIMachineSetsDeleted(ctx, cl, machineSet) | ||
| framework.DeleteObjects(ctx, cl, awsMachineTemplate) | ||
| }) | ||
|
|
||
| //huliu-OCP-51071 - [CAPI] Create machineset with CAPI on aws | ||
| It("should be able to run a machine with a default provider spec", func() { | ||
| awsMachineTemplate = newAWSMachineTemplate(mapiDefaultProviderSpec) | ||
| Expect(cl.Create(ctx, awsMachineTemplate)).To(Succeed(), "Failed to create awsmachinetemplate") | ||
| machineSetParams = framework.UpdateCAPIMachineSetName("aws-machineset-51071", machineSetParams) | ||
| machineSet, err = framework.CreateCAPIMachineSet(ctx, cl, machineSetParams) | ||
| Expect(err).ToNot(HaveOccurred(), "Failed to create CAPI machineset") | ||
| framework.WaitForCAPIMachinesRunning(ctx, cl, machineSet.Name) | ||
| }) | ||
|
|
||
| //huliu-OCP-75395 - [CAPI] AWS Placement group support. | ||
| It("should be able to run a machine with cluster placement group", func() { | ||
| awsClient := framework.NewAwsClient(framework.GetCredentialsFromCluster(oc)) | ||
| placementGroupName := clusterName + "pgcluster" | ||
| placementGroupID, err := awsClient.CreatePlacementGroup(placementGroupName, "cluster") | ||
| Expect(err).ToNot(HaveOccurred(), "Failed to create placementgroup") | ||
| Expect(placementGroupID).ToNot(Equal(""), "expected the placementGroupID to not be empty string") | ||
| DeferCleanup(func() { | ||
| _, err = awsClient.DeletePlacementGroup(placementGroupName) | ||
| Expect(err).ToNot(HaveOccurred(), "Failed to delete placementgroup") | ||
| }) | ||
|
|
||
| awsMachineTemplate = newAWSMachineTemplate(mapiDefaultProviderSpec) | ||
| awsMachineTemplate.Spec.Template.Spec.PlacementGroupName = placementGroupName | ||
| Expect(cl.Create(ctx, awsMachineTemplate)).To(Succeed(), "Failed to create awsmachinetemplate") | ||
| machineSetParams = framework.UpdateCAPIMachineSetName("aws-machineset-75395", machineSetParams) | ||
| machineSet, err = framework.CreateCAPIMachineSet(ctx, cl, machineSetParams) | ||
| Expect(err).ToNot(HaveOccurred(), "Failed to create CAPI machineset") | ||
| framework.WaitForCAPIMachinesRunning(ctx, cl, machineSet.Name) | ||
| }) | ||
|
|
||
| //huliu-OCP-75396 - [CAPI] Creating machines using KMS keys from AWS. | ||
| It("should be able to run a machine using KMS keys", framework.LabelQeAccountOnly, func() { | ||
| awsMachineTemplate = newAWSMachineTemplate(mapiDefaultProviderSpec) | ||
| region := mapiDefaultProviderSpec.Placement.Region | ||
| if region != "us-east-1" && region != "us-east-2" { | ||
| Skip("Region is " + region + ", skip this test scenario because we only created kms key in us-east-1/us-east-2 region") | ||
| } | ||
| var key string | ||
| switch region { | ||
| case "us-east-1": | ||
| key = "arn:aws:kms:us-east-1:301721915996:key/c471ec83-cfaf-41a2-9241-d9e99c4da344" | ||
| case "us-east-2": | ||
| key = "arn:aws:kms:us-east-2:301721915996:key/c228ef83-df2c-4151-84c4-d9f39f39a972" | ||
| } | ||
| awskmsClient := framework.NewAwsKmsClient(framework.GetCredentialsFromCluster(oc)) | ||
| _, err = awskmsClient.DescribeKeyByID(key) | ||
| Expect(err).ToNot(HaveOccurred(), "Failed to get the key") | ||
| encryptBool := true | ||
| awsMachineTemplate.Spec.Template.Spec.NonRootVolumes = []awsv1.Volume{ | ||
| { | ||
| DeviceName: "/dev/xvda", | ||
| Size: 140, | ||
| Type: awsv1.VolumeTypeIO1, | ||
| IOPS: 5000, | ||
| Encrypted: &encryptBool, | ||
| EncryptionKey: key, | ||
| }, | ||
| } | ||
| Expect(cl.Create(ctx, awsMachineTemplate)).To(Succeed(), "Failed to create awsmachinetemplate") | ||
| machineSetParams = framework.UpdateCAPIMachineSetName("aws-machineset-75396", machineSetParams) | ||
| machineSet, err = framework.CreateCAPIMachineSet(ctx, cl, machineSetParams) | ||
| Expect(err).ToNot(HaveOccurred(), "Failed to create CAPI machineset") | ||
| framework.WaitForCAPIMachinesRunning(ctx, cl, machineSet.Name) | ||
| }) | ||
| }) | ||
|
|
||
| func getDefaultAWSMAPIProviderSpec(cl client.Client) (*mapiv1.MachineSet, *mapiv1.AWSMachineProviderConfig) { | ||
| machineSetList := &mapiv1.MachineSetList{} | ||
|
|
||
| Eventually(func() error { | ||
| return cl.List(framework.GetContext(), machineSetList, client.InNamespace(framework.MachineAPINamespace)) | ||
| }, framework.WaitShort, framework.RetryShort).Should(Succeed(), "it should be able to list the MAPI machinesets") | ||
| Expect(machineSetList.Items).ToNot(HaveLen(0), "expected the MAPI machinesets to be present") | ||
|
|
||
| machineSet := &machineSetList.Items[0] | ||
| Expect(machineSet.Spec.Template.Spec.ProviderSpec.Value).ToNot(BeNil(), "expected the MAPI machinesets ProviderSpec value to not be nil") | ||
|
|
||
| providerSpec := &mapiv1.AWSMachineProviderConfig{} | ||
| Expect(yaml.Unmarshal(machineSet.Spec.Template.Spec.ProviderSpec.Value.Raw, providerSpec)).To(Succeed(), "it should be able to unmarshal the raw yaml into providerSpec") | ||
|
|
||
| return machineSet, providerSpec | ||
| } | ||
|
|
||
| func newAWSMachineTemplate(mapiProviderSpec *mapiv1.AWSMachineProviderConfig) *awsv1.AWSMachineTemplate { | ||
| By("Creating AWS machine template") | ||
|
|
||
| Expect(mapiProviderSpec).ToNot(BeNil(), "expected the mapi ProviderSpec to not be nil") | ||
| Expect(mapiProviderSpec.IAMInstanceProfile).ToNot(BeNil(), "expected the mapi IAMInstanceProfile to not be nil") | ||
| Expect(mapiProviderSpec.IAMInstanceProfile.ID).ToNot(BeNil(), "expected the mapi IAMInstanceProfile.ID to not be nil") | ||
| Expect(mapiProviderSpec.InstanceType).ToNot(BeEmpty(), "expected the mapi InstanceType to not be empty") | ||
| Expect(mapiProviderSpec.Placement.AvailabilityZone).ToNot(BeEmpty(), "expected the mapi Placement.AvailabilityZone to not be empty") | ||
| Expect(mapiProviderSpec.AMI.ID).ToNot(BeNil(), "expected the mapi AMI.ID to not be nil") | ||
| Expect(mapiProviderSpec.SecurityGroups).ToNot(HaveLen(0), "expected the mapi SecurityGroups to be present") | ||
| Expect(mapiProviderSpec.SecurityGroups[0].Filters).ToNot(HaveLen(0), "expected the mapi SecurityGroups[0].Filters to be present") | ||
| Expect(mapiProviderSpec.SecurityGroups[0].Filters[0].Values).ToNot(HaveLen(0), "expected the mapi SecurityGroups[0].Filters[0].Values to be present") | ||
|
|
||
| var subnet awsv1.AWSResourceReference | ||
|
|
||
| if len(mapiProviderSpec.Subnet.Filters) == 0 { | ||
| subnet = awsv1.AWSResourceReference{ | ||
| ID: mapiProviderSpec.Subnet.ID, | ||
| } | ||
| } else { | ||
| subnet = awsv1.AWSResourceReference{ | ||
| Filters: []awsv1.Filter{ | ||
| { | ||
| Name: "tag:Name", | ||
| Values: mapiProviderSpec.Subnet.Filters[0].Values, | ||
| }, | ||
| }, | ||
| } | ||
| } | ||
|
|
||
| uncompressedUserData := true | ||
| ami := awsv1.AMIReference{ | ||
| ID: mapiProviderSpec.AMI.ID, | ||
| } | ||
| ignition := &awsv1.Ignition{ | ||
| Version: "3.4", | ||
| StorageType: awsv1.IgnitionStorageTypeOptionUnencryptedUserData, | ||
| } | ||
| additionalSecurityGroups := []awsv1.AWSResourceReference{ | ||
| { | ||
| Filters: []awsv1.Filter{ | ||
| { | ||
| Name: "tag:Name", | ||
| Values: mapiProviderSpec.SecurityGroups[0].Filters[0].Values, | ||
| }, | ||
| }, | ||
| }, | ||
| { | ||
| Filters: []awsv1.Filter{ | ||
| { | ||
| Name: "tag:Name", | ||
| Values: mapiProviderSpec.SecurityGroups[1].Filters[0].Values, | ||
| }, | ||
| }, | ||
| }, | ||
| } | ||
| awsmt := capiinfrastructurev1beta2resourcebuilder. | ||
| AWSMachineTemplate(). | ||
| WithUncompressedUserData(uncompressedUserData). | ||
| WithIAMInstanceProfile(*mapiProviderSpec.IAMInstanceProfile.ID). | ||
| WithInstanceType(mapiProviderSpec.InstanceType). | ||
| WithAMI(ami). | ||
| WithIgnition(ignition). | ||
| WithSubnet(&subnet). | ||
| WithAdditionalSecurityGroups(additionalSecurityGroups). | ||
| WithName(awsMachineTemplateName). | ||
| WithNamespace(framework.ClusterAPINamespace). | ||
| Build() | ||
|
|
||
| return awsmt | ||
| } | ||
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
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.
can this be ran in dev's account?
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.
I checked the job result, and yes, you are right, this cannot be ran in dev's account, I just comment this case out for now and think of how to deal with it, will update in a following pr. Thank you @sunzhaohua2 PTAL again, thanks!
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.
Updated this case to skip it in dev's account.