Fix: remove hardcoded path to kubeconfig file

.github/workflows/ci-pipeline.yaml

@@ -109,6 +109,7 @@ jobs:
         run: |
           (cd ./deployment && kustomize edit set image aksrepos.azurecr.io/staging/aks-periscope=localhost:5000/periscope:foo)
           kubectl apply -f <(kustomize build ./deployment)
+          kubectl -n aks-periscope describe ds aks-periscope
           kubectl -n aks-periscope wait po --all --for condition=ready --timeout=60s
       - name: Go tests
         run: go test -v -race -coverprofile=coverage.out -covermode=atomic ./...

deployment/examples/kustomization_storage_account.yaml

@@ -1,14 +1,21 @@
+# This is an example file to use an Azure Storage Account to export data
+# 3 values are required:
+# - AZURE_BLOB_SAS_KEY
+# - AZURE_BLOB_ACCOUNT_NAME
+# - AZURE_BLOB_CONTAINER_NAME: name of the container where the data will be exported
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 
+namespace: aks-periscope
+
 resources:
-- https://github.com/Azure/aks-periscope/blob/master/deployment/kustomization.yaml
+- https://github.com/Azure/aks-periscope/deployment//
 
 secretGenerator:
 - name: azureblob-secret
   literals:
-  - AZURE_BLOB_SAS_KEY=<base 64 encoded value>
-
+  - AZURE_BLOB_SAS_KEY=<?sv=&ss=&srt=&sp=&se=&st=&spr=&sig=>
+       
 patches:
 - target:
     group: apps
@@ -17,10 +24,12 @@ patches:
     version: v1
   patch: |-
     - op: add
-      path: '/spec/template/spec/containers/0/env/-'
+      path: '/spec/template/spec/containers/0/env'
       value:
-        name: AZURE_BLOB_ACCOUNT_NAME
-        value: <name>
+        - name: AZURE_BLOB_ACCOUNT_NAME
+          value: <name>
+        - name: AZURE_BLOB_CONTAINER_NAME
+          value: <name>
 - target:
     group: apps
     kind: DaemonSet

pkg/collector/networkoutbound_collector.go

@@ -5,8 +5,6 @@ import (
 	"fmt"
 	"net"
 	"time"
-
-	"github.com/Azure/aks-periscope/pkg/utils"
 )
 
 type networkOutboundType struct {
@@ -39,11 +37,6 @@ func (collector *NetworkOutboundCollector) GetName() string {
 
 // Collect implements the interface method
 func (collector *NetworkOutboundCollector) Collect() error {
-	APIServerFQDN, err := utils.GetAPIServerFQDN()
-	if err != nil {
-		return err
-	}
-
 	outboundTypes := []networkOutboundType{}
 	outboundTypes = append(outboundTypes,
 		networkOutboundType{
@@ -57,12 +50,6 @@ func (collector *NetworkOutboundCollector) Collect() error {
 			URL:  "kubernetes.default.svc.cluster.local:443",
 		},
 	)
-	outboundTypes = append(outboundTypes,
-		networkOutboundType{
-			Type: "AKS Tunnel",
-			URL:  APIServerFQDN + ":443",
-		},
-	)
 	outboundTypes = append(outboundTypes,
 		networkOutboundType{
 			Type: "Azure Container Registry",
@@ -78,7 +65,7 @@ func (collector *NetworkOutboundCollector) Collect() error {
 
 	for _, outboundType := range outboundTypes {
 		timeout := time.Duration(5 * time.Second)
-		_, err = net.DialTimeout("tcp", outboundType.URL, timeout)
+		_, err := net.DialTimeout("tcp", outboundType.URL, timeout)
 
 		status := "Connected"
 		if err != nil {

pkg/exporter/azureblob_exporter.go

@@ -15,10 +15,6 @@ import (
 	"github.com/Azure/azure-storage-blob-go/azblob"
 )
 
-const (
-	maxContainerNameLength = 63
-)
-
 // AzureBlobExporter defines an Azure Blob Exporter
 type AzureBlobExporter struct {
 	hostname     string
@@ -33,23 +29,18 @@ func NewAzureBlobExporter(creationTime, hostname string) *AzureBlobExporter {
 }
 
 func createContainerURL() (azblob.ContainerURL, error) {
-	APIServerFQDN, err := utils.GetAPIServerFQDN()
-	if err != nil {
-		return azblob.ContainerURL{}, err
-	}
+	accountName := os.Getenv("AZURE_BLOB_ACCOUNT_NAME")
+	sasKey := os.Getenv("AZURE_BLOB_SAS_KEY")
+	containerName := os.Getenv("AZURE_BLOB_CONTAINER_NAME")
 
-	containerName := strings.Replace(APIServerFQDN, ".", "-", -1)
-	containerLen := strings.Index(containerName, "-hcp-")
-	if containerLen == -1 {
-		containerLen = maxContainerNameLength
+	if accountName == "" || sasKey == "" || containerName == "" {
+		log.Print("Storage Account information were not provided. Export to Azure Storage Account will be skiped.")
+		return azblob.ContainerURL{}, nil
 	}
-	containerName = strings.TrimRight(containerName[:containerLen], "-")
 
 	ctx := context.Background()
 
 	pipeline := azblob.NewPipeline(azblob.NewAnonymousCredential(), azblob.PipelineOptions{})
-	accountName := os.Getenv("AZURE_BLOB_ACCOUNT_NAME")
-	sasKey := os.Getenv("AZURE_BLOB_SAS_KEY")
 
 	ses := utils.GetStorageEndpointSuffix()
 	url, err := url.Parse(fmt.Sprintf("https://%s.blob.%s/%s%s", accountName, ses, containerName, sasKey))

pkg/utils/helper.go

@@ -3,7 +3,6 @@ package utils
 import (
 	"bytes"
 	"encoding/json"
-	"errors"
 	"fmt"
 	"io/ioutil"
 	"log"
@@ -132,28 +131,6 @@ func GetHostName() (string, error) {
 	return hostName.HostName, nil
 }
 
-// GetAPIServerFQDN gets the API Server FQDN from the kubeconfig file
-func GetAPIServerFQDN() (string, error) {
-	output, err := RunCommandOnHost("cat", "/var/lib/kubelet/kubeconfig")
-
-	if err != nil {
-		return "", fmt.Errorf("Can't open kubeconfig file: %+v", err)
-	}
-
-	lines := strings.Split(output, "\n")
-	for _, line := range lines {
-		index := strings.Index(line, "server: ")
-		if index >= 0 {
-			fqdn := line[index+len("server: "):]
-			fqdn = strings.Replace(fqdn, "https://", "", -1)
-			fqdn = strings.Replace(fqdn, ":443", "", -1)
-			return fqdn, nil
-		}
-	}
-
-	return "", errors.New("Could not find server definitions in kubeconfig")
-}
-
 // RunCommandOnHost runs a command on host system
 func RunCommandOnHost(command string, arg ...string) (string, error) {
 	args := []string{"--target", "1", "--mount", "--uts", "--ipc", "--net", "--pid"}