Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions terraform/java/k8s/deploy/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,15 @@ resource "null_resource" "deploy" {
[ ! -e remote-service-depl.yaml ] || rm remote-service-depl.yaml
# Clone and install operator onto cluster
echo "LOG: Cloning helm-charts repo"
git clone https://github.com/aws-observability/helm-charts -q
cd helm-charts/charts/amazon-cloudwatch-observability/
git reset --hard e0e99c77f69ef388b0ffce769371f7c735a776e4
echo "LOG: Getting latest helm chart release URL"
latest_version_url=$(curl -s https://api.github.com/repos/aws-observability/helm-charts/releases/latest | grep "tarball_url" | cut -d '"' -f 4)
echo "LOG: The latest helm chart version url is $latest_version_url"
echo "LOG: Downloading and unpacking the helm chart repo"
curl -L $latest_version_url -o aws-observability-helm-charts-latest.tar.gz
mkdir helm-charts
tar -xvzf aws-observability-helm-charts-latest.tar.gz -C helm-charts
cd helm-charts/aws-observability-helm-charts*/charts/amazon-cloudwatch-observability
echo "LOG: Installing CloudWatch Agent Operator using Helm"
helm upgrade --install --debug --namespace amazon-cloudwatch amazon-cloudwatch-operator ./ --create-namespace --set region=${var.aws_region} --set clusterName=k8s-cluster-${var.test_id}
Expand Down
13 changes: 9 additions & 4 deletions terraform/python/k8s/deploy/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,15 @@ resource "null_resource" "deploy" {
[ ! -e python-remote-service-depl.yaml ] || rm python-remote-service-depl.yaml
# Clone and install operator onto cluster
echo "LOG: Cloning helm charts repo"
git clone https://github.com/aws-observability/helm-charts.git -q
cd helm-charts/charts/amazon-cloudwatch-observability
git reset --hard e0e99c77f69ef388b0ffce769371f7c735a776e4
echo "LOG: Getting latest helm chart release URL"
latest_version_url=$(curl -s https://api.github.com/repos/aws-observability/helm-charts/releases/latest | grep "tarball_url" | cut -d '"' -f 4)
echo "LOG: The latest helm chart version url is $latest_version_url"
echo "LOG: Downloading and unpacking the helm chart repo"
curl -L $latest_version_url -o aws-observability-helm-charts-latest.tar.gz
mkdir helm-charts
tar -xvzf aws-observability-helm-charts-latest.tar.gz -C helm-charts
cd helm-charts/aws-observability-helm-charts*/charts/amazon-cloudwatch-observability
echo "LOG: Installing CloudWatch Agent Operator using Helm"
helm upgrade --install --debug --namespace amazon-cloudwatch amazon-cloudwatch-operator ./ --create-namespace --set region=${var.aws_region} --set clusterName=k8s-cluster-${var.test_id}
Expand Down