Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OADP-205 Fetch and decode secret for registry plugin environment #154

Merged
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 31 additions & 4 deletions velero-plugins/imagestream/shared.go
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package imagestream

import (
"context"
"errors"
"fmt"

Expand All @@ -10,7 +11,9 @@ import (
"github.com/konveyor/openshift-velero-plugin/velero-plugins/common"
"github.com/sirupsen/logrus"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
k8stypes "k8s.io/apimachinery/pkg/types"
corev1client "k8s.io/client-go/kubernetes/typed/core/v1"
)

var (
Expand Down Expand Up @@ -92,16 +95,40 @@ func GetRegistryEnvsForLocation(location string, namespace string) ([]string, er
if err != nil {
return nil, errors.New(fmt.Sprintf("errors getting registry env vars: %v", err))
}
return coreV1EnvVarArrToStringArr(envVars), nil
return coreV1EnvVarArrToStringArr(envVars, bsl.Namespace), nil
}

func coreV1EnvVarArrToStringArr(envVars []corev1.EnvVar) []string {
func coreV1EnvVarArrToStringArr(envVars []corev1.EnvVar, namespace string) []string {
var envVarsStr []string
for _, envVar := range envVars {
envVarsStr = append(envVarsStr, coreV1EnvVarToString(envVar))
envVarsStr = append(envVarsStr, coreV1EnvVarToString(envVar, namespace))
}
return envVarsStr
}
func coreV1EnvVarToString(envVar corev1.EnvVar) string {
func coreV1EnvVarToString(envVar corev1.EnvVar, namespace string) string {
if envVar.ValueFrom != nil && envVar.ValueFrom.SecretKeyRef != nil {
secretData, err := getSecretKeyRefData(envVar.ValueFrom.SecretKeyRef, namespace)
if err != nil {
return err.Error()
}
return fmt.Sprintf("%s=%s", envVar.Name, secretData)
}
return fmt.Sprintf("%s=%s", envVar.Name, envVar.Value)
}

// Get secret from reference and namespace and return decoded data
func getSecretKeyRefData(secretKeyRef *corev1.SecretKeySelector, namespace string) (string, error) {
icc, err := clients.GetInClusterConfig()
if err != nil {
return "", err
}
cv1c, err := corev1client.NewForConfig(icc)
if err != nil {
return "", err
}
secret, err := cv1c.Secrets(namespace).Get(context.Background(), secretKeyRef.Name, metav1.GetOptions{})
if err != nil {
return "", err
}
return string(secret.Data[secretKeyRef.Key]), nil
}