From 5f9ac85e0406625e95562b2be52ba518a234ec9f Mon Sep 17 00:00:00 2001 From: lisguo Date: Mon, 17 Jun 2024 13:41:41 -0400 Subject: [PATCH 1/2] Version bump of the agent, operator, and updating release notes --- RELEASE_NOTES | 6 ++++++ versions.txt | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/RELEASE_NOTES b/RELEASE_NOTES index 7128f8e01..1cb4ba961 100644 --- a/RELEASE_NOTES +++ b/RELEASE_NOTES @@ -1,3 +1,9 @@ +======================================================================== +Amazon CloudWatch Agent Operator v1.4.1 (2024-06-17) +======================================================================== +Bug Fixes: +* Expose EMF TCP and UDP ports, and others, in the service (#182) + ======================================================================== Amazon CloudWatch Agent Operator v1.4.0 (2024-05-22) ======================================================================== diff --git a/versions.txt b/versions.txt index c7137e3ea..07a1cd739 100644 --- a/versions.txt +++ b/versions.txt @@ -1,8 +1,8 @@ # Represents the latest stable release of the CloudWatch Agent -cloudwatch-agent=1.300040.0b650 +cloudwatch-agent=1.300041.0b681 # Represents the current release of the CloudWatch Agent Operator. -operator=1.4.0 +operator=1.4.1 # Represents the current release of ADOT language instrumentation. aws-otel-java-instrumentation=v1.32.2 From 8b03e772370dae23a399db9ecc9e604521ca6866 Mon Sep 17 00:00:00 2001 From: lisguo Date: Mon, 17 Jun 2024 13:58:19 -0400 Subject: [PATCH 2/2] Use kubectl wait to make the integration test more reliable --- .../workflows/operator-integration-test.yml | 38 ++++++++----------- 1 file changed, 16 insertions(+), 22 deletions(-) diff --git a/.github/workflows/operator-integration-test.yml b/.github/workflows/operator-integration-test.yml index b81886a06..977957db4 100644 --- a/.github/workflows/operator-integration-test.yml +++ b/.github/workflows/operator-integration-test.yml @@ -57,8 +57,9 @@ jobs: - name: Test case for AmazonCloudWatchAgent pod creation run: | kubectl apply -f integration-tests/manifests/cloudwatch-agent-daemonset.yaml -n amazon-cloudwatch - sleep 60 - kubectl describe pods -n amazon-cloudwatch + sleep 5 + kubectl wait --for=condition=Ready pod --all -n amazon-cloudwatch + pod_name="$(kubectl get pods -n amazon-cloudwatch -l app.kubernetes.io/component=amazon-cloudwatch-agent,app.kubernetes.io/instance=amazon-cloudwatch.cloudwatch-agent -o=jsonpath='{range .items[*]}{.metadata.name}{"\n"}{end}')" if [ -z "$pod_name" ]; then echo "Pod $pod_name is not created. Exiting with ERROR." @@ -72,18 +73,17 @@ jobs: run: | kubectl apply -f integration-tests/java/sample-deployment-java.yaml sleep 5 - kubectl get pods -A - kubectl describe pods -n default + kubectl wait --for=condition=Ready pod --all -n default + go run integration-tests/manifests/cmd/validate_instrumentation_vars.go default integration-tests/java/default_instrumentation_java_env_variables.json - name: Test for defined instrumentation resources for Java run: | kubectl apply -f integration-tests/manifests/sample-instrumentation.yaml - sleep 5 kubectl rollout restart deployment nginx sleep 5 - kubectl get pods -A - kubectl describe pods -n default + kubectl wait --for=condition=Ready pod --all -n default + cd integration-tests/manifests/cmd go run validate_instrumentation_vars.go default ns_instrumentation_env_variables.json kubectl delete instrumentation sample-instrumentation @@ -91,20 +91,19 @@ jobs: - name: Test for default instrumentation resources for python run: | kubectl apply -f integration-tests/python/sample-deployment-python.yaml - sleep 5 kubectl rollout restart deployment nginx sleep 5 - kubectl get pods -A - kubectl describe pods -n default + kubectl wait --for=condition=Ready pod --all -n default + go run integration-tests/manifests/cmd/validate_instrumentation_vars.go default integration-tests/python/default_instrumentation_python_env_variables.json - name: Test for defined instrumentation resources for python run: | kubectl apply -f integration-tests/manifests/sample-instrumentation.yaml - sleep 5 kubectl rollout restart deployment nginx sleep 5 - kubectl describe pods -n default + kubectl wait --for=condition=Ready pod --all -n default + cd integration-tests/manifests/cmd go run validate_instrumentation_vars.go default ns_instrumentation_env_variables.json kubectl delete instrumentation sample-instrumentation @@ -112,22 +111,19 @@ jobs: - name: Test for default instrumentation resources for python and java run: | kubectl apply -f integration-tests/python-java/sample-deployment-python-java.yaml - sleep 5 kubectl rollout restart deployment nginx sleep 5 - kubectl get pods -A - kubectl describe pods -n default - kubectl describe pods -n amazon-cloudwatch + kubectl wait --for=condition=Ready pod --all -n default + go run integration-tests/manifests/cmd/validate_instrumentation_vars.go default integration-tests/python-java/default_instrumentation_python-java_env_variables.json - name: Test for defined instrumentation resources for python and java run: | kubectl apply -f integration-tests/manifests/sample-instrumentation.yaml - sleep 5 kubectl rollout restart deployment nginx sleep 5 - kubectl get pods -A - kubectl describe pods -n default + kubectl wait --for=condition=Ready pod --all -n default + cd integration-tests/manifests/cmd go run validate_instrumentation_vars.go default ns_instrumentation_env_variables.json kubectl delete instrumentation sample-instrumentation @@ -326,6 +322,4 @@ jobs: sleep 5 go test -v -run TestPythonOnlyNamespace ./integration-tests/manifests/annotations -timeout 30m sleep 5 - go test -v -run TestAlreadyAutoAnnotatedResourceShouldNotRestart ./integration-tests/manifests/annotations -timeout 30m - - + go test -v -run TestAlreadyAutoAnnotatedResourceShouldNotRestart ./integration-tests/manifests/annotations -timeout 30m \ No newline at end of file