From b000e419e8a1135f3afa7d02d58b63e8a98b832c Mon Sep 17 00:00:00 2001 From: Silvija Tovernic Date: Fri, 27 Sep 2024 16:16:32 +0200 Subject: [PATCH 1/2] add inputs --- .github/workflows/pulumi.yml | 37 +++++++++++++++++++++++++++++------- pulumi/Pulumi.original.yaml | 1 + pulumi/__main__.py | 6 +++--- 3 files changed, 34 insertions(+), 10 deletions(-) diff --git a/.github/workflows/pulumi.yml b/.github/workflows/pulumi.yml index 15b5192..847e3c6 100644 --- a/.github/workflows/pulumi.yml +++ b/.github/workflows/pulumi.yml @@ -9,10 +9,30 @@ on: options: - dev default: dev - image_uri: + az_number: + type: string + description: Number of Availability Zones + default: "2" + container_image_uri: type: string description: Image URI - default: nginx + default: "nginx" + container_cpu: + type: string + description: Container CPU + default: "256" + container_memory: + type: string + description: Container Memory + default: "512" + container_port: + type: string + description: Container Port + default: "80" + host_port: + type: string + description: Container Port + default: "80" env: AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }} @@ -24,11 +44,12 @@ env: AWS_RESOURCE_PREFIX: "pulumi-${{ inputs.environment }}" AWS_RESOURCE_SHORT_PREFIX: "p-${{ inputs.environment }}" # Max 6 chars - AWS_AZ_NUMBER: "2" - CONTAINER_IMAGE_URI: ${{ inputs.image_uri }} - CONTAINER_CPU: "256" - CONTAINER_MEMORY: "512" - CONTAINER_PORT: "80" + AWS_AZ_NUMBER: ${{ inputs.az_number }} + CONTAINER_IMAGE_URI: ${{ inputs.container_image_uri }} + CONTAINER_CPU: ${{ inputs.container_cpu }} + CONTAINER_MEMORY: ${{ inputs.container_memory }} + CONTAINER_PORT: ${{ inputs.container_port }} + HOST_PORT: ${{ inputs.host_port }} jobs: @@ -69,6 +90,7 @@ jobs: pulumi config set cpu $CONTAINER_CPU pulumi config set memory $CONTAINER_MEMORY pulumi config set container_port $CONTAINER_PORT + pulumi config set host_port $HOST_PORT working-directory: pulumi - name: Pulumi Preview @@ -120,6 +142,7 @@ jobs: pulumi config set cpu $CONTAINER_CPU pulumi config set memory $CONTAINER_MEMORY pulumi config set container_port $CONTAINER_PORT + pulumi config set host_port $HOST_PORT working-directory: pulumi - name: Pulumi Deploy Infrastructure diff --git a/pulumi/Pulumi.original.yaml b/pulumi/Pulumi.original.yaml index 54f6c97..6f8e645 100644 --- a/pulumi/Pulumi.original.yaml +++ b/pulumi/Pulumi.original.yaml @@ -9,3 +9,4 @@ config: cpu: 256 memory: 512 container_port: 80 + host_port: 80 diff --git a/pulumi/__main__.py b/pulumi/__main__.py index 7133224..8f66808 100644 --- a/pulumi/__main__.py +++ b/pulumi/__main__.py @@ -14,7 +14,7 @@ cpu = config.require("cpu") memory = config.require("memory") container_port = config.require_int("container_port") - +host_port = config.require_int("host_port") # Functions def prefixed(name): @@ -242,8 +242,8 @@ def create_tags(name): 'name': 'app', 'image': image_uri, 'portMappings': [{ - 'containerPort': 80, - 'hostPort': 80, + 'containerPort': container_port, + 'hostPort': host_port, 'protocol': 'tcp' }] }]), From faf80e2c40a3b286fc426a4596aff3671fcd9616 Mon Sep 17 00:00:00 2001 From: Silvija Tovernic Date: Fri, 27 Sep 2024 16:17:02 +0200 Subject: [PATCH 2/2] rename --- .github/workflows/pulumi.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/pulumi.yml b/.github/workflows/pulumi.yml index 847e3c6..8b54928 100644 --- a/.github/workflows/pulumi.yml +++ b/.github/workflows/pulumi.yml @@ -31,7 +31,7 @@ on: default: "80" host_port: type: string - description: Container Port + description: Host Port default: "80" env: