diff --git a/config/controller/kustomization.yaml b/config/controller/kustomization.yaml index 6b1704f9..ea104534 100644 --- a/config/controller/kustomization.yaml +++ b/config/controller/kustomization.yaml @@ -6,4 +6,4 @@ kind: Kustomization images: - name: controller newName: public.ecr.aws/aws-controllers-k8s/ec2-controller - newTag: 1.4.0 + newTag: 1.4.1 diff --git a/helm/Chart.yaml b/helm/Chart.yaml index e9f0a324..e277d788 100644 --- a/helm/Chart.yaml +++ b/helm/Chart.yaml @@ -1,8 +1,8 @@ apiVersion: v1 name: ec2-chart description: A Helm chart for the ACK service controller for Amazon Elastic Cloud Compute (EC2) -version: 1.4.0 -appVersion: 1.4.0 +version: 1.4.1 +appVersion: 1.4.1 home: https://github.com/aws-controllers-k8s/ec2-controller icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png sources: diff --git a/helm/templates/NOTES.txt b/helm/templates/NOTES.txt index ec5c756e..86f25955 100644 --- a/helm/templates/NOTES.txt +++ b/helm/templates/NOTES.txt @@ -1,5 +1,5 @@ {{ .Chart.Name }} has been installed. -This chart deploys "public.ecr.aws/aws-controllers-k8s/ec2-controller:1.4.0". +This chart deploys "public.ecr.aws/aws-controllers-k8s/ec2-controller:1.4.1". Check its status by running: kubectl --namespace {{ .Release.Namespace }} get pods -l "app.kubernetes.io/instance={{ .Release.Name }}" diff --git a/helm/values.yaml b/helm/values.yaml index 5ef8ca89..36e12ffa 100644 --- a/helm/values.yaml +++ b/helm/values.yaml @@ -4,7 +4,7 @@ image: repository: public.ecr.aws/aws-controllers-k8s/ec2-controller - tag: 1.4.0 + tag: 1.4.1 pullPolicy: IfNotPresent pullSecrets: [] diff --git a/test/e2e/tests/test_vpc.py b/test/e2e/tests/test_vpc.py index 9669ad72..b6ee4176 100644 --- a/test/e2e/tests/test_vpc.py +++ b/test/e2e/tests/test_vpc.py @@ -230,6 +230,7 @@ def test_crud_tags(self, ec2_client, simple_vpc): resource = k8s.get_resource(ref) assert len(resource["spec"]["tags"]) == 0 + k8s.wait_on_condition(ref, "ACK.ResourceSynced", "True", wait_periods=5) # Delete k8s resource _, deleted = k8s.delete_custom_resource(ref) assert deleted is True @@ -282,7 +283,7 @@ def test_update_disallow_default_security_group_rule(self, ec2_client, simple_vp } k8s.patch_custom_resource(ref, updates) time.sleep(MODIFY_WAIT_AFTER_SECONDS) - + k8s.wait_on_condition(ref, "ACK.ResourceSynced", "True", wait_periods=5) # Make sure default security group rule is deleted assert not contains_default_sg_rule(ec2_client, resource_id) @@ -480,6 +481,7 @@ def test_vpc_updation_multiple_cidr(self,ec2_client): k8s.patch_custom_resource(ref, updates) time.sleep(MODIFY_WAIT_AFTER_SECONDS) + k8s.wait_on_condition(ref, "ACK.ResourceSynced", "True", wait_periods=5) # Re-Validate CIDR Blocks State vpc = ec2_validator.get_vpc(resource_id) assert vpc['CidrBlockAssociationSet'][0]['CidrBlockState']['State'] == "associated"