From 032d5efd7943392b68f0f55ad76df390b25c0781 Mon Sep 17 00:00:00 2001 From: Himangini Date: Wed, 7 Sep 2022 13:41:04 +0100 Subject: [PATCH 1/5] updated the vpc-cni release and aws-node and increase some timeouts some changes to generated files and packages due to running make unit-test --- Makefile | 2 +- integration/data/podinfo.yaml | 8 +- integration/data/test-dns.yaml | 18 +-- .../tests/managed/managed_nodegroup_test.go | 2 +- pkg/addons/default/assets/aws-node.yaml | 40 +++--- pkg/addons/default/aws_node_generate.go | 2 +- pkg/addons/default/aws_node_test.go | 8 +- pkg/awsapi/autoscaling.go | 122 +++++++++--------- pkg/awsapi/cloudformation.go | 22 ++-- pkg/awsapi/cloudwatchlogs.go | 15 ++- pkg/awsapi/elasticloadbalancingv2.go | 4 +- pkg/awsapi/iam.go | 28 ++-- pkg/awsapi/ssm.go | 2 +- pkg/awsapi/sts.go | 5 + 14 files changed, 150 insertions(+), 128 deletions(-) diff --git a/Makefile b/Makefile index 2d2d7632bd..561eabdd16 100644 --- a/Makefile +++ b/Makefile @@ -136,7 +136,7 @@ delete-integration-test-dev-cluster: build ## Delete the test cluster for use wh ##@ Code Generation .PHONY: generate-always -generate-always: pkg/addons/default/assets/aws-node.yaml ## Generate code (required for every build) +generate-always: ## Generate code (required for every build) go generate ./pkg/apis/eksctl.io/v1alpha5/generate.go go generate ./pkg/nodebootstrap go generate ./pkg/addons diff --git a/integration/data/podinfo.yaml b/integration/data/podinfo.yaml index c1e387881a..2a2c84371a 100644 --- a/integration/data/podinfo.yaml +++ b/integration/data/podinfo.yaml @@ -31,16 +31,16 @@ spec: httpGet: path: /readyz port: 8080 - initialDelaySeconds: 1 + initialDelaySeconds: 3 periodSeconds: 5 - failureThreshold: 1 + failureThreshold: 10 livenessProbe: httpGet: path: /healthz port: 8080 - initialDelaySeconds: 1 + initialDelaySeconds: 5 periodSeconds: 10 - failureThreshold: 2 + failureThreshold: 15 resources: requests: memory: "32Mi" diff --git a/integration/data/test-dns.yaml b/integration/data/test-dns.yaml index 2178f8e287..53e6a2f432 100644 --- a/integration/data/test-dns.yaml +++ b/integration/data/test-dns.yaml @@ -18,7 +18,7 @@ spec: readinessProbe: initialDelaySeconds: 0 periodSeconds: 3 - failureThreshold: 3 + failureThreshold: 10 timeoutSeconds: 1 exec: command: @@ -31,7 +31,7 @@ spec: readinessProbe: initialDelaySeconds: 0 periodSeconds: 3 - failureThreshold: 3 + failureThreshold: 10 timeoutSeconds: 1 exec: command: @@ -44,7 +44,7 @@ spec: readinessProbe: initialDelaySeconds: 0 periodSeconds: 3 - failureThreshold: 3 + failureThreshold: 10 timeoutSeconds: 1 exec: command: @@ -57,7 +57,7 @@ spec: readinessProbe: initialDelaySeconds: 0 periodSeconds: 3 - failureThreshold: 3 + failureThreshold: 10 timeoutSeconds: 1 exec: command: @@ -70,7 +70,7 @@ spec: readinessProbe: initialDelaySeconds: 0 periodSeconds: 3 - failureThreshold: 3 + failureThreshold: 10 timeoutSeconds: 1 exec: command: @@ -83,7 +83,7 @@ spec: readinessProbe: initialDelaySeconds: 0 periodSeconds: 3 - failureThreshold: 3 + failureThreshold: 10 timeoutSeconds: 1 exec: command: @@ -96,7 +96,7 @@ spec: readinessProbe: initialDelaySeconds: 0 periodSeconds: 3 - failureThreshold: 3 + failureThreshold: 10 timeoutSeconds: 1 exec: command: @@ -109,7 +109,7 @@ spec: readinessProbe: initialDelaySeconds: 0 periodSeconds: 3 - failureThreshold: 3 + failureThreshold: 10 timeoutSeconds: 1 exec: command: @@ -122,7 +122,7 @@ spec: readinessProbe: initialDelaySeconds: 0 periodSeconds: 3 - failureThreshold: 3 + failureThreshold: 10 timeoutSeconds: 1 exec: command: diff --git a/integration/tests/managed/managed_nodegroup_test.go b/integration/tests/managed/managed_nodegroup_test.go index ea6ed2c05e..1a3c309180 100644 --- a/integration/tests/managed/managed_nodegroup_test.go +++ b/integration/tests/managed/managed_nodegroup_test.go @@ -94,7 +94,7 @@ var _ = Describe("(Integration) Create Managed Nodegroups", func() { return clusterConfig } - defaultTimeout := 20 * time.Minute + defaultTimeout := 30 * time.Minute type managedCLIEntry struct { createArgs []string diff --git a/pkg/addons/default/assets/aws-node.yaml b/pkg/addons/default/assets/aws-node.yaml index e77f37087f..67bed0aa54 100644 --- a/pkg/addons/default/assets/aws-node.yaml +++ b/pkg/addons/default/assets/aws-node.yaml @@ -9,7 +9,7 @@ metadata: app.kubernetes.io/name: aws-node app.kubernetes.io/instance: aws-vpc-cni k8s-app: aws-node - app.kubernetes.io/version: "v1.11.2" + app.kubernetes.io/version: "v1.11.3" --- # Source: aws-vpc-cni/templates/customresourcedefinition.yaml apiVersion: apiextensions.k8s.io/v1 @@ -20,7 +20,7 @@ metadata: app.kubernetes.io/name: aws-node app.kubernetes.io/instance: aws-vpc-cni k8s-app: aws-node - app.kubernetes.io/version: "v1.11.2" + app.kubernetes.io/version: "v1.11.3" spec: scope: Cluster group: crd.k8s.amazonaws.com @@ -47,7 +47,7 @@ metadata: app.kubernetes.io/name: aws-node app.kubernetes.io/instance: aws-vpc-cni k8s-app: aws-node - app.kubernetes.io/version: "v1.11.2" + app.kubernetes.io/version: "v1.11.3" rules: - apiGroups: - crd.k8s.amazonaws.com @@ -61,7 +61,7 @@ rules: - apiGroups: [""] resources: - pods - verbs: ["list", "watch", "get"] + verbs: ["list", "watch", "get"] - apiGroups: [""] resources: - nodes @@ -70,6 +70,10 @@ rules: resources: - '*' verbs: ["list", "watch"] + - apiGroups: ["", "events.k8s.io"] + resources: + - events + verbs: ["create", "patch", "list", "get"] --- # Source: aws-vpc-cni/templates/clusterrolebinding.yaml apiVersion: rbac.authorization.k8s.io/v1 @@ -80,7 +84,7 @@ metadata: app.kubernetes.io/name: aws-node app.kubernetes.io/instance: aws-vpc-cni k8s-app: aws-node - app.kubernetes.io/version: "v1.11.2" + app.kubernetes.io/version: "v1.11.3" roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole @@ -100,7 +104,7 @@ metadata: app.kubernetes.io/name: aws-node app.kubernetes.io/instance: aws-vpc-cni k8s-app: aws-node - app.kubernetes.io/version: "v1.11.2" + app.kubernetes.io/version: "v1.11.3" spec: updateStrategy: rollingUpdate: @@ -121,7 +125,7 @@ spec: hostNetwork: true initContainers: - name: aws-vpc-cni-init - image: "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.11.2" + image: "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.11.3" env: - name: DISABLE_TCP_EARLY_DEMUX value: "false" @@ -139,7 +143,7 @@ spec: {} containers: - name: aws-node - image: "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.11.2" + image: "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni:v1.11.3" ports: - containerPort: 61678 name: metrics @@ -148,19 +152,19 @@ spec: command: - /app/grpc-health-probe - -addr=:50051 - - -connect-timeout=5s - - -rpc-timeout=5s + - -connect-timeout=10s + - -rpc-timeout=10s initialDelaySeconds: 60 - timeoutSeconds: 10 + timeoutSeconds: 15 readinessProbe: exec: command: - /app/grpc-health-probe - -addr=:50051 - - -connect-timeout=5s - - -rpc-timeout=5s - initialDelaySeconds: 1 - timeoutSeconds: 10 + - -connect-timeout=10s + - -rpc-timeout=10s + initialDelaySeconds: 5 + timeoutSeconds: 15 env: - name: ADDITIONAL_ENI_TAGS value: "{}" @@ -177,7 +181,7 @@ spec: - name: AWS_VPC_K8S_CNI_LOGLEVEL value: "DEBUG" - name: AWS_VPC_K8S_CNI_LOG_FILE - value: "/host/var/log/aws-routed-eni/ipamd.log" + value: "stdout" - name: AWS_VPC_K8S_CNI_RANDOMIZESNAT value: "prng" - name: AWS_VPC_K8S_CNI_VETHPREFIX @@ -210,7 +214,7 @@ spec: fieldPath: spec.nodeName resources: requests: - cpu: 10m + cpu: 25m securityContext: capabilities: add: @@ -266,4 +270,4 @@ spec: - key: eks.amazonaws.com/compute-type operator: NotIn values: - - fargate + - fargate \ No newline at end of file diff --git a/pkg/addons/default/aws_node_generate.go b/pkg/addons/default/aws_node_generate.go index a8871491d0..471bcf2c99 100644 --- a/pkg/addons/default/aws_node_generate.go +++ b/pkg/addons/default/aws_node_generate.go @@ -1,4 +1,4 @@ package defaultaddons // Please refer to https://docs.aws.amazon.com/eks/latest/userguide/cni-upgrades.html -//go:generate curl --silent --location https://raw.githubusercontent.com/aws/amazon-vpc-cni-k8s/v1.11.2/config/master/aws-k8s-cni.yaml?raw=1 --output assets/aws-node.yaml +//go:generate curl --silent --location https://raw.githubusercontent.com/aws/amazon-vpc-cni-k8s/v1.11.3/config/master/aws-k8s-cni.yaml?raw=1 --output assets/aws-node.yaml diff --git a/pkg/addons/default/aws_node_test.go b/pkg/addons/default/aws_node_test.go index 1c0c92b8ef..40d5dd0d0f 100644 --- a/pkg/addons/default/aws_node_test.go +++ b/pkg/addons/default/aws_node_test.go @@ -78,11 +78,11 @@ var _ = Describe("AWS Node", func() { Expect(err).NotTo(HaveOccurred()) Expect(awsNode.Spec.Template.Spec.Containers).To(HaveLen(1)) Expect(awsNode.Spec.Template.Spec.Containers[0].Image).To( - Equal("602401143452.dkr.ecr.us-east-1.amazonaws.com/amazon-k8s-cni:v1.11.2"), + Equal("602401143452.dkr.ecr.us-east-1.amazonaws.com/amazon-k8s-cni:v1.11.3"), ) Expect(awsNode.Spec.Template.Spec.InitContainers).To(HaveLen(1)) Expect(awsNode.Spec.Template.Spec.InitContainers[0].Image).To( - Equal("602401143452.dkr.ecr.us-east-1.amazonaws.com/amazon-k8s-cni-init:v1.11.2"), + Equal("602401143452.dkr.ecr.us-east-1.amazonaws.com/amazon-k8s-cni-init:v1.11.3"), ) }) }) @@ -98,11 +98,11 @@ var _ = Describe("AWS Node", func() { Expect(err).NotTo(HaveOccurred()) Expect(awsNode.Spec.Template.Spec.Containers).To(HaveLen(1)) Expect(awsNode.Spec.Template.Spec.Containers[0].Image).To( - Equal("961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/amazon-k8s-cni:v1.11.2"), + Equal("961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/amazon-k8s-cni:v1.11.3"), ) Expect(awsNode.Spec.Template.Spec.InitContainers).To(HaveLen(1)) Expect(awsNode.Spec.Template.Spec.InitContainers[0].Image).To( - Equal("961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/amazon-k8s-cni-init:v1.11.2"), + Equal("961992271922.dkr.ecr.cn-northwest-1.amazonaws.com.cn/amazon-k8s-cni-init:v1.11.3"), ) }) }) diff --git a/pkg/awsapi/autoscaling.go b/pkg/awsapi/autoscaling.go index e2ee96dc83..c61d90e35d 100644 --- a/pkg/awsapi/autoscaling.go +++ b/pkg/awsapi/autoscaling.go @@ -39,8 +39,8 @@ type ASG interface { // the DescribeLoadBalancerTargetGroups API. To detach the target group from the // Auto Scaling group, call the DetachLoadBalancerTargetGroups API. This operation // is additive and does not detach existing target groups or Classic Load Balancers - // from the Auto Scaling group. For more information, see Elastic Load Balancing - // and Amazon EC2 Auto Scaling + // from the Auto Scaling group. For more information, see Use Elastic Load + // Balancing to distribute traffic across the instances in your Auto Scaling group // (https://docs.aws.amazon.com/autoscaling/ec2/userguide/autoscaling-load-balancer.html) // in the Amazon EC2 Auto Scaling User Guide. AttachLoadBalancerTargetGroups(ctx context.Context, params *AttachLoadBalancerTargetGroupsInput, optFns ...func(*Options)) (*AttachLoadBalancerTargetGroupsOutput, error) @@ -49,11 +49,11 @@ type ASG interface { // one or more Classic Load Balancers to the specified Auto Scaling group. Amazon // EC2 Auto Scaling registers the running instances with these Classic Load // Balancers. To describe the load balancers for an Auto Scaling group, call the - // DescribeLoadBalancers API. To detach the load balancer from the Auto Scaling + // DescribeLoadBalancers API. To detach a load balancer from the Auto Scaling // group, call the DetachLoadBalancers API. This operation is additive and does not // detach existing Classic Load Balancers or target groups from the Auto Scaling - // group. For more information, see Elastic Load Balancing and Amazon EC2 Auto - // Scaling + // group. For more information, see Use Elastic Load Balancing to distribute + // traffic across the instances in your Auto Scaling group // (https://docs.aws.amazon.com/autoscaling/ec2/userguide/autoscaling-load-balancer.html) // in the Amazon EC2 Auto Scaling User Guide. AttachLoadBalancers(ctx context.Context, params *AttachLoadBalancersInput, optFns ...func(*Options)) (*AttachLoadBalancersOutput, error) @@ -107,8 +107,8 @@ type ASG interface { // Auto Scaling group with the specified name and attributes. If you exceed your // maximum limit of Auto Scaling groups, the call fails. To query this limit, call // the DescribeAccountLimits API. For information about updating this limit, see - // Amazon EC2 Auto Scaling service quotas - // (https://docs.aws.amazon.com/autoscaling/ec2/userguide/as-account-limits.html) + // Quotas for Amazon EC2 Auto Scaling + // (https://docs.aws.amazon.com/autoscaling/ec2/userguide/ec2-auto-scaling-quotas.html) // in the Amazon EC2 Auto Scaling User Guide. For introductory exercises for // creating an Auto Scaling group, see Getting started with Amazon EC2 Auto Scaling // (https://docs.aws.amazon.com/autoscaling/ec2/userguide/GettingStartedTutorial.html) @@ -118,16 +118,16 @@ type ASG interface { // Scaling groups // (https://docs.aws.amazon.com/autoscaling/ec2/userguide/AutoScalingGroup.html) in // the Amazon EC2 Auto Scaling User Guide. Every Auto Scaling group has three size - // parameters (DesiredCapacity, MaxSize, and MinSize). Usually, you set these sizes + // properties (DesiredCapacity, MaxSize, and MinSize). Usually, you set these sizes // based on a specific number of instances. However, if you configure a mixed // instances policy that defines weights for the instance types, you must specify // these sizes with the same units that you use for weighting instances. CreateAutoScalingGroup(ctx context.Context, params *CreateAutoScalingGroupInput, optFns ...func(*Options)) (*CreateAutoScalingGroupOutput, error) // Creates a launch configuration. If you exceed your maximum limit of launch // configurations, the call fails. To query this limit, call the - // DescribeAccountLimits API. For information about updating this limit, see Amazon - // EC2 Auto Scaling service quotas - // (https://docs.aws.amazon.com/autoscaling/ec2/userguide/as-account-limits.html) + // DescribeAccountLimits API. For information about updating this limit, see Quotas + // for Amazon EC2 Auto Scaling + // (https://docs.aws.amazon.com/autoscaling/ec2/userguide/ec2-auto-scaling-quotas.html) // in the Amazon EC2 Auto Scaling User Guide. For more information, see Launch // configurations // (https://docs.aws.amazon.com/autoscaling/ec2/userguide/LaunchConfiguration.html) @@ -135,9 +135,9 @@ type ASG interface { CreateLaunchConfiguration(ctx context.Context, params *CreateLaunchConfigurationInput, optFns ...func(*Options)) (*CreateLaunchConfigurationOutput, error) // Creates or updates tags for the specified Auto Scaling group. When you specify a // tag with a key that already exists, the operation overwrites the previous tag - // definition, and you do not get an error message. For more information, see - // Tagging Auto Scaling groups and instances - // (https://docs.aws.amazon.com/autoscaling/ec2/userguide/autoscaling-tagging.html) + // definition, and you do not get an error message. For more information, see Tag + // Auto Scaling groups and instances + // (https://docs.aws.amazon.com/autoscaling/ec2/userguide/ec2-auto-scaling-tagging.html) // in the Amazon EC2 Auto Scaling User Guide. CreateOrUpdateTags(ctx context.Context, params *CreateOrUpdateTagsInput, optFns ...func(*Options)) (*CreateOrUpdateTagsOutput, error) // Deletes the specified Auto Scaling group. If the group has instances or scaling @@ -180,9 +180,9 @@ type ASG interface { // Describes the current Amazon EC2 Auto Scaling resource quotas for your account. // When you establish an Amazon Web Services account, the account has initial // quotas on the maximum number of Auto Scaling groups and launch configurations - // that you can create in a given Region. For more information, see Amazon EC2 Auto - // Scaling service quotas - // (https://docs.aws.amazon.com/autoscaling/ec2/userguide/as-account-limits.html) + // that you can create in a given Region. For more information, see Quotas for + // Amazon EC2 Auto Scaling + // (https://docs.aws.amazon.com/autoscaling/ec2/userguide/ec2-auto-scaling-quotas.html) // in the Amazon EC2 Auto Scaling User Guide. DescribeAccountLimits(ctx context.Context, params *DescribeAccountLimitsInput, optFns ...func(*Options)) (*DescribeAccountLimitsOutput, error) // Describes the available adjustment types for step scaling and simple scaling @@ -250,33 +250,34 @@ type ASG interface { DescribeLifecycleHookTypes(ctx context.Context, params *DescribeLifecycleHookTypesInput, optFns ...func(*Options)) (*DescribeLifecycleHookTypesOutput, error) // Gets information about the lifecycle hooks for the specified Auto Scaling group. DescribeLifecycleHooks(ctx context.Context, params *DescribeLifecycleHooksInput, optFns ...func(*Options)) (*DescribeLifecycleHooksOutput, error) - // Gets information about the load balancer target groups for the specified Auto - // Scaling group. To determine the availability of registered instances, use the - // State element in the response. When you attach a target group to an Auto Scaling - // group, the initial State value is Adding. The state transitions to Added after - // all Auto Scaling instances are registered with the target group. If Elastic Load - // Balancing health checks are enabled for the Auto Scaling group, the state - // transitions to InService after at least one Auto Scaling instance passes the - // health check. When the target group is in the InService state, Amazon EC2 Auto - // Scaling can terminate and replace any instances that are reported as unhealthy. - // If no registered instances pass the health checks, the target group doesn't - // enter the InService state. Target groups also have an InService state if you - // attach them in the CreateAutoScalingGroup API call. If your target group state - // is InService, but it is not working properly, check the scaling activities by - // calling DescribeScalingActivities and take any corrective actions necessary. For - // help with failed health checks, see Troubleshooting Amazon EC2 Auto Scaling: + // Gets information about the Elastic Load Balancing target groups for the + // specified Auto Scaling group. To determine the attachment status of the target + // group, use the State element in the response. When you attach a target group to + // an Auto Scaling group, the initial State value is Adding. The state transitions + // to Added after all Auto Scaling instances are registered with the target group. + // If Elastic Load Balancing health checks are enabled for the Auto Scaling group, + // the state transitions to InService after at least one Auto Scaling instance + // passes the health check. When the target group is in the InService state, Amazon + // EC2 Auto Scaling can terminate and replace any instances that are reported as + // unhealthy. If no registered instances pass the health checks, the target group + // doesn't enter the InService state. Target groups also have an InService state if + // you attach them in the CreateAutoScalingGroup API call. If your target group + // state is InService, but it is not working properly, check the scaling activities + // by calling DescribeScalingActivities and take any corrective actions necessary. + // For help with failed health checks, see Troubleshooting Amazon EC2 Auto Scaling: // Health checks // (https://docs.aws.amazon.com/autoscaling/ec2/userguide/ts-as-healthchecks.html) - // in the Amazon EC2 Auto Scaling User Guide. For more information, see Elastic - // Load Balancing and Amazon EC2 Auto Scaling + // in the Amazon EC2 Auto Scaling User Guide. For more information, see Use Elastic + // Load Balancing to distribute traffic across the instances in your Auto Scaling + // group // (https://docs.aws.amazon.com/autoscaling/ec2/userguide/autoscaling-load-balancer.html) // in the Amazon EC2 Auto Scaling User Guide. DescribeLoadBalancerTargetGroups(ctx context.Context, params *DescribeLoadBalancerTargetGroupsInput, optFns ...func(*Options)) (*DescribeLoadBalancerTargetGroupsOutput, error) // Gets information about the load balancers for the specified Auto Scaling group. // This operation describes only Classic Load Balancers. If you have Application - // Load Balancers, Network Load Balancers, or Gateway Load Balancers, use the - // DescribeLoadBalancerTargetGroups API instead. To determine the availability of - // registered instances, use the State element in the response. When you attach a + // Load Balancers, Network Load Balancers, or Gateway Load Balancer, use the + // DescribeLoadBalancerTargetGroups API instead. To determine the attachment status + // of the load balancer, use the State element in the response. When you attach a // load balancer to an Auto Scaling group, the initial State value is Adding. The // state transitions to Added after all Auto Scaling instances are registered with // the load balancer. If Elastic Load Balancing health checks are enabled for the @@ -291,14 +292,13 @@ type ASG interface { // corrective actions necessary. For help with failed health checks, see // Troubleshooting Amazon EC2 Auto Scaling: Health checks // (https://docs.aws.amazon.com/autoscaling/ec2/userguide/ts-as-healthchecks.html) - // in the Amazon EC2 Auto Scaling User Guide. For more information, see Elastic - // Load Balancing and Amazon EC2 Auto Scaling + // in the Amazon EC2 Auto Scaling User Guide. For more information, see Use Elastic + // Load Balancing to distribute traffic across the instances in your Auto Scaling + // group // (https://docs.aws.amazon.com/autoscaling/ec2/userguide/autoscaling-load-balancer.html) // in the Amazon EC2 Auto Scaling User Guide. DescribeLoadBalancers(ctx context.Context, params *DescribeLoadBalancersInput, optFns ...func(*Options)) (*DescribeLoadBalancersOutput, error) - // Describes the available CloudWatch metrics for Amazon EC2 Auto Scaling. The - // GroupStandbyInstances metric is not returned by default. You must explicitly - // request this metric when calling the EnableMetricsCollection API. + // Describes the available CloudWatch metrics for Amazon EC2 Auto Scaling. DescribeMetricCollectionTypes(ctx context.Context, params *DescribeMetricCollectionTypesInput, optFns ...func(*Options)) (*DescribeMetricCollectionTypesOutput, error) // Gets information about the Amazon SNS notifications that are configured for one // or more Auto Scaling groups. @@ -331,14 +331,13 @@ type ASG interface { // specified values for it to be included in the results. You can also specify // multiple filters. The result includes information for a particular tag only if // it matches all the filters. If there's no match, no special message is returned. - // For more information, see Tagging Auto Scaling groups and instances - // (https://docs.aws.amazon.com/autoscaling/ec2/userguide/autoscaling-tagging.html) + // For more information, see Tag Auto Scaling groups and instances + // (https://docs.aws.amazon.com/autoscaling/ec2/userguide/ec2-auto-scaling-tagging.html) // in the Amazon EC2 Auto Scaling User Guide. DescribeTags(ctx context.Context, params *DescribeTagsInput, optFns ...func(*Options)) (*DescribeTagsOutput, error) // Describes the termination policies supported by Amazon EC2 Auto Scaling. For - // more information, see Controlling which Auto Scaling instances terminate during - // scale in - // (https://docs.aws.amazon.com/autoscaling/ec2/userguide/as-instance-termination.html) + // more information, see Work with Amazon EC2 Auto Scaling termination policies + // (https://docs.aws.amazon.com/autoscaling/ec2/userguide/ec2-auto-scaling-termination-policies.html) // in the Amazon EC2 Auto Scaling User Guide. DescribeTerminationPolicyTypes(ctx context.Context, params *DescribeTerminationPolicyTypesInput, optFns ...func(*Options)) (*DescribeTerminationPolicyTypesOutput, error) // Gets information about a warm pool and its instances. For more information, see @@ -358,23 +357,29 @@ type ASG interface { // (https://docs.aws.amazon.com/autoscaling/ec2/userguide/detach-instance-asg.html) // in the Amazon EC2 Auto Scaling User Guide. DetachInstances(ctx context.Context, params *DetachInstancesInput, optFns ...func(*Options)) (*DetachInstancesOutput, error) - // Detaches one or more target groups from the specified Auto Scaling group. + // Detaches one or more target groups from the specified Auto Scaling group. When + // you detach a target group, it enters the Removing state while deregistering the + // instances in the group. When all instances are deregistered, then you can no + // longer describe the target group using the DescribeLoadBalancerTargetGroups API + // call. The instances remain running. DetachLoadBalancerTargetGroups(ctx context.Context, params *DetachLoadBalancerTargetGroupsInput, optFns ...func(*Options)) (*DetachLoadBalancerTargetGroupsOutput, error) // Detaches one or more Classic Load Balancers from the specified Auto Scaling // group. This operation detaches only Classic Load Balancers. If you have - // Application Load Balancers, Network Load Balancers, or Gateway Load Balancers, + // Application Load Balancers, Network Load Balancers, or Gateway Load Balancer, // use the DetachLoadBalancerTargetGroups API instead. When you detach a load // balancer, it enters the Removing state while deregistering the instances in the // group. When all instances are deregistered, then you can no longer describe the // load balancer using the DescribeLoadBalancers API call. The instances remain // running. DetachLoadBalancers(ctx context.Context, params *DetachLoadBalancersInput, optFns ...func(*Options)) (*DetachLoadBalancersOutput, error) - // Disables group metrics for the specified Auto Scaling group. + // Disables group metrics collection for the specified Auto Scaling group. DisableMetricsCollection(ctx context.Context, params *DisableMetricsCollectionInput, optFns ...func(*Options)) (*DisableMetricsCollectionOutput, error) - // Enables group metrics for the specified Auto Scaling group. For more - // information, see Monitoring CloudWatch metrics for your Auto Scaling groups and - // instances - // (https://docs.aws.amazon.com/autoscaling/ec2/userguide/as-instance-monitoring.html) + // Enables group metrics collection for the specified Auto Scaling group. You can + // use these metrics to track changes in an Auto Scaling group and to set alarms on + // threshold values. You can view group metrics using the Amazon EC2 Auto Scaling + // console or the CloudWatch console. For more information, see Monitor CloudWatch + // metrics for your Auto Scaling groups and instances + // (https://docs.aws.amazon.com/autoscaling/ec2/userguide/ec2-auto-scaling-cloudwatch-monitoring.html) // in the Amazon EC2 Auto Scaling User Guide. EnableMetricsCollection(ctx context.Context, params *EnableMetricsCollectionInput, optFns ...func(*Options)) (*EnableMetricsCollectionOutput, error) // Moves the specified instances into the standby state. If you choose to decrement @@ -477,7 +482,8 @@ type ASG interface { // the Amazon EC2 Auto Scaling User Guide. You can view the scheduled actions for // an Auto Scaling group using the DescribeScheduledActions API call. If you are no // longer using a scheduled action, you can delete it by calling the - // DeleteScheduledAction API. + // DeleteScheduledAction API. If you try to schedule your action in the past, + // Amazon EC2 Auto Scaling returns an error message. PutScheduledUpdateGroupAction(ctx context.Context, params *PutScheduledUpdateGroupActionInput, optFns ...func(*Options)) (*PutScheduledUpdateGroupActionOutput, error) // Creates or updates a warm pool for the specified Auto Scaling group. A warm pool // is a pool of pre-initialized EC2 instances that sits alongside the Auto Scaling @@ -594,8 +600,8 @@ type ASG interface { // We strongly recommend that all Auto Scaling groups use launch templates to // ensure full functionality for Amazon EC2 Auto Scaling and Amazon EC2. Updates // the configuration for the specified Auto Scaling group. To update an Auto - // Scaling group, specify the name of the group and the parameter that you want to - // change. Any parameters that you don't specify are not changed by this update + // Scaling group, specify the name of the group and the property that you want to + // change. Any properties that you don't specify are not changed by this update // request. The new settings take effect on any scaling activities after this call // returns. If you associate a new launch configuration or template with an Auto // Scaling group, all new instances will get the updated configuration. Existing @@ -625,7 +631,7 @@ type ASG interface { // and the new MaxSize is smaller than the current size of the group, this sets the // group's DesiredCapacity to the new MaxSize value. // - // To see which parameters have + // To see which properties have // been set, call the DescribeAutoScalingGroups API. To view the scaling policies // for an Auto Scaling group, call the DescribePolicies API. If the group has // scaling policies, you can update them by calling the PutScalingPolicy API. diff --git a/pkg/awsapi/cloudformation.go b/pkg/awsapi/cloudformation.go index c09fbdf2b7..f3c7839b13 100644 --- a/pkg/awsapi/cloudformation.go +++ b/pkg/awsapi/cloudformation.go @@ -96,8 +96,8 @@ type CloudFormation interface { // Deletes stack instances for the specified accounts, in the specified Amazon Web // Services Regions. DeleteStackInstances(ctx context.Context, params *DeleteStackInstancesInput, optFns ...func(*Options)) (*DeleteStackInstancesOutput, error) - // Deletes a stack set. Before you can delete a stack set, all of its member stack - // instances must be deleted. For more information about how to do this, see + // Deletes a stack set. Before you can delete a stack set, all its member stack + // instances must be deleted. For more information about how to complete this, see // DeleteStackInstances. DeleteStackSet(ctx context.Context, params *DeleteStackSetInput, optFns ...func(*Options)) (*DeleteStackSetOutput, error) // Marks an extension or extension version as DEPRECATED in the CloudFormation @@ -131,7 +131,7 @@ type CloudFormation interface { // Returns information about a CloudFormation extension publisher. If you don't // supply a PublisherId, and you have registered as an extension publisher, // DescribePublisher returns information about your own publisher account. For more - // information on registering as a publisher, see: + // information about registering as a publisher, see: // // * RegisterPublisher // (https://docs.aws.amazon.com/AWSCloudFormation/latest/APIReference/API_RegisterPublisher.html) @@ -145,7 +145,7 @@ type CloudFormation interface { // detection operation detects whether a stack's actual configuration differs, or // has drifted, from it's expected configuration, as defined in the stack template // and any values specified as template parameters. A stack is considered to have - // drifted if one or more of its resources have drifted. For more information on + // drifted if one or more of its resources have drifted. For more information about // stack and resource drift, see Detecting Unregulated Configuration Changes to // Stacks and Resources // (https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/using-cfn-stack-drift.html). @@ -280,7 +280,7 @@ type CloudFormation interface { // detailed information about a specific stack instance, including its drift status // and last drift time checked. // - // For more information on performing a drift + // For more information about performing a drift // detection operation on a stack set, see Detecting unmanaged changes in stack // sets // (https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/stacksets-drift.html). @@ -388,7 +388,7 @@ type CloudFormation interface { ListTypes(ctx context.Context, params *ListTypesInput, optFns ...func(*Options)) (*ListTypesOutput, error) // Publishes the specified extension to the CloudFormation registry as a public // extension in this region. Public extensions are available for use by all - // CloudFormation users. For more information on publishing extensions, see + // CloudFormation users. For more information about publishing extensions, see // Publishing extensions to make them available for public use // (https://docs.aws.amazon.com/cloudformation-cli/latest/userguide/publish-extension.html) // in the CloudFormation CLI User Guide. To publish an extension, you must be @@ -404,8 +404,8 @@ type CloudFormation interface { // Registers your account as a publisher of public extensions in the CloudFormation // registry. Public extensions are available for use by all CloudFormation users. // This publisher ID applies to your account in all Amazon Web Services Regions. - // For information on requirements for registering as a public extension publisher, - // see Registering your account to publish CloudFormation extensions + // For information about requirements for registering as a public extension + // publisher, see Registering your account to publish CloudFormation extensions // (https://docs.aws.amazon.com/cloudformation-cli/latest/userguide/publish-extension.html#publish-extension-prereqs) // in the CloudFormation CLI User Guide. RegisterPublisher(ctx context.Context, params *RegisterPublisherInput, optFns ...func(*Options)) (*RegisterPublisherOutput, error) @@ -421,9 +421,9 @@ type CloudFormation interface { // * // Making the extension available for use in your account. // - // For more information on - // how to develop extensions and ready them for registration, see Creating Resource - // Providers + // For more information + // about how to develop extensions and ready them for registration, see Creating + // Resource Providers // (https://docs.aws.amazon.com/cloudformation-cli/latest/userguide/resource-types.html) // in the CloudFormation CLI User Guide. You can have a maximum of 50 resource // extension versions registered at a time. This maximum is per account and per diff --git a/pkg/awsapi/cloudwatchlogs.go b/pkg/awsapi/cloudwatchlogs.go index 37908cecf2..dc094a7c19 100644 --- a/pkg/awsapi/cloudwatchlogs.go +++ b/pkg/awsapi/cloudwatchlogs.go @@ -30,10 +30,13 @@ type CloudWatchLogs interface { // Creates an export task, which allows you to efficiently export data from a log // group to an Amazon S3 bucket. When you perform a CreateExportTask operation, you // must use credentials that have permission to write to the S3 bucket that you - // specify as the destination. This is an asynchronous call. If all the required - // information is provided, this operation initiates an export task and responds - // with the ID of the task. After the task has started, you can use - // DescribeExportTasks + // specify as the destination. Exporting log data to Amazon S3 buckets that are + // encrypted by KMS is not supported. Exporting log data to Amazon S3 buckets that + // have S3 Object Lock enabled with a retention period is not supported. Exporting + // to S3 buckets that are encrypted with AES-256 is supported. This is an + // asynchronous call. If all the required information is provided, this operation + // initiates an export task and responds with the ID of the task. After the task + // has started, you can use DescribeExportTasks // (https://docs.aws.amazon.com/AmazonCloudWatchLogs/latest/APIReference/API_DescribeExportTasks.html) // to get the status of the export task. Each account can only have one active // (RUNNING or PENDING) export task at a time. To cancel an export task, use @@ -42,8 +45,8 @@ type CloudWatchLogs interface { // You can export logs from multiple log groups or multiple time ranges to the same // S3 bucket. To separate out log data for each export task, you can specify a // prefix to be used as the Amazon S3 key prefix for all exported objects. - // Exporting to S3 buckets that are encrypted with AES-256 is supported. Exporting - // to S3 buckets encrypted with SSE-KMS is not supported. + // Time-based sorting on chunks of log data inside an exported file is not + // guaranteed. You can sort the exported log fild data by using Linux utilities. CreateExportTask(ctx context.Context, params *CreateExportTaskInput, optFns ...func(*Options)) (*CreateExportTaskOutput, error) // Creates a log group with the specified name. You can create up to 20,000 log // groups per account. You must use the following guidelines when naming a log diff --git a/pkg/awsapi/elasticloadbalancingv2.go b/pkg/awsapi/elasticloadbalancingv2.go index 3974005c7b..de94fb053e 100644 --- a/pkg/awsapi/elasticloadbalancingv2.go +++ b/pkg/awsapi/elasticloadbalancingv2.go @@ -215,7 +215,9 @@ type ELBV2 interface { // action. ModifyRule(ctx context.Context, params *ModifyRuleInput, optFns ...func(*Options)) (*ModifyRuleOutput, error) // Modifies the health checks used when evaluating the health state of the targets - // in the specified target group. + // in the specified target group. If the protocol of the target group is TCP, TLS, + // UDP, or TCP_UDP, you can't modify the health check protocol, interval, timeout, + // or success codes. ModifyTargetGroup(ctx context.Context, params *ModifyTargetGroupInput, optFns ...func(*Options)) (*ModifyTargetGroupOutput, error) // Modifies the specified attributes of the specified target group. ModifyTargetGroupAttributes(ctx context.Context, params *ModifyTargetGroupAttributesInput, optFns ...func(*Options)) (*ModifyTargetGroupAttributesOutput, error) diff --git a/pkg/awsapi/iam.go b/pkg/awsapi/iam.go index 736e0f0bc8..776650d09d 100644 --- a/pkg/awsapi/iam.go +++ b/pkg/awsapi/iam.go @@ -944,14 +944,15 @@ type IAM interface { // Returns information about the access key IDs associated with the specified IAM // user. If there is none, the operation returns an empty list. Although each user // is limited to a small number of keys, you can still paginate the results using - // the MaxItems and Marker parameters. If the UserName field is not specified, the - // user name is determined implicitly based on the Amazon Web Services access key - // ID used to sign the request. This operation works for access keys under the - // Amazon Web Services account. Consequently, you can use this operation to manage - // Amazon Web Services account root user credentials even if the Amazon Web - // Services account has no associated users. To ensure the security of your Amazon - // Web Services account, the secret access key is accessible only during key and - // user creation. + // the MaxItems and Marker parameters. If the UserName is not specified, the user + // name is determined implicitly based on the Amazon Web Services access key ID + // used to sign the request. If a temporary access key is used, then UserName is + // required. If a long-term key is assigned to the user, then UserName is not + // required. This operation works for access keys under the Amazon Web Services + // account. Consequently, you can use this operation to manage Amazon Web Services + // account root user credentials even if the Amazon Web Services account has no + // associated users. To ensure the security of your Amazon Web Services account, + // the secret access key is accessible only during key and user creation. ListAccessKeys(ctx context.Context, params *ListAccessKeysInput, optFns ...func(*Options)) (*ListAccessKeysOutput, error) // Lists the account alias associated with the Amazon Web Services account (Note: // you can have only one). For information about using an Amazon Web Services @@ -1736,11 +1737,12 @@ type IAM interface { // versa. This operation can be used to disable a user's key as part of a key // rotation workflow. If the UserName is not specified, the user name is determined // implicitly based on the Amazon Web Services access key ID used to sign the - // request. This operation works for access keys under the Amazon Web Services - // account. Consequently, you can use this operation to manage Amazon Web Services - // account root user credentials even if the Amazon Web Services account has no - // associated users. For information about rotating keys, see Managing keys and - // certificates + // request. If a temporary access key is used, then UserName is required. If a + // long-term key is assigned to the user, then UserName is not required. This + // operation works for access keys under the Amazon Web Services account. + // Consequently, you can use this operation to manage Amazon Web Services account + // root user credentials even if the Amazon Web Services account has no associated + // users. For information about rotating keys, see Managing keys and certificates // (https://docs.aws.amazon.com/IAM/latest/UserGuide/ManagingCredentials.html) in // the IAM User Guide. UpdateAccessKey(ctx context.Context, params *UpdateAccessKeyInput, optFns ...func(*Options)) (*UpdateAccessKeyOutput, error) diff --git a/pkg/awsapi/ssm.go b/pkg/awsapi/ssm.go index c050c96ef0..4003bce23f 100644 --- a/pkg/awsapi/ssm.go +++ b/pkg/awsapi/ssm.go @@ -583,7 +583,7 @@ type SSM interface { // example, approved for patches, or Failed for associations. // // * Severity: A patch - // severity. For example, critical. + // severity. For example, Critical. // // * DocumentName: An SSM document name. For // example, AWS-RunPatchBaseline. diff --git a/pkg/awsapi/sts.go b/pkg/awsapi/sts.go index 50b512bd40..9ca81f40b7 100644 --- a/pkg/awsapi/sts.go +++ b/pkg/awsapi/sts.go @@ -501,6 +501,11 @@ type STS interface { // (https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_request.html) // and Comparing the Amazon Web Services STS API operations // (https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_request.html#stsapi_comparison) + // in the IAM User Guide. No permissions are required for users to perform this + // operation. The purpose of the sts:GetSessionToken operation is to authenticate + // the user using MFA. You cannot use policies to control authentication + // operations. For more information, see Permissions for GetSessionToken + // (https://docs.aws.amazon.com/IAM/latest/UserGuide/id_credentials_temp_control-access_getsessiontoken.html) // in the IAM User Guide. Session Duration The GetSessionToken operation must be // called by using the long-term Amazon Web Services security credentials of the // Amazon Web Services account root user or an IAM user. Credentials that are From 131e1429cca7b1c55ab4ea1e60e08b18f9b9b7cf Mon Sep 17 00:00:00 2001 From: Himangini Date: Wed, 7 Sep 2022 19:38:26 +0100 Subject: [PATCH 2/5] increased timeouts in test-dns.yaml --- integration/data/test-dns.yaml | 70 +++++++++++++++++----------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/integration/data/test-dns.yaml b/integration/data/test-dns.yaml index 53e6a2f432..bfeda8b01e 100644 --- a/integration/data/test-dns.yaml +++ b/integration/data/test-dns.yaml @@ -16,10 +16,10 @@ spec: stdin: true tty: true readinessProbe: - initialDelaySeconds: 0 - periodSeconds: 3 - failureThreshold: 10 - timeoutSeconds: 1 + initialDelaySeconds: 15 + periodSeconds: 5 + failureThreshold: 15 + timeoutSeconds: 15 exec: command: - nslookup @@ -29,10 +29,10 @@ spec: stdin: true tty: true readinessProbe: - initialDelaySeconds: 0 - periodSeconds: 3 - failureThreshold: 10 - timeoutSeconds: 1 + initialDelaySeconds: 15 + periodSeconds: 5 + failureThreshold: 15 + timeoutSeconds: 15 exec: command: - nslookup @@ -42,10 +42,10 @@ spec: stdin: true tty: true readinessProbe: - initialDelaySeconds: 0 - periodSeconds: 3 - failureThreshold: 10 - timeoutSeconds: 1 + initialDelaySeconds: 15 + periodSeconds: 5 + failureThreshold: 15 + timeoutSeconds: 15 exec: command: - nslookup @@ -55,10 +55,10 @@ spec: stdin: true tty: true readinessProbe: - initialDelaySeconds: 0 - periodSeconds: 3 - failureThreshold: 10 - timeoutSeconds: 1 + initialDelaySeconds: 15 + periodSeconds: 5 + failureThreshold: 15 + timeoutSeconds: 15 exec: command: - nslookup @@ -68,10 +68,10 @@ spec: stdin: true tty: true readinessProbe: - initialDelaySeconds: 0 - periodSeconds: 3 - failureThreshold: 10 - timeoutSeconds: 1 + initialDelaySeconds: 15 + periodSeconds: 5 + failureThreshold: 15 + timeoutSeconds: 15 exec: command: - nslookup @@ -81,10 +81,10 @@ spec: stdin: true tty: true readinessProbe: - initialDelaySeconds: 0 - periodSeconds: 3 - failureThreshold: 10 - timeoutSeconds: 1 + initialDelaySeconds: 15 + periodSeconds: 5 + failureThreshold: 15 + timeoutSeconds: 15 exec: command: - nslookup @@ -94,10 +94,10 @@ spec: stdin: true tty: true readinessProbe: - initialDelaySeconds: 0 - periodSeconds: 3 - failureThreshold: 10 - timeoutSeconds: 1 + initialDelaySeconds: 15 + periodSeconds: 5 + failureThreshold: 15 + timeoutSeconds: 15 exec: command: - nslookup @@ -107,10 +107,10 @@ spec: stdin: true tty: true readinessProbe: - initialDelaySeconds: 0 - periodSeconds: 3 + initialDelaySeconds: 10 + periodSeconds: 5 failureThreshold: 10 - timeoutSeconds: 1 + timeoutSeconds: 10 exec: command: - nslookup @@ -120,10 +120,10 @@ spec: stdin: true tty: true readinessProbe: - initialDelaySeconds: 0 - periodSeconds: 3 - failureThreshold: 10 - timeoutSeconds: 1 + initialDelaySeconds: 15 + periodSeconds: 5 + failureThreshold: 15 + timeoutSeconds: 15 exec: command: - nslookup From 1211cbb98766c37ea441d1d0f9331b63f5c56cf4 Mon Sep 17 00:00:00 2001 From: Himangini Date: Wed, 14 Sep 2022 00:04:02 +0100 Subject: [PATCH 3/5] actually fix the test - added new instance type and rearranged the tests --- integration/data/test-dns.yaml | 72 ++-- .../tests/managed/managed_nodegroup_test.go | 381 ++++++++++-------- 2 files changed, 240 insertions(+), 213 deletions(-) diff --git a/integration/data/test-dns.yaml b/integration/data/test-dns.yaml index bfeda8b01e..2178f8e287 100644 --- a/integration/data/test-dns.yaml +++ b/integration/data/test-dns.yaml @@ -16,10 +16,10 @@ spec: stdin: true tty: true readinessProbe: - initialDelaySeconds: 15 - periodSeconds: 5 - failureThreshold: 15 - timeoutSeconds: 15 + initialDelaySeconds: 0 + periodSeconds: 3 + failureThreshold: 3 + timeoutSeconds: 1 exec: command: - nslookup @@ -29,10 +29,10 @@ spec: stdin: true tty: true readinessProbe: - initialDelaySeconds: 15 - periodSeconds: 5 - failureThreshold: 15 - timeoutSeconds: 15 + initialDelaySeconds: 0 + periodSeconds: 3 + failureThreshold: 3 + timeoutSeconds: 1 exec: command: - nslookup @@ -42,10 +42,10 @@ spec: stdin: true tty: true readinessProbe: - initialDelaySeconds: 15 - periodSeconds: 5 - failureThreshold: 15 - timeoutSeconds: 15 + initialDelaySeconds: 0 + periodSeconds: 3 + failureThreshold: 3 + timeoutSeconds: 1 exec: command: - nslookup @@ -55,10 +55,10 @@ spec: stdin: true tty: true readinessProbe: - initialDelaySeconds: 15 - periodSeconds: 5 - failureThreshold: 15 - timeoutSeconds: 15 + initialDelaySeconds: 0 + periodSeconds: 3 + failureThreshold: 3 + timeoutSeconds: 1 exec: command: - nslookup @@ -68,10 +68,10 @@ spec: stdin: true tty: true readinessProbe: - initialDelaySeconds: 15 - periodSeconds: 5 - failureThreshold: 15 - timeoutSeconds: 15 + initialDelaySeconds: 0 + periodSeconds: 3 + failureThreshold: 3 + timeoutSeconds: 1 exec: command: - nslookup @@ -81,10 +81,10 @@ spec: stdin: true tty: true readinessProbe: - initialDelaySeconds: 15 - periodSeconds: 5 - failureThreshold: 15 - timeoutSeconds: 15 + initialDelaySeconds: 0 + periodSeconds: 3 + failureThreshold: 3 + timeoutSeconds: 1 exec: command: - nslookup @@ -94,10 +94,10 @@ spec: stdin: true tty: true readinessProbe: - initialDelaySeconds: 15 - periodSeconds: 5 - failureThreshold: 15 - timeoutSeconds: 15 + initialDelaySeconds: 0 + periodSeconds: 3 + failureThreshold: 3 + timeoutSeconds: 1 exec: command: - nslookup @@ -107,10 +107,10 @@ spec: stdin: true tty: true readinessProbe: - initialDelaySeconds: 10 - periodSeconds: 5 - failureThreshold: 10 - timeoutSeconds: 10 + initialDelaySeconds: 0 + periodSeconds: 3 + failureThreshold: 3 + timeoutSeconds: 1 exec: command: - nslookup @@ -120,10 +120,10 @@ spec: stdin: true tty: true readinessProbe: - initialDelaySeconds: 15 - periodSeconds: 5 - failureThreshold: 15 - timeoutSeconds: 15 + initialDelaySeconds: 0 + periodSeconds: 3 + failureThreshold: 3 + timeoutSeconds: 1 exec: command: - nslookup diff --git a/integration/tests/managed/managed_nodegroup_test.go b/integration/tests/managed/managed_nodegroup_test.go index 1a3c309180..9409e15ed4 100644 --- a/integration/tests/managed/managed_nodegroup_test.go +++ b/integration/tests/managed/managed_nodegroup_test.go @@ -71,6 +71,7 @@ var _ = BeforeSuite(func() { "--nodegroup-name", initialAl2Nodegroup, "--node-labels", "ng-name="+initialAl2Nodegroup, "--nodes", "2", + "--instance-types", "t3a.xlarge", "--version", params.Version, "--kubeconfig", params.KubeconfigPath, ) @@ -94,7 +95,7 @@ var _ = Describe("(Integration) Create Managed Nodegroups", func() { return clusterConfig } - defaultTimeout := 30 * time.Minute + defaultTimeout := 20 * time.Minute type managedCLIEntry struct { createArgs []string @@ -161,135 +162,6 @@ var _ = Describe("(Integration) Create Managed Nodegroups", func() { ) Context("cluster with 1 al2 managed nodegroup", func() { - It("supports adding bottlerocket and ubuntu nodegroups with additional volumes", func() { - clusterConfig := makeClusterConfig() - clusterConfig.ManagedNodeGroups = []*api.ManagedNodeGroup{ - { - NodeGroupBase: &api.NodeGroupBase{ - Name: bottlerocketNodegroup, - VolumeSize: aws.Int(35), - AMIFamily: "Bottlerocket", - Bottlerocket: &api.NodeGroupBottlerocket{ - EnableAdminContainer: api.Enabled(), - Settings: &api.InlineDocument{ - "motd": "Bottlerocket is the future", - "network": map[string]string{ - "hostname": "custom-bottlerocket-host", - }, - }, - }, - AdditionalVolumes: []*api.VolumeMapping{ - { - VolumeName: aws.String("/dev/sdb"), - }, - }, - }, - Taints: []api.NodeGroupTaint{ - { - Key: "key2", - Value: "value2", - Effect: "PreferNoSchedule", - }, - }, - }, - { - NodeGroupBase: &api.NodeGroupBase{ - Name: ubuntuNodegroup, - VolumeSize: aws.Int(25), - AMIFamily: "Ubuntu2004", - }, - }, - } - - cmd := params.EksctlCreateCmd. - WithArgs( - "nodegroup", - "--config-file", "-", - "--verbose", "4", - ). - WithoutArg("--region", params.Region). - WithStdin(clusterutils.Reader(clusterConfig)) - - Expect(cmd).To(RunSuccessfully()) - - tests.AssertNodeVolumes(params.KubeconfigPath, params.Region, bottlerocketNodegroup, "/dev/sdb") - - By("correctly configuring the bottlerocket nodegroup") - kubeTest, err := kube.NewTest(params.KubeconfigPath) - Expect(err).NotTo(HaveOccurred()) - - nodeList := kubeTest.ListNodes(metav1.ListOptions{ - LabelSelector: fmt.Sprintf("%s=%s", "eks.amazonaws.com/nodegroup", bottlerocketNodegroup), - }) - Expect(nodeList.Items).NotTo(BeEmpty()) - for _, node := range nodeList.Items { - Expect(node.Status.NodeInfo.OSImage).To(ContainSubstring("Bottlerocket")) - Expect(node.Labels["kubernetes.io/hostname"]).To(Equal("custom-bottlerocket-host")) - } - kubeTest.Close() - }) - - It("should have created an EKS cluster and 4 CloudFormation stacks", func() { - awsSession := NewConfig(params.Region) - - Expect(awsSession).To(HaveExistingCluster(params.ClusterName, string(ekstypes.ClusterStatusActive), params.Version)) - - Expect(awsSession).To(HaveExistingStack(fmt.Sprintf("eksctl-%s-cluster", params.ClusterName))) - Expect(awsSession).To(HaveExistingStack(fmt.Sprintf("eksctl-%s-nodegroup-%s", params.ClusterName, initialAl2Nodegroup))) - Expect(awsSession).To(HaveExistingStack(fmt.Sprintf("eksctl-%s-nodegroup-%s", params.ClusterName, bottlerocketNodegroup))) - Expect(awsSession).To(HaveExistingStack(fmt.Sprintf("eksctl-%s-nodegroup-%s", params.ClusterName, ubuntuNodegroup))) - }) - - It("should have created a valid kubectl config file", func() { - config, err := clientcmd.LoadFromFile(params.KubeconfigPath) - Expect(err).ShouldNot(HaveOccurred()) - - err = clientcmd.ConfirmUsable(*config, "") - Expect(err).ShouldNot(HaveOccurred()) - - Expect(config.CurrentContext).To(ContainSubstring("eksctl")) - Expect(config.CurrentContext).To(ContainSubstring(params.ClusterName)) - Expect(config.CurrentContext).To(ContainSubstring(params.Region)) - }) - - Context("and listing clusters", func() { - It("should return the previously created cluster", func() { - cmd := params.EksctlGetCmd.WithArgs("clusters", "--all-regions") - Expect(cmd).To(RunSuccessfullyWithOutputString(ContainSubstring(params.ClusterName))) - }) - }) - - Context("and checking the nodegroup health", func() { - It("should return healthy", func() { - checkNg := func(ngName string) { - cmd := params.EksctlUtilsCmd.WithArgs( - "nodegroup-health", - "--cluster", params.ClusterName, - "--name", ngName, - ) - - Expect(cmd).To(RunSuccessfullyWithOutputString(ContainSubstring("active"))) - } - - checkNg(initialAl2Nodegroup) - checkNg(bottlerocketNodegroup) - checkNg(ubuntuNodegroup) - }) - }) - - Context("and scale the initial nodegroup", func() { - It("should not return an error", func() { - cmd := params.EksctlScaleNodeGroupCmd.WithArgs( - "--cluster", params.ClusterName, - "--nodes-min", "2", - "--nodes", "3", - "--nodes-max", "4", - "--name", initialAl2Nodegroup, - ) - Expect(cmd).To(RunSuccessfully()) - }) - }) - Context("and add two managed nodegroups (one public and one private)", func() { It("should not return an error for public node group", func() { cmd := params.EksctlCreateCmd.WithArgs( @@ -297,6 +169,7 @@ var _ = Describe("(Integration) Create Managed Nodegroups", func() { "--cluster", params.ClusterName, "--nodes", "4", "--managed", + "--instance-types", "t3a.xlarge", newPublicNodeGroup, ) Expect(cmd).To(RunSuccessfully()) @@ -308,6 +181,7 @@ var _ = Describe("(Integration) Create Managed Nodegroups", func() { "--cluster", params.ClusterName, "--nodes", "2", "--managed", + "--instance-types", "t3a.xlarge", "--node-private-networking", newPrivateNodeGroup, ) @@ -401,52 +275,6 @@ var _ = Describe("(Integration) Create Managed Nodegroups", func() { }) }) - Context("and upgrading a nodegroup", func() { - It("should upgrade to the next Kubernetes version", func() { - By("updating the control plane version") - cmd := params.EksctlUpgradeCmd. - WithArgs( - "cluster", - "--verbose", "4", - "--name", params.ClusterName, - "--approve", - ) - Expect(cmd).To(RunSuccessfully()) - - var nextVersion string - { - supportedVersions := api.SupportedVersions() - nextVersion = supportedVersions[len(supportedVersions)-1] - } - By(fmt.Sprintf("checking that control plane is updated to %v", nextVersion)) - config, err := clientcmd.BuildConfigFromFlags("", params.KubeconfigPath) - Expect(err).NotTo(HaveOccurred()) - - clientset, err := kubernetes.NewForConfig(config) - Expect(err).NotTo(HaveOccurred()) - Eventually(func() string { - serverVersion, err := clientset.ServerVersion() - Expect(err).NotTo(HaveOccurred()) - return fmt.Sprintf("%s.%s", serverVersion.Major, strings.TrimSuffix(serverVersion.Minor, "+")) - }, k8sUpdatePollTimeout, k8sUpdatePollInterval).Should(Equal(nextVersion)) - - upgradeNg := func(ngName string) { - By(fmt.Sprintf("upgrading nodegroup %s to Kubernetes version %s", ngName, nextVersion)) - cmd = params.EksctlUpgradeCmd.WithArgs( - "nodegroup", - "--verbose", "4", - "--cluster", params.ClusterName, - "--name", ngName, - "--kubernetes-version", nextVersion, - ) - ExpectWithOffset(1, cmd).To(RunSuccessfullyWithOutputString(ContainSubstring("nodegroup successfully upgraded"))) - } - - upgradeNg(initialAl2Nodegroup) - upgradeNg(bottlerocketNodegroup) - }) - }) - Context("and creating a nodegroup with taints", func() { It("should create nodegroups with taints applied", func() { taints := []api.NodeGroupTaint{ @@ -504,6 +332,147 @@ var _ = Describe("(Integration) Create Managed Nodegroups", func() { tests.AssertNodeTaints(tests.ListNodes(clientset, "taints"), mapTaints(taints)) }) + + // clean up + It("should not return an error when deleting nodegroups with taints applied", func() { + cmd := params.EksctlDeleteCmd.WithArgs( + "nodegroup", + "--verbose", "4", + "--cluster", params.ClusterName, + "taints", + ) + Expect(cmd).To(RunSuccessfully()) + }) + }) + + It("supports adding bottlerocket and ubuntu nodegroups with additional volumes", func() { + clusterConfig := makeClusterConfig() + clusterConfig.ManagedNodeGroups = []*api.ManagedNodeGroup{ + { + NodeGroupBase: &api.NodeGroupBase{ + Name: bottlerocketNodegroup, + VolumeSize: aws.Int(35), + AMIFamily: "Bottlerocket", + InstanceType: "t3a.xlarge", + Bottlerocket: &api.NodeGroupBottlerocket{ + EnableAdminContainer: api.Enabled(), + Settings: &api.InlineDocument{ + "motd": "Bottlerocket is the future", + "network": map[string]string{ + "hostname": "custom-bottlerocket-host", + }, + }, + }, + AdditionalVolumes: []*api.VolumeMapping{ + { + VolumeName: aws.String("/dev/sdb"), + }, + }, + }, + Taints: []api.NodeGroupTaint{ + { + Key: "key2", + Value: "value2", + Effect: "PreferNoSchedule", + }, + }, + }, + { + NodeGroupBase: &api.NodeGroupBase{ + Name: ubuntuNodegroup, + VolumeSize: aws.Int(25), + AMIFamily: "Ubuntu2004", + }, + }, + } + + cmd := params.EksctlCreateCmd. + WithArgs( + "nodegroup", + "--config-file", "-", + "--verbose", "4", + ). + WithoutArg("--region", params.Region). + WithStdin(clusterutils.Reader(clusterConfig)) + + Expect(cmd).To(RunSuccessfully()) + + tests.AssertNodeVolumes(params.KubeconfigPath, params.Region, bottlerocketNodegroup, "/dev/sdb") + + By("correctly configuring the bottlerocket nodegroup") + kubeTest, err := kube.NewTest(params.KubeconfigPath) + Expect(err).NotTo(HaveOccurred()) + + nodeList := kubeTest.ListNodes(metav1.ListOptions{ + LabelSelector: fmt.Sprintf("%s=%s", "eks.amazonaws.com/nodegroup", bottlerocketNodegroup), + }) + Expect(nodeList.Items).NotTo(BeEmpty()) + for _, node := range nodeList.Items { + Expect(node.Status.NodeInfo.OSImage).To(ContainSubstring("Bottlerocket")) + Expect(node.Labels["kubernetes.io/hostname"]).To(Equal("custom-bottlerocket-host")) + } + kubeTest.Close() + }) + + It("should have created an EKS cluster and 4 CloudFormation stacks", func() { + awsSession := NewConfig(params.Region) + + Expect(awsSession).To(HaveExistingCluster(params.ClusterName, string(ekstypes.ClusterStatusActive), params.Version)) + + Expect(awsSession).To(HaveExistingStack(fmt.Sprintf("eksctl-%s-cluster", params.ClusterName))) + Expect(awsSession).To(HaveExistingStack(fmt.Sprintf("eksctl-%s-nodegroup-%s", params.ClusterName, initialAl2Nodegroup))) + Expect(awsSession).To(HaveExistingStack(fmt.Sprintf("eksctl-%s-nodegroup-%s", params.ClusterName, bottlerocketNodegroup))) + Expect(awsSession).To(HaveExistingStack(fmt.Sprintf("eksctl-%s-nodegroup-%s", params.ClusterName, ubuntuNodegroup))) + }) + + It("should have created a valid kubectl config file", func() { + config, err := clientcmd.LoadFromFile(params.KubeconfigPath) + Expect(err).ShouldNot(HaveOccurred()) + + err = clientcmd.ConfirmUsable(*config, "") + Expect(err).ShouldNot(HaveOccurred()) + + Expect(config.CurrentContext).To(ContainSubstring("eksctl")) + Expect(config.CurrentContext).To(ContainSubstring(params.ClusterName)) + Expect(config.CurrentContext).To(ContainSubstring(params.Region)) + }) + + Context("and listing clusters", func() { + It("should return the previously created cluster", func() { + cmd := params.EksctlGetCmd.WithArgs("clusters", "--all-regions") + Expect(cmd).To(RunSuccessfullyWithOutputString(ContainSubstring(params.ClusterName))) + }) + }) + + Context("and checking the nodegroup health", func() { + It("should return healthy", func() { + checkNg := func(ngName string) { + cmd := params.EksctlUtilsCmd.WithArgs( + "nodegroup-health", + "--cluster", params.ClusterName, + "--name", ngName, + ) + + Expect(cmd).To(RunSuccessfullyWithOutputString(ContainSubstring("active"))) + } + + checkNg(initialAl2Nodegroup) + checkNg(bottlerocketNodegroup) + checkNg(ubuntuNodegroup) + }) + }) + + Context("and scale the initial nodegroup", func() { + It("should not return an error", func() { + cmd := params.EksctlScaleNodeGroupCmd.WithArgs( + "--cluster", params.ClusterName, + "--nodes-min", "2", + "--nodes", "3", + "--nodes-max", "4", + "--name", initialAl2Nodegroup, + ) + Expect(cmd).To(RunSuccessfully()) + }) }) Context("and creating a nodegroup with an update config", func() { @@ -568,6 +537,64 @@ var _ = Describe("(Integration) Create Managed Nodegroups", func() { Expect(err).NotTo(HaveOccurred()) Eventually(out.Nodegroup.UpdateConfig.MaxUnavailable).Should(Equal(aws.Int32(1))) }) + + // clean up + It("should not return an error when deleting nodegroup with an update config", func() { + cmd := params.EksctlDeleteCmd.WithArgs( + "nodegroup", + "--verbose", "4", + "--cluster", params.ClusterName, + "update-config-ng", + ) + Expect(cmd).To(RunSuccessfully()) + }) + }) + + Context("and upgrading a nodegroup", func() { + It("should upgrade to the next Kubernetes version", func() { + By("updating the control plane version") + cmd := params.EksctlUpgradeCmd. + WithArgs( + "cluster", + "--verbose", "4", + "--name", params.ClusterName, + "--approve", + ) + Expect(cmd).To(RunSuccessfully()) + + var nextVersion string + { + supportedVersions := api.SupportedVersions() + nextVersion = supportedVersions[len(supportedVersions)-1] + } + By(fmt.Sprintf("checking that control plane is updated to %v", nextVersion)) + config, err := clientcmd.BuildConfigFromFlags("", params.KubeconfigPath) + Expect(err).NotTo(HaveOccurred()) + + clientset, err := kubernetes.NewForConfig(config) + Expect(err).NotTo(HaveOccurred()) + Eventually(func() string { + serverVersion, err := clientset.ServerVersion() + Expect(err).NotTo(HaveOccurred()) + return fmt.Sprintf("%s.%s", serverVersion.Major, strings.TrimSuffix(serverVersion.Minor, "+")) + }, k8sUpdatePollTimeout, k8sUpdatePollInterval).Should(Equal(nextVersion)) + + upgradeNg := func(ngName string) { + By(fmt.Sprintf("upgrading nodegroup %s to Kubernetes version %s", ngName, nextVersion)) + cmd = params.EksctlUpgradeCmd.WithArgs( + "nodegroup", + "--verbose", "4", + "--cluster", params.ClusterName, + "--name", ngName, + "--kubernetes-version", nextVersion, + "--timeout=60m", // wait for CF stacks to finish update + ) + ExpectWithOffset(1, cmd).To(RunSuccessfullyWithOutputString(ContainSubstring("nodegroup successfully upgraded"))) + } + + upgradeNg(initialAl2Nodegroup) + upgradeNg(bottlerocketNodegroup) + }) }) Context("and deleting the cluster", func() { @@ -582,5 +609,5 @@ var _ = Describe("(Integration) Create Managed Nodegroups", func() { }) var _ = AfterSuite(func() { - params.DeleteClusters() + //params.DeleteClusters() }) From d5905a278199abf5d1cc81e299fec4ebc6c30db3 Mon Sep 17 00:00:00 2001 From: Himangini Date: Wed, 14 Sep 2022 00:19:50 +0100 Subject: [PATCH 4/5] clean up --- Makefile | 2 +- integration/data/podinfo.yaml | 8 +- .../tests/managed/managed_nodegroup_test.go | 7 +- pkg/addons/default/assets/aws-node.yaml | 140 +++++++++--------- 4 files changed, 79 insertions(+), 78 deletions(-) diff --git a/Makefile b/Makefile index 561eabdd16..2d2d7632bd 100644 --- a/Makefile +++ b/Makefile @@ -136,7 +136,7 @@ delete-integration-test-dev-cluster: build ## Delete the test cluster for use wh ##@ Code Generation .PHONY: generate-always -generate-always: ## Generate code (required for every build) +generate-always: pkg/addons/default/assets/aws-node.yaml ## Generate code (required for every build) go generate ./pkg/apis/eksctl.io/v1alpha5/generate.go go generate ./pkg/nodebootstrap go generate ./pkg/addons diff --git a/integration/data/podinfo.yaml b/integration/data/podinfo.yaml index 2a2c84371a..c1e387881a 100644 --- a/integration/data/podinfo.yaml +++ b/integration/data/podinfo.yaml @@ -31,16 +31,16 @@ spec: httpGet: path: /readyz port: 8080 - initialDelaySeconds: 3 + initialDelaySeconds: 1 periodSeconds: 5 - failureThreshold: 10 + failureThreshold: 1 livenessProbe: httpGet: path: /healthz port: 8080 - initialDelaySeconds: 5 + initialDelaySeconds: 1 periodSeconds: 10 - failureThreshold: 15 + failureThreshold: 2 resources: requests: memory: "32Mi" diff --git a/integration/tests/managed/managed_nodegroup_test.go b/integration/tests/managed/managed_nodegroup_test.go index 9409e15ed4..7032b58d42 100644 --- a/integration/tests/managed/managed_nodegroup_test.go +++ b/integration/tests/managed/managed_nodegroup_test.go @@ -379,9 +379,10 @@ var _ = Describe("(Integration) Create Managed Nodegroups", func() { }, { NodeGroupBase: &api.NodeGroupBase{ - Name: ubuntuNodegroup, - VolumeSize: aws.Int(25), - AMIFamily: "Ubuntu2004", + Name: ubuntuNodegroup, + VolumeSize: aws.Int(25), + AMIFamily: "Ubuntu2004", + InstanceType: "t3a.xlarge", }, }, } diff --git a/pkg/addons/default/assets/aws-node.yaml b/pkg/addons/default/assets/aws-node.yaml index 67bed0aa54..53a1f82b57 100644 --- a/pkg/addons/default/assets/aws-node.yaml +++ b/pkg/addons/default/assets/aws-node.yaml @@ -124,18 +124,18 @@ spec: serviceAccountName: aws-node hostNetwork: true initContainers: - - name: aws-vpc-cni-init - image: "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.11.3" - env: - - name: DISABLE_TCP_EARLY_DEMUX - value: "false" - - name: ENABLE_IPv6 - value: "false" - securityContext: + - name: aws-vpc-cni-init + image: "602401143452.dkr.ecr.us-west-2.amazonaws.com/amazon-k8s-cni-init:v1.11.3" + env: + - name: DISABLE_TCP_EARLY_DEMUX + value: "false" + - name: ENABLE_IPv6 + value: "false" + securityContext: privileged: true - volumeMounts: - - mountPath: /host/opt/cni/bin - name: cni-bin-dir + volumeMounts: + - mountPath: /host/opt/cni/bin + name: cni-bin-dir terminationGracePeriodSeconds: 10 tolerations: - operator: Exists @@ -150,21 +150,21 @@ spec: livenessProbe: exec: command: - - /app/grpc-health-probe - - -addr=:50051 - - -connect-timeout=10s - - -rpc-timeout=10s + - /app/grpc-health-probe + - -addr=:50051 + - -connect-timeout=5s + - -rpc-timeout=5s initialDelaySeconds: 60 - timeoutSeconds: 15 + timeoutSeconds: 10 readinessProbe: exec: command: - - /app/grpc-health-probe - - -addr=:50051 - - -connect-timeout=10s - - -rpc-timeout=10s - initialDelaySeconds: 5 - timeoutSeconds: 15 + - /app/grpc-health-probe + - -addr=:50051 + - -connect-timeout=5s + - -rpc-timeout=5s + initialDelaySeconds: 1 + timeoutSeconds: 10 env: - name: ADDITIONAL_ENI_TAGS value: "{}" @@ -181,7 +181,7 @@ spec: - name: AWS_VPC_K8S_CNI_LOGLEVEL value: "DEBUG" - name: AWS_VPC_K8S_CNI_LOG_FILE - value: "stdout" + value: "/host/var/log/aws-routed-eni/ipamd.log" - name: AWS_VPC_K8S_CNI_RANDOMIZESNAT value: "prng" - name: AWS_VPC_K8S_CNI_VETHPREFIX @@ -218,56 +218,56 @@ spec: securityContext: capabilities: add: - - NET_ADMIN + - NET_ADMIN volumeMounts: - - mountPath: /host/opt/cni/bin - name: cni-bin-dir - - mountPath: /host/etc/cni/net.d - name: cni-net-dir - - mountPath: /host/var/log/aws-routed-eni - name: log-dir - - mountPath: /var/run/dockershim.sock - name: dockershim - - mountPath: /var/run/aws-node - name: run-dir - - mountPath: /run/xtables.lock - name: xtables-lock + - mountPath: /host/opt/cni/bin + name: cni-bin-dir + - mountPath: /host/etc/cni/net.d + name: cni-net-dir + - mountPath: /host/var/log/aws-routed-eni + name: log-dir + - mountPath: /var/run/dockershim.sock + name: dockershim + - mountPath: /var/run/aws-node + name: run-dir + - mountPath: /run/xtables.lock + name: xtables-lock volumes: - - name: cni-bin-dir - hostPath: - path: /opt/cni/bin - - name: cni-net-dir - hostPath: - path: /etc/cni/net.d - - name: dockershim - hostPath: - path: /var/run/dockershim.sock - - name: log-dir - hostPath: - path: /var/log/aws-routed-eni - type: DirectoryOrCreate - - name: run-dir - hostPath: - path: /var/run/aws-node - type: DirectoryOrCreate - - name: xtables-lock - hostPath: - path: /run/xtables.lock + - name: cni-bin-dir + hostPath: + path: /opt/cni/bin + - name: cni-net-dir + hostPath: + path: /etc/cni/net.d + - name: dockershim + hostPath: + path: /var/run/dockershim.sock + - name: log-dir + hostPath: + path: /var/log/aws-routed-eni + type: DirectoryOrCreate + - name: run-dir + hostPath: + path: /var/run/aws-node + type: DirectoryOrCreate + - name: xtables-lock + hostPath: + path: /run/xtables.lock affinity: nodeAffinity: requiredDuringSchedulingIgnoredDuringExecution: nodeSelectorTerms: - - matchExpressions: - - key: kubernetes.io/os - operator: In - values: - - linux - - key: kubernetes.io/arch - operator: In - values: - - amd64 - - arm64 - - key: eks.amazonaws.com/compute-type - operator: NotIn - values: - - fargate \ No newline at end of file + - matchExpressions: + - key: kubernetes.io/os + operator: In + values: + - linux + - key: kubernetes.io/arch + operator: In + values: + - amd64 + - arm64 + - key: eks.amazonaws.com/compute-type + operator: NotIn + values: + - fargate From a1fc8e345682849dc08b33dfcb2fa37c4b552ed1 Mon Sep 17 00:00:00 2001 From: Himangini Date: Wed, 14 Sep 2022 11:56:39 +0100 Subject: [PATCH 5/5] updated packages --- go.mod | 16 ++++----- go.sum | 34 +++++++++---------- .../tests/managed/managed_nodegroup_test.go | 2 +- 3 files changed, 25 insertions(+), 27 deletions(-) diff --git a/go.mod b/go.mod index 18f611025e..a45742c907 100644 --- a/go.mod +++ b/go.mod @@ -12,16 +12,16 @@ require ( github.com/aws/aws-sdk-go-v2 v1.16.14 github.com/aws/aws-sdk-go-v2/config v1.17.5 github.com/aws/aws-sdk-go-v2/credentials v1.12.18 - github.com/aws/aws-sdk-go-v2/service/autoscaling v1.23.10 + github.com/aws/aws-sdk-go-v2/service/autoscaling v1.23.14 github.com/aws/aws-sdk-go-v2/service/cloudformation v1.22.8 - github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.16.7 - github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.15.14 + github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.16.12 + github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.15.18 github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.17.3 github.com/aws/aws-sdk-go-v2/service/ec2 v1.53.0 - github.com/aws/aws-sdk-go-v2/service/eks v1.21.8 - github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.14.11 - github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.18.8 - github.com/aws/aws-sdk-go-v2/service/iam v1.18.9 + github.com/aws/aws-sdk-go-v2/service/eks v1.21.11 + github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.14.16 + github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.18.17 + github.com/aws/aws-sdk-go-v2/service/iam v1.18.17 github.com/aws/aws-sdk-go-v2/service/kms v1.18.9 github.com/aws/aws-sdk-go-v2/service/ssm v1.27.13 github.com/aws/aws-sdk-go-v2/service/sts v1.16.17 @@ -60,7 +60,7 @@ require ( github.com/spf13/cobra v1.4.0 github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.8.0 - github.com/tidwall/gjson v1.14.2 + github.com/tidwall/gjson v1.14.3 github.com/tidwall/sjson v1.2.5 github.com/tj/assert v0.0.3 github.com/vburenin/ifacemaker v1.2.1-0.20220402060045-b2018d8549dc diff --git a/go.sum b/go.sum index c5ee81df6a..48fc40c645 100644 --- a/go.sum +++ b/go.sum @@ -362,7 +362,6 @@ github.com/aws/aws-sdk-go v1.44.35/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4 github.com/aws/aws-sdk-go-v2 v0.18.0/go.mod h1:JWVYvqSMppoMJC0x5wdwiImzgXTI9FuZwxzkQq9wy+g= github.com/aws/aws-sdk-go-v2 v1.9.0/go.mod h1:cK/D0BBs0b/oWPIcX/Z/obahJK1TT7IPVjy53i/mX/4= github.com/aws/aws-sdk-go-v2 v1.16.7/go.mod h1:6CpKuLXg2w7If3ABZCl/qZ6rEgwtjZTn4eAf4RcEyuw= -github.com/aws/aws-sdk-go-v2 v1.16.10/go.mod h1:WTACcleLz6VZTp7fak4EO5b9Q4foxbn+8PIz3PmyKlo= github.com/aws/aws-sdk-go-v2 v1.16.11/go.mod h1:WTACcleLz6VZTp7fak4EO5b9Q4foxbn+8PIz3PmyKlo= github.com/aws/aws-sdk-go-v2 v1.16.14 h1:db6GvO4Z2UqHt5gvT0lr6J5x5P+oQ7bdRzczVaRekMU= github.com/aws/aws-sdk-go-v2 v1.16.14/go.mod h1:s/G+UV29dECbF5rf+RNj1xhlmvoNurGSr+McVSRj59w= @@ -376,38 +375,36 @@ github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.5.0/go.mod h1:CpNzHK9VEFUCknu50 github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.15 h1:nkQ+aI0OCeYfzrBipL6ja/6VEbUnHQoZHBHtoK+Nzxw= github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.12.15/go.mod h1:Oz2/qWINxIgSmoZT9adpxJy2UhpcOAI3TIyWgYMVSz0= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.14/go.mod h1:kdjrMwHwrC3+FsKhNcCMJ7tUVj/8uSD5CZXeQ4wV6fM= -github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.17/go.mod h1:6qtGip7sJEyvgsLjphRZWF9qPe3xJf1mL/MM01E35Wc= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.18/go.mod h1:348MLhzV1GSlZSMusdwQpXKbhD7X2gbI/TxwAPKkYZQ= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.21 h1:gRIXnmAVNyoRQywdNtpAkgY+f30QNzgF53Q5OobNZZs= github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.21/go.mod h1:XsmHMV9c512xgsW01q7H0ut+UQQQpWX8QsFbdLHDwaU= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.8/go.mod h1:ZIV8GYoC6WLBW5KGs+o4rsc65/ozd+eQ0L31XF5VDwk= -github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.11/go.mod h1:cYAfnB+9ZkmZWpQWmPDsuIGm4EA+6k2ZVtxKjw/XJBY= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.12/go.mod h1:ckaCVTEdGAxO6KwTGzgskxR1xM+iJW4lxMyDFVda2Fc= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.15 h1:noAhOo2mMDyYhTx99aYPvQw16T3fQ/DiKAv9fzpIKH8= github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.4.15/go.mod h1:kjJ4CyD9M3Wq88GYg3IPfj67Rs0Uvz8aXK7MJ8BvE4I= github.com/aws/aws-sdk-go-v2/internal/ini v1.2.2/go.mod h1:BQV0agm+JEhqR+2RT5e1XTFIDcAAV0eW6z2trp+iduw= github.com/aws/aws-sdk-go-v2/internal/ini v1.3.22 h1:nF+E8HfYpOMw6M5oA9efB602VC00IHNQnB5CmFvZPvA= github.com/aws/aws-sdk-go-v2/internal/ini v1.3.22/go.mod h1:tltHVGy977LrSOgRR5aV9+miyno/Gul/uJNPKS7FzP4= -github.com/aws/aws-sdk-go-v2/service/autoscaling v1.23.10 h1:D6U34TKBxZ2rtP9QO0gqMmy0yU2zfXzkgmFcwr64Fv0= -github.com/aws/aws-sdk-go-v2/service/autoscaling v1.23.10/go.mod h1:9XhGxXdcX9/pZwXc3BzvVQtSBVJCwL2IH2AtrfsUGBY= +github.com/aws/aws-sdk-go-v2/service/autoscaling v1.23.14 h1:0Dcxd1lGWAzWCGuVl82UFGMm1tM1fOioQg/Or9qYSV4= +github.com/aws/aws-sdk-go-v2/service/autoscaling v1.23.14/go.mod h1:TdlJCYadv3Jxv00VGfsM6tH4nXdb9rXnNnOoPKu1Gi8= github.com/aws/aws-sdk-go-v2/service/cloudformation v1.22.8 h1:2A08UvKfLvp0nyF0qRjt2umwUTypl4ZYE7IvGVR+ZyE= github.com/aws/aws-sdk-go-v2/service/cloudformation v1.22.8/go.mod h1:SUJgfvAM7mzloPhT65k1DYT/Lldx9Tv+dzmlGgAf/e4= -github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.16.7 h1:NsrUZLD6ouzspKEwkQoXCKCKqcNLNzK4CA77CZDQS0U= -github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.16.7/go.mod h1:C0BTOwKOaUFukFBv59yxPaGifjH2zbCWejAlWoT9lNE= -github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.15.14 h1:SO5LdqjF9dlURPzk3LNMzCz9RA5K8/yNOf6WpdoffJU= -github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.15.14/go.mod h1:62kPuTAGPxpvo/0y/+QvaFwHffIe4l8hmStHLwaisLI= +github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.16.12 h1:kEB8f463sCGRd0HnSNEi9nxXJNVIEAE6Eh7FS2qxqs0= +github.com/aws/aws-sdk-go-v2/service/cloudtrail v1.16.12/go.mod h1:R+DQ8kXSHr/8SVLU5cQ2bmWyqcVg1VQX/eA+wBfr5sA= +github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.15.18 h1:bnZQC0jtygGT56IU16mAmNc+iCoH29bGlcVyYEh734Q= +github.com/aws/aws-sdk-go-v2/service/cloudwatchlogs v1.15.18/go.mod h1:nx1I/o0l5jLSo/XLEJHu8kC6b/l+2tvL7+4RkfTPSDI= github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.17.3 h1:xtwjqxVDO9tAmoUXVfJyMKFLVJlosjKrFLLuW4V8VO0= github.com/aws/aws-sdk-go-v2/service/cognitoidentityprovider v1.17.3/go.mod h1:flSX+qf2r/mLgwTavyT/Gjs4dFtHcBmjMcVp/AqpSgc= github.com/aws/aws-sdk-go-v2/service/ec2 v1.53.0 h1:ykXBf42stQW1SyoLCuhd405kyTq440+3TIOkqhsETMs= github.com/aws/aws-sdk-go-v2/service/ec2 v1.53.0/go.mod h1:YbPg6ou7dlvFTJMmbV3zhec+A22S1Ow+ZB6k6xUs9oY= -github.com/aws/aws-sdk-go-v2/service/eks v1.21.8 h1:uF8ubOoj49FDr0/Lyo5tR7OpKgT/xNcwuzEHMZBI0Ok= -github.com/aws/aws-sdk-go-v2/service/eks v1.21.8/go.mod h1:R9cRhIInyI6RvK1CjhZSksjWN3wnNAx9ZtAqe5Jjvw0= -github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.14.11 h1:c/F25ig8d74XrxKOVQC5Xg7lfJPM5euAgP/Ikymbx+A= -github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.14.11/go.mod h1:jZn72ed7R9SyOhugvNtReWoFm3tLsYU8TNxiL50Vq6g= -github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.18.8 h1:D6Sc+XyjK++NhkJJLvZNcf0xyzNhhC+GVn/MYDeONS4= -github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.18.8/go.mod h1:8OyausC7+VUBNJFOEDjvSrowuefSkEoJaUzsGLNRXZQ= -github.com/aws/aws-sdk-go-v2/service/iam v1.18.9 h1:pVHvEz+KIsTwRKufwvGZr90X/YJ7swVshaBZNY4ESIY= -github.com/aws/aws-sdk-go-v2/service/iam v1.18.9/go.mod h1:ARVuo+lYC2ibYxny/PKC3maaWKLAg25KSq0dkSkE2WE= +github.com/aws/aws-sdk-go-v2/service/eks v1.21.11 h1:i3tEE+cLmu/MR5VPjPtNZucFJKjklxxMstJveGwxwpU= +github.com/aws/aws-sdk-go-v2/service/eks v1.21.11/go.mod h1:uQKobwLPAvlksViYM6CGnpmfhjca+LjHAhtfSdHrKVg= +github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.14.16 h1:f1f/PTZnuq5wr4IEKzc35xfBLcvpag2Rei5MsDTL7qo= +github.com/aws/aws-sdk-go-v2/service/elasticloadbalancing v1.14.16/go.mod h1:P8sMl7b9ET1CfXi25V2sDL5TAL3cW1ufx0nGJ8CdXcQ= +github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.18.17 h1:aGtbr5HNb9E1xzDAuWK5kAECH2BtwzFdoQx8lKnKuDc= +github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2 v1.18.17/go.mod h1:n+QeyxC6AvbThk1qqU0pBOBDbZewYcHgR59pRDNTQjw= +github.com/aws/aws-sdk-go-v2/service/iam v1.18.17 h1:2sbycB3YvoTTT6bqT8GmTRRkNnpTh42OeFv5IEBCPkk= +github.com/aws/aws-sdk-go-v2/service/iam v1.18.17/go.mod h1:P78+32N8FUruwcMQz0YET9NnD991g6Ud2Z9ldLX3OxM= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.3.0/go.mod h1:R1KK+vY8AfalhG1AOu5e35pOD2SdoPKQCFLTvnxiohk= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.12/go.mod h1:1TODGhheLWjpQWSuhYuAUWYTCKwEjx2iblIFKDHjeTc= github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.9.15 h1:xlf0J6DUgAj/ocvKQxCmad8Bu1lJuRbt5Wu+4G1xw1g= @@ -2153,8 +2150,9 @@ github.com/tenntenn/text/transform v0.0.0-20200319021203-7eef512accb3 h1:f+jULpR github.com/tenntenn/text/transform v0.0.0-20200319021203-7eef512accb3/go.mod h1:ON8b8w4BN/kE1EOhwT0o+d62W65a6aPw1nouo9LMgyY= github.com/tetafro/godot v1.4.11 h1:BVoBIqAf/2QdbFmSwAWnaIqDivZdOV0ZRwEm6jivLKw= github.com/tetafro/godot v1.4.11/go.mod h1:LR3CJpxDVGlYOWn3ZZg1PgNZdTUvzsZWu8xaEohUpn8= -github.com/tidwall/gjson v1.14.2 h1:6BBkirS0rAHjumnjHF6qgy5d2YAJ1TLIaFE2lzfOLqo= github.com/tidwall/gjson v1.14.2/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= +github.com/tidwall/gjson v1.14.3 h1:9jvXn7olKEHU1S9vwoMGliaT8jq1vJ7IH/n9zD9Dnlw= +github.com/tidwall/gjson v1.14.3/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk= github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA= github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM= github.com/tidwall/pretty v1.2.0 h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs= diff --git a/integration/tests/managed/managed_nodegroup_test.go b/integration/tests/managed/managed_nodegroup_test.go index 7032b58d42..e05af89eff 100644 --- a/integration/tests/managed/managed_nodegroup_test.go +++ b/integration/tests/managed/managed_nodegroup_test.go @@ -610,5 +610,5 @@ var _ = Describe("(Integration) Create Managed Nodegroups", func() { }) var _ = AfterSuite(func() { - //params.DeleteClusters() + params.DeleteClusters() })