move dp to secret

jmcalalang · Jun 11, 2024 · f57db6f · f57db6f
1 parent 80121fe
commit f57db6f
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 deletions.
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -673,6 +673,7 @@ jobs:
       ARM_TENANT_ID: ${{ secrets.AZURE_TENANT }}
       TF_VAR_nginx_username: ${{ secrets.NGINX_USER }}
       TF_VAR_nginx_password: ${{ secrets.NGINX_PASSWORD }}
+      TF_VAR_nginx_one_dataplane_key: ${{ secrets.NGINX_ONE_DATAPLANE_KEY }}
 
     # Where are the Terraform files
     defaults:

diff --git a/nginx/terraform/infrastructure/files/bootstrap-instance-group-api-gw.sh b/nginx/terraform/infrastructure/files/bootstrap-instance-group-api-gw.sh
@@ -3,7 +3,9 @@
 # Install the NGINX Agent and bind to instance group api
 # curl -k https://${nms-hostname}/install/nginx-agent > install.sh && sudo sh install.sh -g azure-api-gateways && sudo systemctl start nginx-agent
 
-curl https://agent.connect.nginx.com/nginx-agent/install | DATA_PLANE_KEY="hsa2dnJ7yW3IdQ70qmPm7fwWhB4dh9ofw3LwsKllttM=" sh -s -- -y
+# Add NGINX instance to NGINX One
+
+curl https://agent.connect.nginx.com/nginx-agent/install | DATA_PLANE_KEY="${nginx_one_dataplane_key}" sh -s -- -y
 
 # install nginx modules
 

diff --git a/nginx/terraform/infrastructure/files/bootstrap-instance-group-azure-instances.sh b/nginx/terraform/infrastructure/files/bootstrap-instance-group-azure-instances.sh
@@ -3,7 +3,9 @@
 # Install the NGINX Agent and bind to instance group api
 # curl -k https://${nms-hostname}/install/nginx-agent > install.sh && sudo sh install.sh -g azure-api-gateways && sudo systemctl start nginx-agent
 
-curl https://agent.connect.nginx.com/nginx-agent/install | DATA_PLANE_KEY="hsa2dnJ7yW3IdQ70qmPm7fwWhB4dh9ofw3LwsKllttM=" sh -s -- -y
+# Add NGINX instance to NGINX One
+
+curl https://agent.connect.nginx.com/nginx-agent/install | DATA_PLANE_KEY="${nginx_one_dataplane_key}" sh -s -- -y
 
 # install nginx modules
 

diff --git a/nginx/terraform/infrastructure/variables.tf b/nginx/terraform/infrastructure/variables.tf
@@ -47,6 +47,10 @@ variable "notification_email" {
 
 # NGINX variables
 
+variable "nginx_one_dataplane_key" {
+  type        = string
+  description = "NGINX ONE Dataplane Key"
+}
 variable "nginx-instance-offer" {
   type        = string
   description = "Offer name for NGINX instance resources"