Merge branch 'master' into configmaps-to-secrets

.version

@@ -1 +1 @@
-v1.0.67
+v1.0.68

deployments/kubernetes/chart/ingressmonitorcontroller/Chart.yaml

@@ -3,7 +3,7 @@
 apiVersion: v1
 name: ingressmonitorcontroller
 description: IngressMonitorController chart that runs on kubernetes
-version: v1.0.67
+version: v1.0.68
 keywords:
   - IngressMonitorController
   - kubernetes

deployments/kubernetes/chart/ingressmonitorcontroller/values.yaml

@@ -13,26 +13,26 @@ ingressMonitorController:
     provider: stakater
   deployment:
     labels:
-      version: "v1.0.67"
+      version: "v1.0.68"
     annotations:
       configmap.reloader.stakater.com/reload: ingressmonitorcontroller
   config:
     labels:
-      version: "v1.0.67"
+      version: "v1.0.68"
   rbac:
     create: true
   # Service account config for the agent pods
   serviceAccount:
     # Specifies whether a ServiceAccount should be created
     create: true
     labels:
-      version: "v1.0.67"
+      version: "v1.0.68"
     # The name of the ServiceAccount to use.
     # If not set and create is true, a name is generated using the fullname template
     name: ingressmonitorcontroller
   image:
     name: stakater/ingressmonitorcontroller
-    tag: "v1.0.67"
+    tag: "v1.0.68"
     pullPolicy: IfNotPresent
   configFilePath: /etc/IngressMonitorController/config.yaml
   data:

deployments/kubernetes/ingressmonitorcontroller.yaml

@@ -7,14 +7,13 @@ metadata:
   annotations:
   labels:
     app: ingressmonitorcontroller
-    chart: "ingressmonitorcontroller-v1.0.67"
+    chart: "ingressmonitorcontroller-v1.0.68"
     release: "RELEASE-NAME"
     heritage: "Tiller"
-    version: v1.0.67
+    version: v1.0.68
 
     group: com.stakater.platform
     provider: stakater
-
 data:
   config.yaml: |-
     providers:
@@ -99,10 +98,10 @@ metadata:
 
   labels:
     app: ingressmonitorcontroller
-    chart: "ingressmonitorcontroller-v1.0.67"
+    chart: "ingressmonitorcontroller-v1.0.68"
     release: "RELEASE-NAME"
     heritage: "Tiller"
-    version: v1.0.67
+    version: v1.0.68
 
     group: com.stakater.platform
     provider: stakater
@@ -151,4 +150,3 @@ spec:
 
 ---
 # Source: ingressmonitorcontroller/templates/rolebinding.yaml
-

deployments/kubernetes/manifests/configmap.yaml

@@ -7,10 +7,10 @@ metadata:
   annotations:
   labels:
     app: ingressmonitorcontroller
-    chart: "ingressmonitorcontroller-v1.0.67"
+    chart: "ingressmonitorcontroller-v1.0.68"
     release: "RELEASE-NAME"
     heritage: "Tiller"
-    version: v1.0.67
+    version: v1.0.68
 
     group: com.stakater.platform
     provider: stakater

deployments/kubernetes/manifests/deployment.yaml

@@ -8,10 +8,10 @@ metadata:
 
   labels:
     app: ingressmonitorcontroller
-    chart: "ingressmonitorcontroller-v1.0.67"
+    chart: "ingressmonitorcontroller-v1.0.68"
     release: "RELEASE-NAME"
     heritage: "Tiller"
-    version: v1.0.67
+    version: v1.0.68
 
     group: com.stakater.platform
     provider: stakater
@@ -31,10 +31,10 @@ spec:
     metadata:
       labels:
         app: ingressmonitorcontroller
-        chart: "ingressmonitorcontroller-v1.0.67"
+        chart: "ingressmonitorcontroller-v1.0.68"
         release: "RELEASE-NAME"
         heritage: "Tiller"
-        version: v1.0.67
+        version: v1.0.68
 
         group: com.stakater.platform
         provider: stakater
@@ -44,7 +44,7 @@ spec:
       - env:
         - name: CONFIG_FILE_PATH
           value: /etc/IngressMonitorController/config.yaml
-        image: "stakater/ingressmonitorcontroller:v1.0.67"
+        image: "stakater/ingressmonitorcontroller:v1.0.68"
         imagePullPolicy: IfNotPresent
         name: ingressmonitorcontroller
         volumeMounts:

deployments/kubernetes/manifests/serviceaccount.yaml

@@ -6,10 +6,10 @@ kind: ServiceAccount
 metadata:
   labels:
     app: ingressmonitorcontroller
-    chart: "ingressmonitorcontroller-v1.0.67"
+    chart: "ingressmonitorcontroller-v1.0.68"
     release: "RELEASE-NAME"
     heritage: "Tiller"
-    version: v1.0.67
+    version: v1.0.68
 
     group: com.stakater.platform
     provider: stakater

pkg/monitors/updown/updown-monitor.go

@@ -10,7 +10,6 @@ import (
 
 	"github.com/antoineaugusti/updown"
 	"github.com/stakater/IngressMonitorController/pkg/config"
-	"github.com/stakater/IngressMonitorController/pkg/constants"
 	"github.com/stakater/IngressMonitorController/pkg/models"
 )
 
@@ -65,7 +64,7 @@ func (updownService *UpdownMonitorService) GetAll() []models.Monitor {
 	updownChecks, httpResponse, err := updownService.client.Check.List()
 	log.Println("Monitors (updown checks) object list has been pulled")
 
-	if (httpResponse.StatusCode == constants.StatusCodes["OK"]) && (err == nil) {
+	if (httpResponse.StatusCode == http.StatusOK) && (err == nil) {
 		log.Println("Populating monitors list using the updownChecks object given in updownChecks list")
 
 		// populating a monitors slice using the updownChecks objects given in updownChecks slice
@@ -118,10 +117,10 @@ func (service *UpdownMonitorService) Add(updownMonitor models.Monitor) {
 	_, httpResponse, err := service.client.Check.Add(updownCheckItemObj)
 	log.Println("Monitor addition request has been completed")
 
-	if (httpResponse.StatusCode == constants.StatusCodes["CREATED"]) && (err == nil) {
+	if (httpResponse.StatusCode == http.StatusCreated) && (err == nil) {
 		log.Printf("Monitor %s has been added.", updownMonitor.Name)
 
-	} else if (httpResponse.StatusCode == constants.StatusCodes["BAD_REQUEST"]) && (err != nil) {
+	} else if (httpResponse.StatusCode == http.StatusBadRequest) && (err != nil) {
 		log.Printf("Monitor %s is not created because of invalid parameters or it exists.", updownMonitor.Name)
 
 	} else {
@@ -226,7 +225,7 @@ func (service *UpdownMonitorService) Update(updownMonitor models.Monitor) {
 	_, httpResponse, err := service.client.Check.Update(updownMonitor.ID, httpCheckItemObj)
 	log.Println("Updown's check Update request has been completed")
 
-	if (httpResponse.StatusCode == constants.StatusCodes["OK"]) && (err == nil) {
+	if (httpResponse.StatusCode == http.StatusOK) && (err == nil) {
 		log.Printf("Monitor %s has been updated with following parameters", updownMonitor.Name)
 
 	} else {
@@ -245,10 +244,10 @@ func (updownService *UpdownMonitorService) Remove(updownMonitor models.Monitor)
 	_, httpResponse, err := updownService.client.Check.Remove(updownMonitor.ID)
 	log.Println("Updown's check Remove request has been completed")
 
-	if (httpResponse.StatusCode == constants.StatusCodes["OK"]) && (err == nil) {
+	if (httpResponse.StatusCode == http.StatusOK) && (err == nil) {
 		log.Printf("Monitor %v has been deleted.", updownMonitor.Name)
 
-	} else if (httpResponse.StatusCode == constants.StatusCodes["NOT_FOUND"]) && (err != nil) {
+	} else if (httpResponse.StatusCode == http.StatusNotFound) && (err != nil) {
 		log.Printf("Monitor %v is not found.", updownMonitor.Name)
 
 	} else {

pkg/monitors/uptime/uptime-monitor_test.go

@@ -17,6 +17,10 @@ func TestGetAllMonitors(t *testing.T) {
 	if provider == nil {
 		panic("Failed to find provider")
 	}
+	// If test Config is passed skip the test
+	if provider.ApiKey == "API_KEY" {
+		return
+	}
 	service.Setup(*provider)
 	monitors := service.GetAll()
 	log.Println(monitors)
@@ -37,6 +41,10 @@ func TestAddMonitorWithCorrectValues(t *testing.T) {
 	if nil == provider {
 		panic("Failed to find provider")
 	}
+	// If test Config is passed skip the test
+	if provider.ApiKey == "API_KEY" {
+		return
+	}
 	service.Setup(*provider)
 
 	annotations := make(map[string]string)
@@ -69,6 +77,10 @@ func TestUpdateMonitorWithCorrectValues(t *testing.T) {
 	if provider == nil {
 		panic("Failed to find provider")
 	}
+	// If test Config is passed skip the test
+	if provider.ApiKey == "API_KEY" {
+		return
+	}
 	service.Setup(*provider)
 	annotations := make(map[string]string)
 	annotations["uptime.monitor.stakater.com/locations"] = "US-Central"
@@ -125,11 +137,14 @@ func TestAddMonitorWithIncorrectValues(t *testing.T) {
 
 	service := UpTimeMonitorService{}
 
-	provider := util.GetProviderWithName(config, "UptimeRobot")
+	provider := util.GetProviderWithName(config, "Uptime")
 	if provider == nil {
 		panic("Failed to find provider")
 	}
-
+	// If test Config is passed skip the test
+	if provider.ApiKey == "API_KEY" {
+		return
+	}
 	service.Setup(*provider)
 	annotations := make(map[string]string)
 	annotations["uptime.monitor.stakater.com/locations"] = "US-Central"