Merge pull request #386 from stakater/update-makefile

Fix Pipeline Failure due to old test packages and kind version

.github/workflows/pull_request.yml

@@ -14,7 +14,7 @@ env:
   DOCKER_FILE_PATH: Dockerfile
   GOLANG_VERSION: 1.16
   KUBERNETES_VERSION: "1.20.2"
-  KIND_VERSION: "0.10.0"
+  KIND_VERSION: "0.11.1"
 
 jobs:
   build:

.github/workflows/push.yml

@@ -18,7 +18,7 @@ env:
   OPERATOR_SDK_VERSION: "1.6.2"
   KUSTOMIZE_VERSION: "3.5.4"
   KUBERNETES_VERSION: "1.20.2"
-  KIND_VERSION: "0.10.0"
+  KIND_VERSION: "0.11.1"
   HELM_REGISTRY_URL: "https://stakater.github.io/stakater-charts"
 
 jobs:

Makefile

@@ -124,7 +124,7 @@ controller-gen: ## Download controller-gen locally if necessary.
 
 KUSTOMIZE = $(shell pwd)/bin/kustomize
 kustomize: ## Download kustomize locally if necessary.
-	$(call go-get-tool,$(KUSTOMIZE),sigs.k8s.io/kustomize/kustomize/v3@v3.8.7)
+	$(call go-get-tool,$(KUSTOMIZE),sigs.k8s.io/kustomize/kustomize/v4@v4.5.4)
 
 # go-get-tool will 'go get' any package $2 and install it to $1.
 PROJECT_DIR := $(shell dirname $(abspath $(lastword $(MAKEFILE_LIST))))

pkg/monitors/gcloud/gcloud-monitor_test.go

@@ -18,10 +18,10 @@ func TestAddMonitorWithCorrectValues(t *testing.T) {
 	}
 
 	service.Setup(*provider)
-	m := models.Monitor{Name: "google-test", URL: "https://google1.com/"}
+	m := models.Monitor{Name: "google-test-gcloud", URL: "https://google1.com/"}
 	service.Add(m)
 
-	mRes, err := service.GetByName("google-test")
+	mRes, err := service.GetByName("google-test-gcloud")
 	if err != nil {
 		t.Error("Unable to get monitor by name with error", err)
 	}
@@ -36,6 +36,7 @@ func TestAddMonitorWithCorrectValues(t *testing.T) {
 			continue
 		}
 		inList = true
+		break
 	}
 	if !inList {
 		t.Error("Monitor should've been in list ")
@@ -60,10 +61,10 @@ func TestUpdateMonitorWithCorrectValues(t *testing.T) {
 	}
 	service.Setup(*provider)
 
-	m := models.Monitor{Name: "google-test", URL: "https://google.com/"}
+	m := models.Monitor{Name: "google-test-gcloud", URL: "https://google.com/"}
 	service.Add(m)
 
-	mRes, err := service.GetByName("google-test")
+	mRes, err := service.GetByName("google-test-gcloud")
 	if err != nil {
 		t.Error("Unable to get monitor by name with error", err)
 	}
@@ -72,12 +73,12 @@ func TestUpdateMonitorWithCorrectValues(t *testing.T) {
 		t.Error("URL and name should be the same")
 	}
 
-	mRes.Name = "google-test2"
+	mRes.Name = "google-test-gcloud2"
 	mRes.URL = "https://google.com/test"
 
 	service.Update(*mRes)
 
-	mRes, err = service.GetByName("google-test2")
+	mRes, err = service.GetByName("google-test-gcloud2")
 
 	if err != nil {
 		t.Error("Error: " + err.Error())

pkg/monitors/statuscake/statuscake-monitor_test.go

@@ -21,10 +21,10 @@ func TestAddMonitorWithCorrectValues(t *testing.T) {
 		return
 	}
 	service.Setup(*provider)
-	m := models.Monitor{Name: "google-test", URL: "https://google1.com"}
+	m := models.Monitor{Name: "google-test-statuscake", URL: "https://google1.com"}
 	service.Add(m)
 
-	mRes, err := service.GetByName("google-test")
+	mRes, err := service.GetByName("google-test-statuscake")
 
 	if err != nil {
 		t.Error("Error: " + err.Error())
@@ -54,10 +54,10 @@ func TestUpdateMonitorWithCorrectValues(t *testing.T) {
 	}
 	service.Setup(*provider)
 
-	m := models.Monitor{Name: "google-test", URL: "https://google.com"}
+	m := models.Monitor{Name: "google-test-statuscake", URL: "https://google.com"}
 	service.Add(m)
 
-	mRes, err := service.GetByName("google-test")
+	mRes, err := service.GetByName("google-test-statuscake")
 
 	if err != nil {
 		t.Error("Error: " + err.Error())
@@ -70,7 +70,7 @@ func TestUpdateMonitorWithCorrectValues(t *testing.T) {
 
 	service.Update(*mRes)
 
-	mRes, err = service.GetByName("google-test")
+	mRes, err = service.GetByName("google-test-statuscake")
 
 	if err != nil {
 		t.Error("Error: " + err.Error())