DK-1665 read write to vault path - fix build

Author: Mr Goran

common/vault.go

@@ -147,16 +147,6 @@ func authKubernetes(h *VaultHandler) (vault.AuthMethod, error) {
 	})
 }
 
-func convertTLSSpec(spec v1beta1.VaultTLSSpec) *vaultapi.TLSConfig {
-	return &vaultapi.TLSConfig{
-		CACert:        spec.CACert,
-		ClientCert:    spec.ClientCert,
-		ClientKey:     spec.ClientKey,
-		TLSServerName: spec.ServerName,
-		Insecure:      spec.Insecure,
-	}
-}
-
 // FromCredential creates a vault client handler
 // If the binding holds no vault address it will fallback to the env VAULT_ADDRESS
 func FromCredential(credential *DatabaseCredential, logger logr.Logger) (*VaultHandler, error) {
@@ -198,62 +188,6 @@ type VaultHandler struct {
 	logger logr.Logger
 }
 
-// ApplySecret applies the desired secret to vault
-//func (h *VaultHandler) ApplySecret(binding *v1beta1.VaultBinding, secret *corev1.Secret) (bool, error) {
-//	var writeBack bool
-//
-//	// TODO Is there such a thing as locking the path so we don't overwrite fields which would be changed at the same time?
-//	data, err := h.Read(binding.Spec.Path)
-//	if err != nil {
-//		return writeBack, err
-//	}
-//
-//	// Loop through all mapping field and apply to the vault path data
-//	for _, field := range binding.Spec.Fields {
-//		k8sField := field.Name
-//		vaultField := k8sField
-//		if field.Rename != "" {
-//			vaultField = field.Rename
-//		}
-//
-//		h.logger.Info("applying k8s field to vault", "k8sField", k8sField, "vaultField", vaultField, "vaultPath", binding.Spec.Path)
-//
-//		// If k8s secret field does not exists return an error
-//		k8sValue, ok := secret.Data[k8sField]
-//		if !ok {
-//			return writeBack, ErrK8sSecretFieldNotAvailable
-//		}
-//
-//		secret := string(k8sValue)
-//
-//		_, existingField := data[vaultField]
-//
-//		switch {
-//		case !existingField:
-//			h.logger.Info("found new field to write", "vaultField", vaultField)
-//			data[vaultField] = secret
-//			writeBack = true
-//		case data[vaultField] == secret:
-//			h.logger.Info("skipping field, no update required", "vaultField", vaultField)
-//		case binding.Spec.ForceApply == true:
-//			data[vaultField] = secret
-//			writeBack = true
-//		default:
-//			h.logger.Info("skipping field, it already exists in vault and force apply is disabled", "vaultField", vaultField)
-//		}
-//	}
-//
-//	if writeBack == true {
-//		// Finally write the secret back
-//		_, err = h.c.Logical().Write(binding.Spec.Path, data)
-//		if err != nil {
-//			return writeBack, err
-//		}
-//	}
-//
-//	return writeBack, nil
-//}
-
 // Read vault path and return data map
 // Return empty map if no data exists
 func (h *VaultHandler) Read(path string) (map[string]interface{}, error) {

config/manager/kustomization.yaml

@@ -4,5 +4,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 images:
 - name: controller
-  newName: nexus.doodle.com:5000/devops/kubedb
-  newTag: "0.03"
+  newName: nexus-docker.minikube/kubedb
+  newTag: goran-test

go.mod

@@ -3,7 +3,6 @@ module github.com/doodlescheduling/kubedb
 go 1.13
 
 require (
-	cloud.google.com/go v0.38.0
 	github.com/go-logr/logr v0.1.0
 	github.com/golang/snappy v0.0.2 // indirect
 	github.com/hashicorp/errwrap v1.1.0