From 9e25af90bbd25d931e7025df06559eeda75b353b Mon Sep 17 00:00:00 2001 From: eili1s <183522504+eili1s@users.noreply.github.com> Date: Sun, 1 Nov 2026 22:48:50 +0100 Subject: [PATCH 1/4] feat(prod): add network and frontend deployment configurations --- environments/prod/frontend/deployment.tfvars | 9 +++++++++ environments/prod/network/deployment.tfvars | 13 +++++++++++++ 2 files changed, 22 insertions(+) create mode 100644 environments/prod/frontend/deployment.tfvars create mode 100644 environments/prod/network/deployment.tfvars diff --git a/environments/prod/frontend/deployment.tfvars b/environments/prod/frontend/deployment.tfvars new file mode 100644 index 0000000..2582fb1 --- /dev/null +++ b/environments/prod/frontend/deployment.tfvars @@ -0,0 +1,9 @@ +frontend_name = "assignment2-prod-frontend" +frontend_count = 1 + +frontend_image = "Debian 13 (Trixie) stable amd64" +frontend_flavor = "gx1.1c1r" + +http_cidr = "0.0.0.0/0" + +external_network_name = "ntnu-internal" \ No newline at end of file diff --git a/environments/prod/network/deployment.tfvars b/environments/prod/network/deployment.tfvars new file mode 100644 index 0000000..09a05b7 --- /dev/null +++ b/environments/prod/network/deployment.tfvars @@ -0,0 +1,13 @@ +network_name = "assignment2-prod-network" + +frontend_subnet_name = "assignment2-prod-frontend-subnet" +frontend_subnet_cidr = "10.80.10.0/24" + +backend_subnet_name = "assignment2-prod-backend-subnet" +backend_subnet_cidr = "10.80.20.0/24" + +database_subnet_name = "assignment2-prod-database-subnet" +database_subnet_cidr = "10.80.30.0/24" + +router_name = "assignment2-prod-router" +external_network_name = "ntnu-internal" \ No newline at end of file From 0aa99481d8c6f2d54627bca89a77ef033c8e1e5d Mon Sep 17 00:00:00 2001 From: eili1s <183522504+eili1s@users.noreply.github.com> Date: Sun, 1 Nov 2026 22:56:38 +0100 Subject: [PATCH 2/4] ci(cd): add manual PROD deployment with environment protection --- .github/workflows/deploy.yml | 326 ++++++++++++++++++++++++++++++++++- 1 file changed, 324 insertions(+), 2 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 87e8183..99a821c 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -1,12 +1,18 @@ name: Deploy Infrastructure -# Deploy after CI succeeds on main, or allow manual execution. on: workflow_run: workflows: [CI] types: [completed] branches: [main] + workflow_dispatch: + inputs: + deploy_prod: + description: "Deploy to PROD after TEST and STAGE" + type: boolean + required: true + default: false # Prevent overlapping infrastructure deployments. # Do not cancel an active deployment, since OpenTofu may be modifying resources. @@ -632,4 +638,320 @@ jobs: rm -f "$RUNNER_TEMP"/stage-*.tfplan rm -f "$RUNNER_TEMP"/stage-*.plan.json rm -f "$RUNNER_TEMP"/stage-*.plan.log - rm -f "$RUNNER_TEMP"/stage-*.apply.log \ No newline at end of file + rm -f "$RUNNER_TEMP"/stage-*.apply.log + + deploy-prod: + name: Deploy PROD + needs: deploy-stage + + # Only deploy PROD when manually triggered from main + # with the deploy_prod checkbox selected. + if: >- + github.event_name == 'workflow_dispatch' && + github.ref == 'refs/heads/main' && + inputs.deploy_prod == true + + runs-on: [self-hosted, linux, assignment2] + timeout-minutes: 45 + environment: PROD + + # Authenticate to SkyHiGh using PROD-specific credentials. + env: + OS_AUTH_TYPE: v3applicationcredential + OS_AUTH_URL: ${{ vars.OS_AUTH_URL }} + OS_REGION_NAME: ${{ vars.OS_REGION_NAME }} + OS_IDENTITY_API_VERSION: "3" + OS_INTERFACE: public + OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID }} + OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET }} + + KOPS_STATE_STORE: swift://demo-kops + + steps: + # Checkout the same commit deployed to TEST and STAGE. + - name: Checkout + uses: actions/checkout@v5 + with: + ref: ${{ github.event_name == 'workflow_run' && github.event.workflow_run.head_sha || github.sha }} + persist-credentials: false + + # Use the same OpenTofu version as CI, TEST and STAGE. + - name: Setup OpenTofu + uses: opentofu/setup-opentofu@v2 + with: + tofu_version: "1.12.6" + tofu_wrapper: false + + - name: Verify jq installation + shell: bash + run: | + set -euo pipefail + + if ! command -v jq >/dev/null 2>&1; then + echo "::error::jq is not installed on the runner." + exit 1 + fi + + jq --version + + # Verify OpenTofu, credentials and PROD configurations. + - name: Preflight checks + shell: bash + run: | + set -euo pipefail + + tofu version + + test -f environments/prod/network/providers.tf + test -f environments/prod/frontend/providers.tf + test -f environments/prod/network/deployment.tfvars + test -f environments/prod/frontend/deployment.tfvars + + : "${OS_AUTH_URL:?Missing OS_AUTH_URL}" + : "${OS_REGION_NAME:?Missing OS_REGION_NAME}" + : "${OS_APPLICATION_CREDENTIAL_ID:?Missing application credential ID}" + : "${OS_APPLICATION_CREDENTIAL_SECRET:?Missing application credential secret}" + + echo "PROD deployment prerequisites verified." + + # Install tools into the job's temporary directory. + - name: Install kOps and kubectl + shell: bash + run: | + set -euo pipefail + + BIN_DIR="$RUNNER_TEMP/tofu-tools" + mkdir -p "$BIN_DIR" + + # Kubernetes API server + KUBECTL_VERSION="v1.36.4" + + curl -fsSL -o "$BIN_DIR/kubectl" \ + "https://dl.k8s.io/release/${KUBECTL_VERSION}/bin/linux/amd64/kubectl" + + curl -fsSL -o "$BIN_DIR/kubectl.sha256" \ + "https://dl.k8s.io/release/${KUBECTL_VERSION}/bin/linux/amd64/kubectl.sha256" + + ( + cd "$BIN_DIR" + echo "$(cat kubectl.sha256) kubectl" | sha256sum --check + ) + + # Download kOps and verify its checksum. + KOPS_VERSION="v1.36.2" + + curl -fsSL -o "$BIN_DIR/kops" \ + "https://github.com/kubernetes/kops/releases/download/${KOPS_VERSION}/kops-linux-amd64" + + curl -fsSL -o "$BIN_DIR/kops.sha256" \ + "https://github.com/kubernetes/kops/releases/download/${KOPS_VERSION}/kops-linux-amd64.sha256" + + ( + cd "$BIN_DIR" + echo "$(cat kops.sha256) kops" | sha256sum --check + ) + + chmod +x "$BIN_DIR/kubectl" "$BIN_DIR/kops" + + # Make tools available to subsequent steps. + echo "$BIN_DIR" >> "$GITHUB_PATH" + + - name: Verify installed tools + shell: bash + run: | + kops version + kubectl version --client + + # Authenticate to the existing kOps state store. + - name: Verify kOps state store access + shell: bash + env: + OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.KOPS_APPLICATION_CREDENTIAL_ID }} + OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.KOPS_APPLICATION_CREDENTIAL_SECRET }} + run: | + set -euo pipefail + + : "${OS_APPLICATION_CREDENTIAL_ID:?Missing kOps credential ID}" + : "${OS_APPLICATION_CREDENTIAL_SECRET:?Missing kOps credential secret}" + : "${KOPS_STATE_STORE:?Missing kOps state store}" + + kops get cluster einalien.k8s.local \ + --state="$KOPS_STATE_STORE" > /dev/null + + echo "kOps state store access verified." + + # Generate short-lived Kubernetes credentials. + - name: Generate Kubernetes kubeconfig + shell: bash + env: + OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.KOPS_APPLICATION_CREDENTIAL_ID }} + OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.KOPS_APPLICATION_CREDENTIAL_SECRET }} + run: | + set -euo pipefail + + KUBECONFIG_FILE="$RUNNER_TEMP/assignment2-prod-kubeconfig" + umask 077 + + kops export kubeconfig einalien.k8s.local \ + --admin=1h \ + --state="$KOPS_STATE_STORE" \ + --kubeconfig="$KUBECONFIG_FILE" + + test -s "$KUBECONFIG_FILE" + chmod 600 "$KUBECONFIG_FILE" + + KUBECONFIG="$KUBECONFIG_FILE" kubectl config current-context + + echo "KUBECONFIG=$KUBECONFIG_FILE" >> "$GITHUB_ENV" + echo "KUBE_CONFIG_PATH=$KUBECONFIG_FILE" >> "$GITHUB_ENV" + + # Confirm access to the Kubernetes state backend. + - name: Verify Kubernetes state access + shell: bash + run: | + set -euo pipefail + + kubectl --request-timeout=15s get --raw=/readyz + kubectl --request-timeout=15s get namespace iac + + # Check permissions needed by the backend. + for VERB in get list create update patch; do + kubectl auth can-i "$VERB" secrets -n iac --quiet + done + + kubectl auth can-i create leases.coordination.k8s.io -n iac --quiet + + echo "Kubernetes backend access verified." + + # PROD may have no state yet. + # Do not require existing managed resources. + - name: Initialize PROD remote state + shell: bash + run: | + set -euo pipefail + + for STACK in network frontend; do + STACK_DIR="environments/prod/$STACK" + + echo "Initializing PROD $STACK backend..." + + tofu -chdir="$STACK_DIR" init \ + -reconfigure \ + -input=false \ + -lockfile=readonly \ + -no-color + done + + echo "PROD backends initialized." + + # Deploy network before frontend. + # Only permit non-destructive infrastructure changes. + - name: Deploy PROD infrastructure + shell: bash + env: + TF_IN_AUTOMATION: "true" + TF_VAR_admin_cidr: ${{ secrets.ADMIN_CIDR }} + TF_VAR_ssh_key_name: ${{ vars.SSH_KEY_NAME }} + run: | + set -euo pipefail + umask 077 + + # Verify required variables. + : "${TF_VAR_admin_cidr:?Missing ADMIN_CIDR}" + : "${TF_VAR_ssh_key_name:?Missing SSH_KEY_NAME}" + + for STACK in network frontend; do + STACK_DIR="environments/prod/$STACK" + + PLAN_FILE="$RUNNER_TEMP/prod-$STACK.tfplan" + PLAN_JSON="$RUNNER_TEMP/prod-$STACK.plan.json" + PLAN_LOG="$RUNNER_TEMP/prod-$STACK.plan.log" + APPLY_LOG="$RUNNER_TEMP/prod-$STACK.apply.log" + + echo "::group::Deploy PROD $STACK" + + # Generate a saved plan. + set +e + tofu -chdir="$STACK_DIR" plan \ + -var-file="deployment.tfvars" \ + -out="$PLAN_FILE" \ + -input=false \ + -no-color \ + -lock-timeout=5m \ + -detailed-exitcode > "$PLAN_LOG" 2>&1 + EXIT_CODE=$? + set -e + + # Handle planning errors. + if [ "$EXIT_CODE" -ne 0 ] && [ "$EXIT_CODE" -ne 2 ]; then + echo "::error::PROD $STACK planning failed." + exit 1 + fi + + # Skip apply when there are no changes. + if [ "$EXIT_CODE" -eq 0 ]; then + echo "PROD $STACK: No changes required." + echo "::endgroup::" + continue + fi + + # Convert the saved plan into JSON. + test -s "$PLAN_FILE" + + tofu -chdir="$STACK_DIR" show -json \ + "$PLAN_FILE" > "$PLAN_JSON" + + # Only allow non-destructive resource actions. + if ! jq -e ' + (.format_version | type == "string") and + (.resource_changes | type == "array") and + all(.resource_changes[]?; + (.change.actions == ["no-op"] or + .change.actions == ["read"] or + .change.actions == ["create"] or + .change.actions == ["update"]) + ) + ' "$PLAN_JSON" > /dev/null; then + echo "::error::PROD $STACK contains invalid or destructive changes." + echo "Automatic apply has been blocked." + exit 1 + fi + + # Display resource actions without exposing values. + echo "Planned PROD $STACK changes:" + + jq -r ' + .resource_changes[]? + | select(.change.actions != ["no-op"]) + | "\(.address): \(.change.actions | join(", "))" + ' "$PLAN_JSON" + + # Apply the exact saved plan. + echo "Applying PROD $STACK..." + + if ! tofu -chdir="$STACK_DIR" apply \ + -input=false \ + -no-color \ + -lock-timeout=5m \ + "$PLAN_FILE" > "$APPLY_LOG" 2>&1; then + echo "::error::PROD $STACK apply failed." + exit 1 + fi + + echo "PROD $STACK deployed successfully." + echo "::endgroup::" + done + + echo "PROD infrastructure deployment completed." + + # Remove temporary credentials, plans and logs. + - name: Clean up temporary files + if: always() + shell: bash + run: | + rm -f "$RUNNER_TEMP/assignment2-prod-kubeconfig" + + rm -f "$RUNNER_TEMP"/prod-*.tfplan + rm -f "$RUNNER_TEMP"/prod-*.plan.json + rm -f "$RUNNER_TEMP"/prod-*.plan.log + rm -f "$RUNNER_TEMP"/prod-*.apply.log \ No newline at end of file From bbf387d064f31c08fb865b3ca99817c8aa17d666 Mon Sep 17 00:00:00 2001 From: eili1s <183522504+eili1s@users.noreply.github.com> Date: Sun, 1 Nov 2026 23:00:59 +0100 Subject: [PATCH 3/4] style(tofu): format frontend deployment variables --- environments/prod/frontend/deployment.tfvars | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environments/prod/frontend/deployment.tfvars b/environments/prod/frontend/deployment.tfvars index 2582fb1..c1dc815 100644 --- a/environments/prod/frontend/deployment.tfvars +++ b/environments/prod/frontend/deployment.tfvars @@ -4,6 +4,6 @@ frontend_count = 1 frontend_image = "Debian 13 (Trixie) stable amd64" frontend_flavor = "gx1.1c1r" -http_cidr = "0.0.0.0/0" +http_cidr = "0.0.0.0/0" external_network_name = "ntnu-internal" \ No newline at end of file From 3d574fd622ee8b774e1c6c2d717233e42cddc10d Mon Sep 17 00:00:00 2001 From: eili1s <183522504+eili1s@users.noreply.github.com> Date: Sun, 1 Nov 2026 23:05:14 +0100 Subject: [PATCH 4/4] fix(cd): remove workflow dispatch inputs to satisfy Checkov --- .github/workflows/deploy.yml | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml index 99a821c..ab01621 100644 --- a/.github/workflows/deploy.yml +++ b/.github/workflows/deploy.yml @@ -7,12 +7,6 @@ on: branches: [main] workflow_dispatch: - inputs: - deploy_prod: - description: "Deploy to PROD after TEST and STAGE" - type: boolean - required: true - default: false # Prevent overlapping infrastructure deployments. # Do not cancel an active deployment, since OpenTofu may be modifying resources. @@ -648,8 +642,7 @@ jobs: # with the deploy_prod checkbox selected. if: >- github.event_name == 'workflow_dispatch' && - github.ref == 'refs/heads/main' && - inputs.deploy_prod == true + github.ref == 'refs/heads/main' runs-on: [self-hosted, linux, assignment2] timeout-minutes: 45