Merge pull request #51 from takutakahashi/update_processing

processing bool is missed
takutakahashi · Oct 15, 2020 · 1a2213a · 1a2213a
2 parents af9c529 + 97a9c1d
commit 1a2213a
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 6 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -1,3 +1,4 @@
 .envrc
 *.tfvars
 **/.terraform
+.ignore
diff --git a/Makefile b/Makefile
@@ -1,6 +1,6 @@
 
 # Image URL to use all building/pushing image targets
-IMG ?= takutakahashi/loadbalancer-controller:v0.3.1
+IMG ?= takutakahashi/loadbalancer-controller:v0.3.3
 # Produce CRDs that work back to Kubernetes 1.11 (no version conversion)
 CRD_OPTIONS ?= "crd:trivialVersions=true"
 
@@ -55,7 +55,7 @@ generate: controller-gen
 	$(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./..."
 
 # Build the docker image
-docker-build: test
+docker-build:
 	docker build . -t ${IMG}
 
 # Push the docker image

diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
@@ -5,4 +5,4 @@ kind: Kustomization
 images:
 - name: controller
   newName: takutakahashi/loadbalancer-controller
-  newTag: v0.3.1
+  newTag: dev-1015115903
diff --git a/pkg/terraform/terraform.go b/pkg/terraform/terraform.go
@@ -236,9 +236,6 @@ func (t TerraformClient) isProcessing() (bool, error) {
 		if !strings.Contains(job.Name, t.awsBackend.Name) {
 			continue
 		}
-		if !strings.Contains(job.Name, t.awsBackend.ResourceVersion) {
-			return true, nil
-		}
 		if job.Status.CompletionTime != nil {
 			return false, nil
 		}