Skip to content

Commit

Permalink
fix: main logic structure and env files - no quotes needed
Browse files Browse the repository at this point in the history
  • Loading branch information
francardoso93 committed Oct 26, 2023
1 parent a63b964 commit c9925c7
Show file tree
Hide file tree
Showing 5 changed files with 21 additions and 14 deletions.
2 changes: 2 additions & 0 deletions example/.env.initium.sample
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
MOCK1=value1
MOCK2=value2
4 changes: 0 additions & 4 deletions example/.env.sample

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# !VERY IMPORTANT: Don't use or commit sensitive values here. ENV values are supposed to be k8s secret name and key.
# Don't use conflicting ENV names configured here with other locations (eg: .env).
MOCK5="kubernetessecretname/secretkey"
MOCK5=kubernetessecretname/secretkey
23 changes: 16 additions & 7 deletions src/services/k8s/knative.go
Original file line number Diff line number Diff line change
Expand Up @@ -120,11 +120,20 @@ func setSecretEnv(manifest *servingv1.Service, SecretRefEnvFile string) error {
if err != nil {
return err
}
for i, secretEnvVar := range secretEnvVarList { //eg: [MOCK5=kubernetessecretname/secretkey]
secretKeyRef := strings.Split(secretEnvVar.Value, "/")
manifest.Spec.Template.Spec.Containers[i].Env[0].Name = secretEnvVarList[0].Name //eg: MOCK5
manifest.Spec.Template.Spec.Containers[i].Env[0].ValueFrom.SecretKeyRef.Name = secretKeyRef[0] //eg: kubernetessecretname
manifest.Spec.Template.Spec.Containers[i].Env[0].ValueFrom.SecretKeyRef.Key = secretKeyRef[1] //eg: secretkey
for _, secretEnvVar := range secretEnvVarList { //eg: [MOCK5=kubernetessecretname/secretkey]
// TODO: Add secret format validation (Contains "/")
secretKeyRef := strings.SplitN(secretEnvVar.Value, "/", 2)
manifest.Spec.Template.Spec.Containers[0].Env = append(manifest.Spec.Template.Spec.Containers[0].Env, corev1.EnvVar{
Name: secretEnvVar.Name, //eg: MOCK5
ValueFrom: &corev1.EnvVarSource{
SecretKeyRef: &corev1.SecretKeySelector{
Key: secretKeyRef[1], //eg: secretkey
LocalObjectReference: corev1.LocalObjectReference{
Name: secretKeyRef[0], //eg: kubernetessecretname
},
},
},
})
}
return nil
}
Expand All @@ -141,8 +150,8 @@ func setEnv(manifest *servingv1.Service, envFile string) error {
func loadEnvFile(envFile string) ([]corev1.EnvVar, error) {
var envVarList []corev1.EnvVar
if _, err := os.Stat(envFile); err != nil {
if (os.IsNotExist(err)) && (path.Base(envFile) == defaults.EnvVarFile) {
log.Infof("No environment variables file %s to Load!", defaults.EnvVarFile)
if (os.IsNotExist(err)) && (path.Base(envFile) == defaults.EnvVarFile || path.Base(envFile) == defaults.SecretRefEnvFile) {
log.Infof("No environment variables file %s to Load!", envFile)
} else {
return nil, fmt.Errorf("Error loading %v file: %v", envFile, err)
}
Expand Down
4 changes: 2 additions & 2 deletions src/services/k8s/knative_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ const endpoint = "https://127.0.0.1:6443"

const token = "ZXlKaGJHY2lPaUpTVXpJMU5pSXNJbXRwWkNJNklqWllaRFEwT0ZwUWVsRlJRVkp0TUMxa04wWTRNV3N6UzFwVmRXOVhSMDlvYzA5MWFESXdPVWhwVkhjaWZRLmV5SnBjM01pT2lKcmRXSmxjbTVsZEdWekwzTmxjblpwWTJWaFkyTnZkVzUwSWl3aWEzVmlaWEp1WlhSbGN5NXBieTl6WlhKMmFXTmxZV05qYjNWdWRDOXVZVzFsYzNCaFkyVWlPaUpyZFdKbExYTjVjM1JsYlNJc0ltdDFZbVZ5Ym1WMFpYTXVhVzh2YzJWeWRtbGpaV0ZqWTI5MWJuUXZjMlZqY21WMExtNWhiV1VpT2lKdmEyVXRhM1ZpWldOdmJtWnBaeTF6WVMxMGIydGxiaUlzSW10MVltVnlibVYwWlhNdWFXOHZjMlZ5ZG1salpXRmpZMjkxYm5RdmMyVnlkbWxqWlMxaFkyTnZkVzUwTG01aGJXVWlPaUowWlhOMExYTmhJaXdpYTNWaVpYSnVaWFJsY3k1cGJ5OXpaWEoyYVdObFlXTmpiM1Z1ZEM5elpYSjJhV05sTFdGalkyOTFiblF1ZFdsa0lqb2lNelV4TkdJME9XVXRaVE15TWkwMFpHTTBMVGhsTUdVdE1qSTROemxsWm1GaE9HTXpJaXdpYzNWaUlqb2ljM2x6ZEdWdE9uTmxjblpwWTJWaFkyTnZkVzUwT210MVltVXRjM2x6ZEdWdE9uUmxjM1F0YzJFaWZRLlI5YnN3LU1MUjBubUhNOVJoUWJBZTBoZ2U0Z3JzYkJPa25RZUxVWC13SnRFY2dWejRDLVp6MFhVbUpPMEo4SVFmZXU1b3F3RnJwVHpSVEp0R24wdVdqc1RrSTZHSWNRNkpxM0FUSms3MEkwVzFqUTVJTkpJVjVmMFpfZDlIazNpZnVQaFNUUmpBZ2ljTDJCNjdMUHVBaW40T05hOHNkTE95VTZrSXFDU2Q3dURUNVMtLS1qQ0JzTnpJd1p0QVg1dVFfbDZGUHVUdlZxdGJiSUJGblVQUGExandaSWwwd3U1YV9DTG9rVFhWbDduVkZYUzBxZTJ1RWFmUlEwVGZIOWFjbWZndkFVcWFXbkNsTV9oekNzekhKOTBYaHNtOXIzQ3oya29UcDJhLWtVVWlhSWQxbGlPeWcyNFMtS29TZlNwUEpiNWcxVzZhNHB5VU1xMXNDNGFuUQ=="

var envSampleFile = path.Join(root, "example/.env.sample")
var envSampleFile = path.Join(root, "example/.env.initium.sample")

var secretRefEnvSampleFile = path.Join(root, "example/.env.secretref.sample")
var secretRefEnvSampleFile = path.Join(root, "example/.env.secretref.initium.sample")

func TestConfig(t *testing.T) {

Expand Down

0 comments on commit c9925c7

Please sign in to comment.