From 5247fd702d51086cb071968894e333abdbee8065 Mon Sep 17 00:00:00 2001 From: Eugene Date: Thu, 8 Apr 2021 15:16:02 -0700 Subject: [PATCH] deploy --- .github/workflows/deploy-secure-aks-baseline.yaml | 3 ++- enterprise_scale/construction_sets/aks/flux.tf | 2 +- enterprise_scale/construction_sets/aks/flux_variables.tf | 4 ---- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/deploy-secure-aks-baseline.yaml b/.github/workflows/deploy-secure-aks-baseline.yaml index db77773..0f5fe2f 100644 --- a/.github/workflows/deploy-secure-aks-baseline.yaml +++ b/.github/workflows/deploy-secure-aks-baseline.yaml @@ -21,7 +21,8 @@ env: ARM_TENANT_ID: ${{ secrets.TENANT }} PREFIX: ${{ secrets.RESOURCE_PREFIX }} ENVIRONMENT: ${{ secrets.ENVIRONMENT }} - TF_VAR_github_repo: ${{ github.repository }} + TF_VAR_repository_name: ${{ github.repository }} + TF_VAR_github_owner: ${{ github.repository_owner }} TF_VAR_github_token: ${{secrets.GITHUB_TOKEN}} jobs: diff --git a/enterprise_scale/construction_sets/aks/flux.tf b/enterprise_scale/construction_sets/aks/flux.tf index 968a54a..c3051d3 100644 --- a/enterprise_scale/construction_sets/aks/flux.tf +++ b/enterprise_scale/construction_sets/aks/flux.tf @@ -21,7 +21,7 @@ data "flux_install" "main" { data "flux_sync" "main" { target_path = var.target_sync_path - url = "https://github.com/${var.github_repo}.git" + url = "https://github.com/${var.repository_name}.git" branch = var.branch secret = var.flux_auth_secret } diff --git a/enterprise_scale/construction_sets/aks/flux_variables.tf b/enterprise_scale/construction_sets/aks/flux_variables.tf index b93f13b..2614bf8 100644 --- a/enterprise_scale/construction_sets/aks/flux_variables.tf +++ b/enterprise_scale/construction_sets/aks/flux_variables.tf @@ -57,8 +57,4 @@ variable "k8s_configPath" { default = "" } -variable "github_repo" { - type = string - default = "" -}