Merge pull request #31 from schrodit/fix/minio-ssl

Add ssl support for s3 instances

charts/testmachinery/templates/deployment-tm-controller.yaml

@@ -37,6 +37,7 @@ spec:
       containers:
       - name: testmachinery-controller
         image: "{{ .Values.controller.image }}:{{ .Values.controller.tag }}"
+        imagePullPolicy: Always
 {{ if .Values.local.enabled }}
         command: ["/testmachinery-controller", "-insecure=true"]
 {{end}}

cmd/testrunner/cmd/runtemplate/run_template.go

@@ -36,6 +36,7 @@ var (
 	outputFilePath          string
 	elasticSearchConfigName string
 	s3Endpoint              string
+	s3SSL                   bool
 	concourseOnErrorDir     string
 
 	testrunChartPath         string
@@ -98,6 +99,7 @@ var runCmd = &cobra.Command{
 			OutputFile:          outputFilePath,
 			ESConfigName:        elasticSearchConfigName,
 			S3Endpoint:          s3Endpoint,
+			S3SSL:               s3SSL,
 			ConcourseOnErrorDir: concourseOnErrorDir,
 		}
 
@@ -161,6 +163,7 @@ func init() {
 	runCmd.Flags().StringVar(&outputFilePath, "output-file-path", "./testout", "The filepath where the summary should be written to.")
 	runCmd.Flags().StringVar(&elasticSearchConfigName, "es-config-name", "sap_internal", "The elasticsearch secret-server config name.")
 	runCmd.Flags().StringVar(&s3Endpoint, "s3-endpoint", os.Getenv("S3_ENDPOINT"), "S3 endpoint of the testmachinery cluster.")
+	runCmd.Flags().BoolVar(&s3SSL, "s3-ssl", false, "S3 has SSL enabled.")
 	runCmd.Flags().StringVar(&concourseOnErrorDir, "concourse-onError-dir", os.Getenv("ON_ERROR_DIR"), "On error dir which is used by Concourse.")
 
 	// parameter flags

pkg/testmachinery/garbagecollection/minio.go

@@ -32,7 +32,7 @@ func NewObjectStore() (*ObjectStore, error) {
 
 	cfg := testmachinery.GetConfig().ObjectStore
 
-	minioClient, err := minio.New(cfg.Endpoint, cfg.AccessKey, cfg.SecretKey, false)
+	minioClient, err := minio.New(cfg.Endpoint, cfg.AccessKey, cfg.SecretKey, cfg.SSL)
 	if err != nil {
 		return nil, err
 	}

pkg/testmachinery/types.go

@@ -56,6 +56,7 @@ type TmConfiguration struct {
 // ObjectStoreConfig is an object containing the ObjectStore specific configuration
 type ObjectStoreConfig struct {
 	Endpoint   string
+	SSL        bool
 	AccessKey  string
 	SecretKey  string
 	BucketName string

pkg/testrunner/result/output.go

@@ -40,7 +40,6 @@ func Output(config *Config, tmKubeconfigPath, namespace string, tr *tmv1beta1.Te
 	if config.OutputFile == "" {
 		return nil
 	}
-	var s3Endpoint = config.S3Endpoint
 
 	metadata.TestrunID = tr.Name
 
@@ -59,7 +58,7 @@ func Output(config *Config, tmKubeconfigPath, namespace string, tr *tmv1beta1.Te
 		return err
 	}
 
-	osConfig, err := getOSConfig(tmKubeconfigPath, s3Endpoint, namespace)
+	osConfig, err := getOSConfig(tmKubeconfigPath, namespace, config.S3Endpoint, config.S3SSL)
 	if err != nil {
 		log.Warnf("Cannot get exported Test results of steps: %s", err.Error())
 	} else {
@@ -125,7 +124,7 @@ func getTestrunSummary(tr *tmv1beta1.Testrun, metadata *Metadata) (*elasticsearc
 
 func getExportedDocuments(cfg *testmachinery.ObjectStoreConfig, status tmv1beta1.TestrunStatus, metadata *Metadata) []byte {
 
-	minioClient, err := minio.New(cfg.Endpoint, cfg.AccessKey, cfg.SecretKey, false)
+	minioClient, err := minio.New(cfg.Endpoint, cfg.AccessKey, cfg.SecretKey, cfg.SSL)
 	if err != nil {
 		log.Errorf("Error creating minio client %s: %s", cfg.Endpoint, err.Error())
 		return nil
@@ -226,7 +225,7 @@ func writeToFile(fielPath string, data []byte) error {
 	return nil
 }
 
-func getOSConfig(tmKubeconfigPath, minioEndpoint, namespace string) (*testmachinery.ObjectStoreConfig, error) {
+func getOSConfig(tmKubeconfigPath, namespace, minioEndpoint string, ssl bool) (*testmachinery.ObjectStoreConfig, error) {
 	clusterClient, err := kubernetes.NewClientFromFile(tmKubeconfigPath, nil, client.Options{})
 	if err != nil {
 		return nil, fmt.Errorf("Cannot create client for %s: %s", tmKubeconfigPath, err.Error())
@@ -242,6 +241,7 @@ func getOSConfig(tmKubeconfigPath, minioEndpoint, namespace string) (*testmachin
 
 	return &testmachinery.ObjectStoreConfig{
 		Endpoint:   minioEndpoint,
+		SSL:        ssl,
 		AccessKey:  string(minioSecrets.Data["accessKey"]),
 		SecretKey:  string(minioSecrets.Data["secretKey"]),
 		BucketName: minioConfig.Data["objectstore.bucketName"],

pkg/testrunner/result/types.go

@@ -22,15 +22,18 @@ import (
 
 // Config represents the configuration for collecting and storing results from a testrun.
 type Config struct {
-	// outputFilePath is the path where the testresult is written to.
+	// OutputFilePath is the path where the testresult is written to.
 	OutputFile string
 
-	// config name of the elastic search to store the test results.
+	// Config name of the elasticsearch instance to store the test results.
 	ESConfigName string
 
-	// Endpint of the s3 storage of the testmachinery.
+	// Endpoint of the s3 storage of the testmachinery.
 	S3Endpoint string
 
+	// S3SSL indicates whether the S3 instance is SSL secured or not.
+	S3SSL bool
+
 	// Path to the error directory of concourse to put the notify.cfg in.
 	ConcourseOnErrorDir string
 }