feat: add support for organization environment variables

uselagoon · Dec 20, 2024 · f3b34c0 · f3b34c0
1 parent e7c023d
commit f3b34c0
Show file tree

Hide file tree

Showing 8 changed files with 94 additions and 14 deletions.
diff --git a/api/lagoon/v1beta1/lagoonbuild_types.go b/api/lagoon/v1beta1/lagoonbuild_types.go
@@ -147,8 +147,9 @@ type Organization struct {
 
 // Variables contains the project and environment variables from lagoon.
 type LagoonVariables struct {
-	Project     []byte `json:"project,omitempty"`
-	Environment []byte `json:"environment,omitempty"`
+	Organization []byte `json:"organization,omitempty"`
+	Project      []byte `json:"project,omitempty"`
+	Environment  []byte `json:"environment,omitempty"`
 }
 
 // Branch contains the branch name used for a branch deployment.

diff --git a/api/lagoon/v1beta2/lagoonbuild_types.go b/api/lagoon/v1beta2/lagoonbuild_types.go
@@ -143,8 +143,9 @@ type Organization struct {
 
 // Variables contains the project and environment variables from lagoon.
 type LagoonVariables struct {
-	Project     []byte `json:"project,omitempty"`
-	Environment []byte `json:"environment,omitempty"`
+	Organization []byte `json:"organization,omitempty"`
+	Project      []byte `json:"project,omitempty"`
+	Environment  []byte `json:"environment,omitempty"`
 }
 
 // Branch contains the branch name used for a branch deployment.

diff --git a/config/crd/bases/crd.lagoon.sh_lagoonbuilds.yaml b/config/crd/bases/crd.lagoon.sh_lagoonbuilds.yaml
@@ -125,15 +125,18 @@ spec:
                   uiLink:
                     type: string
                   variables:
-                    description: Variables contains the project and environment variables
-                      from lagoon.
+                    description: Variables contains the organization, project,
+                      and environment variables from lagoon.
                     properties:
                       environment:
                         format: byte
                         type: string
                       project:
                         format: byte
                         type: string
+                      organization:
+                        format: byte
+                        type: string
                     type: object
                 required:
                 - deployTarget
@@ -812,15 +815,18 @@ spec:
                   uiLink:
                     type: string
                   variables:
-                    description: Variables contains the project and environment variables
-                      from lagoon.
+                    description: Variables contains the organization, project,
+                      and environment variables from lagoon.
                     properties:
                       environment:
                         format: byte
                         type: string
                       project:
                         format: byte
                         type: string
+                      organization:
+                        format: byte
+                        type: string
                     type: object
                 required:
                 - deployTarget

diff --git a/config/crd/bases/crd.lagoon.sh_lagoontasks.yaml b/config/crd/bases/crd.lagoon.sh_lagoontasks.yaml
@@ -120,15 +120,18 @@ spec:
                         type: string
                     type: object
                   variables:
-                    description: Variables contains the project and environment variables
-                      from lagoon.
+                    description: Variables contains the organization, project,
+                      and environment variables from lagoon.
                     properties:
                       environment:
                         format: byte
                         type: string
                       project:
                         format: byte
                         type: string
+                      organization:
+                        format: byte
+                        type: string
                     type: object
                 required:
                 - id
@@ -788,15 +791,18 @@ spec:
                         type: string
                     type: object
                   variables:
-                    description: Variables contains the project and environment variables
-                      from lagoon.
+                    description: Variables contains the organization, project,
+                      and environment variables from lagoon.
                     properties:
                       environment:
                         format: byte
                         type: string
                       project:
                         format: byte
                         type: string
+                      organization:
+                        format: byte
+                        type: string
                     type: object
                 required:
                 - name

diff --git a/internal/controllers/v1beta1/build_helpers.go b/internal/controllers/v1beta1/build_helpers.go
@@ -571,16 +571,19 @@ func (r *LagoonBuildReconciler) processBuild(ctx context.Context, opLog logr.Log
 	// if local/regional harbor is enabled
 	if r.LFFHarborEnabled {
 		// unmarshal the project variables
+		lagoonOrganizationVariables := &[]helpers.LagoonEnvironmentVariable{}
 		lagoonProjectVariables := &[]helpers.LagoonEnvironmentVariable{}
 		lagoonEnvironmentVariables := &[]helpers.LagoonEnvironmentVariable{}
+		json.Unmarshal(lagoonBuild.Spec.Project.Variables.Organization, lagoonOrganizationVariables)
 		json.Unmarshal(lagoonBuild.Spec.Project.Variables.Project, lagoonProjectVariables)
 		json.Unmarshal(lagoonBuild.Spec.Project.Variables.Environment, lagoonEnvironmentVariables)
 		// check if INTERNAL_REGISTRY_SOURCE_LAGOON is defined, and if it isn't true
 		// if this value is true, then we want to use what is provided by Lagoon
 		// if it is false, or not set, then we use what is provided by this controller
 		// this allows us to make it so a specific environment or the project entirely
 		// can still use whats provided by lagoon
-		if !helpers.VariableExists(lagoonProjectVariables, "INTERNAL_REGISTRY_SOURCE_LAGOON", "true") ||
+		if !helpers.VariableExists(lagoonOrganizationVariables, "INTERNAL_REGISTRY_SOURCE_LAGOON", "true") ||
+			!helpers.VariableExists(lagoonProjectVariables, "INTERNAL_REGISTRY_SOURCE_LAGOON", "true") ||
 			!helpers.VariableExists(lagoonEnvironmentVariables, "INTERNAL_REGISTRY_SOURCE_LAGOON", "true") {
 			// source the robot credential, and inject it into the lagoon project variables
 			// this will overwrite what is provided by lagoon (if lagoon has provided them)
@@ -617,6 +620,16 @@ func (r *LagoonBuildReconciler) processBuild(ctx context.Context, opLog logr.Log
 			lagoonBuild.Spec.Project.Variables.Project, _ = json.Marshal(lagoonProjectVariables)
 		}
 	}
+	if lagoonBuild.Spec.Project.Variables.Organization != nil {
+		// if this is 2 bytes long, then it means its just an empty json array
+		// we only want to add it if it is more than 2 bytes
+		if len(lagoonBuild.Spec.Project.Variables.Organization) > 2 {
+			podEnvs = append(podEnvs, corev1.EnvVar{
+				Name:  "LAGOON_ORGANIZATION_VARIABLES",
+				Value: string(lagoonBuild.Spec.Project.Variables.Organization),
+			})
+		}
+	}
 	if lagoonBuild.Spec.Project.Variables.Project != nil {
 		// if this is 2 bytes long, then it means its just an empty json array
 		// we only want to add it if it is more than 2 bytes

diff --git a/internal/controllers/v1beta1/task_controller.go b/internal/controllers/v1beta1/task_controller.go
@@ -228,6 +228,16 @@ func (r *LagoonTaskReconciler) getTaskPodDeployment(ctx context.Context, lagoonT
 							Value: r.ProxyConfig.NoProxy,
 						})
 					}
+					if lagoonTask.Spec.Project.Variables.Organization != nil {
+						// if this is 2 bytes long, then it means its just an empty json array
+						// we only want to add it if it is more than 2 bytes
+						if len(lagoonTask.Spec.Project.Variables.Organization) > 2 {
+							dep.Spec.Template.Spec.Containers[idx].Env = append(dep.Spec.Template.Spec.Containers[idx].Env, corev1.EnvVar{
+								Name:  "LAGOON_ORGANIZATION_VARIABLES",
+								Value: string(lagoonTask.Spec.Project.Variables.Organization),
+							})
+						}
+					}
 					if lagoonTask.Spec.Project.Variables.Project != nil {
 						// if this is 2 bytes long, then it means its just an empty json array
 						// we only want to add it if it is more than 2 bytes
@@ -512,6 +522,16 @@ func (r *LagoonTaskReconciler) createAdvancedTask(ctx context.Context, lagoonTas
 			Value: lagoonTask.Spec.Task.ID,
 		},
 	}
+	if lagoonTask.Spec.Project.Variables.Organization != nil {
+		// if this is 2 bytes long, then it means its just an empty json array
+		// we only want to add it if it is more than 2 bytes
+		if len(lagoonTask.Spec.Project.Variables.Organization) > 2 {
+			podEnvs = append(podEnvs, corev1.EnvVar{
+				Name:  "LAGOON_ORGANIZATION_VARIABLES",
+				Value: string(lagoonTask.Spec.Project.Variables.Organization),
+			})
+		}
+	}
 	if lagoonTask.Spec.Project.Variables.Project != nil {
 		// if this is 2 bytes long, then it means its just an empty json array
 		// we only want to add it if it is more than 2 bytes

diff --git a/internal/controllers/v1beta2/build_helpers.go b/internal/controllers/v1beta2/build_helpers.go
@@ -588,16 +588,19 @@ func (r *LagoonBuildReconciler) processBuild(ctx context.Context, opLog logr.Log
 	// if local/regional harbor is enabled
 	if r.LFFHarborEnabled {
 		// unmarshal the project variables
+		lagoonOrganizationVariables := &[]helpers.LagoonEnvironmentVariable{}
 		lagoonProjectVariables := &[]helpers.LagoonEnvironmentVariable{}
 		lagoonEnvironmentVariables := &[]helpers.LagoonEnvironmentVariable{}
+		json.Unmarshal(lagoonBuild.Spec.Project.Variables.Organization, lagoonOrganizationVariables)
 		json.Unmarshal(lagoonBuild.Spec.Project.Variables.Project, lagoonProjectVariables)
 		json.Unmarshal(lagoonBuild.Spec.Project.Variables.Environment, lagoonEnvironmentVariables)
 		// check if INTERNAL_REGISTRY_SOURCE_LAGOON is defined, and if it isn't true
 		// if this value is true, then we want to use what is provided by Lagoon
 		// if it is false, or not set, then we use what is provided by this controller
 		// this allows us to make it so a specific environment or the project entirely
 		// can still use whats provided by lagoon
-		if !helpers.VariableExists(lagoonProjectVariables, "INTERNAL_REGISTRY_SOURCE_LAGOON", "true") ||
+		if !helpers.VariableExists(lagoonOrganizationVariables, "INTERNAL_REGISTRY_SOURCE_LAGOON", "true") ||
+			!helpers.VariableExists(lagoonProjectVariables, "INTERNAL_REGISTRY_SOURCE_LAGOON", "true") ||
 			!helpers.VariableExists(lagoonEnvironmentVariables, "INTERNAL_REGISTRY_SOURCE_LAGOON", "true") {
 			// source the robot credential, and inject it into the lagoon project variables
 			// this will overwrite what is provided by lagoon (if lagoon has provided them)
@@ -634,6 +637,16 @@ func (r *LagoonBuildReconciler) processBuild(ctx context.Context, opLog logr.Log
 			lagoonBuild.Spec.Project.Variables.Project, _ = json.Marshal(lagoonProjectVariables)
 		}
 	}
+	if lagoonBuild.Spec.Project.Variables.Organization != nil {
+		// if this is 2 bytes long, then it means its just an empty json array
+		// we only want to add it if it is more than 2 bytes
+		if len(lagoonBuild.Spec.Project.Variables.Organization) > 2 {
+			podEnvs = append(podEnvs, corev1.EnvVar{
+				Name:  "LAGOON_ORGANIZATION_VARIABLES",
+				Value: string(lagoonBuild.Spec.Project.Variables.Organization),
+			})
+		}
+	}
 	if lagoonBuild.Spec.Project.Variables.Project != nil {
 		// if this is 2 bytes long, then it means its just an empty json array
 		// we only want to add it if it is more than 2 bytes

diff --git a/internal/controllers/v1beta2/task_controller.go b/internal/controllers/v1beta2/task_controller.go
@@ -225,6 +225,16 @@ func (r *LagoonTaskReconciler) getTaskPodDeployment(ctx context.Context, lagoonT
 							Value: r.ProxyConfig.NoProxy,
 						})
 					}
+					if lagoonTask.Spec.Project.Variables.Organization != nil {
+						// if this is 2 bytes long, then it means its just an empty json array
+						// we only want to add it if it is more than 2 bytes
+						if len(lagoonTask.Spec.Project.Variables.Organization) > 2 {
+							dep.Spec.Template.Spec.Containers[idx].Env = append(dep.Spec.Template.Spec.Containers[idx].Env, corev1.EnvVar{
+								Name:  "LAGOON_ORGANIZATION_VARIABLES",
+								Value: string(lagoonTask.Spec.Project.Variables.Organization),
+							})
+						}
+					}
 					if lagoonTask.Spec.Project.Variables.Project != nil {
 						// if this is 2 bytes long, then it means its just an empty json array
 						// we only want to add it if it is more than 2 bytes
@@ -515,6 +525,16 @@ func (r *LagoonTaskReconciler) createAdvancedTask(ctx context.Context, lagoonTas
 			Value: lagoonTask.Spec.Task.ID,
 		},
 	}
+	if lagoonTask.Spec.Project.Variables.Organization != nil {
+		// if this is 2 bytes long, then it means its just an empty json array
+		// we only want to add it if it is more than 2 bytes
+		if len(lagoonTask.Spec.Project.Variables.Organization) > 2 {
+			podEnvs = append(podEnvs, corev1.EnvVar{
+				Name:  "LAGOON_ORGANIZATION_VARIABLES",
+				Value: string(lagoonTask.Spec.Project.Variables.Organization),
+			})
+		}
+	}
 	if lagoonTask.Spec.Project.Variables.Project != nil {
 		// if this is 2 bytes long, then it means its just an empty json array
 		// we only want to add it if it is more than 2 bytes