#127 fix deployment of OneAgent

pkg/lib/dynatrace.go

@@ -16,7 +16,7 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
-const DefaultOperatorVersion = "v0.5.2"
+const DefaultOperatorVersion = "v0.6.0"
 const sliResourceURI = "dynatrace/sli.yaml"
 const Throughput = "throughput"
 const ErrorRate = "error_rate"
@@ -232,9 +232,9 @@ func (dt *DynatraceHelper) GetDTCredentials() (*DTCredentials, error) {
 
 	dtCreds := &DTCredentials{}
 
-	dtCreds.Tenant = string(secret.Data["DT_TENANT"])
-	dtCreds.ApiToken = string(secret.Data["DT_API_TOKEN"])
-	dtCreds.PaaSToken = string(secret.Data["DT_PAAS_TOKEN"])
+	dtCreds.Tenant = strings.Trim(string(secret.Data["DT_TENANT"]), "\n")
+	dtCreds.ApiToken = strings.Trim(string(secret.Data["DT_API_TOKEN"]), "\n")
+	dtCreds.PaaSToken = strings.Trim(string(secret.Data["DT_PAAS_TOKEN"]), "\n")
 
 	return dtCreds, nil
 }

pkg/lib/one_agent.go

@@ -1,7 +1,6 @@
 package lib
 
 import (
-	"encoding/json"
 	"io/ioutil"
 	"net/http"
 	"os"
@@ -45,26 +44,7 @@ func (dt *DynatraceHelper) isDynatraceDeployed() bool {
 }
 
 func (dt *DynatraceHelper) deployDTOperator() error {
-	// get latest operator version
-	resp, err := http.Get("https://api.github.com/repos/dynatrace/dynatrace-oneagent-operator/releases/latest")
-	if err == nil {
-		defer resp.Body.Close()
-		body, err := ioutil.ReadAll(resp.Body)
-
-		operatorInfo := &dtOperatorReleaseInfo{}
-
-		err = json.Unmarshal(body, operatorInfo)
-
-		if err == nil {
-			dt.OperatorTag = operatorInfo.TagName
-		}
-	}
-	if dt.OperatorTag != "" {
-		dt.Logger.Info("Deploying Dynatrace operator " + dt.OperatorTag)
-	} else {
-		dt.Logger.Info("Could not fetch latest Dynatrace operator version. Using " + DefaultOperatorVersion + " per default.")
-		dt.OperatorTag = DefaultOperatorVersion
-	}
+	dt.OperatorTag = DefaultOperatorVersion
 
 	platform := os.Getenv("PLATFORM")