Merge pull request #1185 from itamar-marom/feature/add-tfvarspaths-spec2

Feature/add tfvarspaths spec2

.github/workflows/build-and-publish.yaml

@@ -10,7 +10,7 @@ permissions:
 
 env:
   CONTROLLER: ${{ github.event.repository.name }}
-  LIBCRYPTO_VERSION: "3.1.4-r4"
+  LIBCRYPTO_VERSION: "3.1.4-r5"
 
 jobs:
   test:

.github/workflows/release-runners.yaml

@@ -18,7 +18,7 @@ permissions:
 env:
   VERSION: ${{ github.event.inputs.version }}
   BUILD_DATE: ${{ github.event.inputs.build_date }}
-  LIBCRYPTO_VERSION: "3.1.4-r4"
+  LIBCRYPTO_VERSION: "3.1.4-r5"
 
 jobs:
   release-base:

.github/workflows/release.yaml

@@ -15,7 +15,7 @@ permissions:
 
 env:
   CONTROLLER: ${{ github.event.repository.name }}
-  LIBCRYPTO_VERSION: "3.1.4-r4"
+  LIBCRYPTO_VERSION: "3.1.4-r5"
 
 jobs:
   build-push:

Makefile

@@ -13,7 +13,7 @@ BUILD_VERSION ?= $(shell git describe --tags $$(git rev-list --tags --max-count=
 # - .github/workflows/release-runners.yaml
 # - .github/workflows/release.yaml
 # - Tiltfile
-LIBCRYPTO_VERSION ?= 3.1.4-r4
+LIBCRYPTO_VERSION ?= 3.1.4-r5
 
 # source controller version
 SOURCE_VER ?= v1.0.0-rc.1

Tiltfile

@@ -8,7 +8,7 @@ tfNamespace      = "terraform"
 buildSHA         = str(local('git rev-parse --short HEAD')).rstrip('\n')
 buildVersionRef  = str(local('git rev-list --tags --max-count=1')).rstrip('\n')
 buildVersion     = str(local("git describe --tags ${buildVersionRef}")).rstrip('\n')
-LIBCRYPTO_VERSION = "3.1.4-r4"
+LIBCRYPTO_VERSION = "3.1.4-r5"
 
 if os.path.exists('Tiltfile.local'):
    include('Tiltfile.local')

api/v1alpha2/terraform_types.go

@@ -128,6 +128,10 @@ type TerraformSpec struct {
 	// +optional
 	Values *apiextensionsv1.JSON `json:"values,omitempty"`
 
+	// TfVarsFiles loads all given .tfvars files. It copycats the -var-file functionality.
+	// +optional
+	TfVarsFiles []string `json:"tfVarsFiles,omitempty"`
+
 	// List of all configuration files to be created in initialization.
 	// +optional
 	FileMappings []FileMapping `json:"fileMappings,omitempty"`

config/crd/bases/infra.contrib.fluxcd.io_terraforms.yaml

@@ -9812,6 +9812,12 @@ spec:
                 items:
                   type: string
                 type: array
+              tfVarsFiles:
+                description: TfVarsFiles loads all given .tfvars files. It copycats
+                  the -var-file functionality.
+                items:
+                  type: string
+                type: array
               tfstate:
                 description: TFStateSpec allows the user to set ForceUnlock
                 properties:

controllers/suite_test.go

@@ -292,6 +292,9 @@ func setupRouteHandlers() {
 	server.RouteToHandler("GET", "/tf-multi-resources.tar.gz", func(writer http.ResponseWriter, request *http.Request) {
 		http.ServeFile(writer, request, "data/tf-multi-resources.tar.gz")
 	})
+	server.RouteToHandler("GET", "/terraform-tfvars-files.tar.gz", func(writer http.ResponseWriter, request *http.Request) {
+		http.ServeFile(writer, request, "data/terraform-tfvars-files.tar.gz")
+	})
 	// for health check http test
 	server.RouteToHandler("GET", "/get", func(writer http.ResponseWriter, request *http.Request) {
 		ghttp.RespondWith(http.StatusOK, "ok")