Added AGENT_CONFIG_PATH directly to the yaml

Signed-off-by: Aayush Chouhan <[email protected]>

Author: aayushchouhan09

deploy/internal/pod-agent.yaml

@@ -22,6 +22,7 @@ spec:
         - name: CONTAINER_PLATFORM
           value: KUBERNETES
         - name: AGENT_CONFIG_PATH
+          value: /etc/agent-config/agent_config
         - name: NOOBAA_LOG_LEVEL
         - name: NOOBAA_LOG_COLOR
       command: ["/noobaa_init_files/noobaa_init.sh", "agent"]
@@ -35,7 +36,7 @@ spec:
         - name: tmp-logs-vol
           mountPath: /usr/local/noobaa/logs
         - name: agent-config-secret
-          mountPath: AGENT_CONFIG_MOUNT_PATH
+          mountPath: /etc/agent-config
           readOnly: true
       securityContext:
         runAsNonRoot: true

pkg/backingstore/reconciler.go

@@ -32,8 +32,6 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
 )
 
-const agentConfigSecretMountPath string = "/etc/agent-config"
-
 // ModeInfo holds local information for a backing store mode.
 type ModeInfo struct {
 	Phase    nbv1.BackingStorePhase
@@ -1289,8 +1287,6 @@ func (r *Reconciler) updatePodTemplate() error {
 	c := &r.PodAgentTemplate.Spec.Containers[0]
 	for j := range c.Env {
 		switch c.Env[j].Name {
-		case "AGENT_CONFIG_PATH":
-			c.Env[j].Value = agentConfigSecretMountPath + "/agent_config"
 		case "NOOBAA_LOG_LEVEL":
 			c.Env[j].Value = r.CoreAppConfig.Data["NOOBAA_LOG_LEVEL"]
 		case "NOOBAA_LOG_COLOR":
@@ -1350,13 +1346,6 @@ func (r *Reconciler) updatePodTemplate() error {
 		r.PodAgentTemplate.Spec.TopologySpreadConstraints = []corev1.TopologySpreadConstraint{topologySpreadConstraint}
 	}
 
-	// replace AGENT_CONFIG_MOUNT_PATH with actual mount path
-	for i := range r.PodAgentTemplate.Spec.Containers[0].VolumeMounts {
-		if r.PodAgentTemplate.Spec.Containers[0].VolumeMounts[i].MountPath == "AGENT_CONFIG_MOUNT_PATH" {
-			r.PodAgentTemplate.Spec.Containers[0].VolumeMounts[i].MountPath = agentConfigSecretMountPath
-		}
-	}
-
 	// replace AGENT_CONFIG_SECRET_NAME with actual secret name
 	for i := range r.PodAgentTemplate.Spec.Volumes {
 		if r.PodAgentTemplate.Spec.Volumes[i].Secret != nil && r.PodAgentTemplate.Spec.Volumes[i].Secret.SecretName == "AGENT_CONFIG_SECRET_NAME" {

pkg/bundle/deploy.go

@@ -4477,7 +4477,7 @@ spec:
       storage: 30Gi
 `
 
-const Sha256_deploy_internal_pod_agent_yaml = "7f6eef302f0a07ca766cef61693db9d1f66f4f7aabe4d8d01a84cfa9176b12ad"
+const Sha256_deploy_internal_pod_agent_yaml = "74237f435120c893cd8e349e9ac685dd1c884e121c018f46e48228f845a51093"
 
 const File_deploy_internal_pod_agent_yaml = `apiVersion: v1
 kind: Pod
@@ -4503,6 +4503,7 @@ spec:
         - name: CONTAINER_PLATFORM
           value: KUBERNETES
         - name: AGENT_CONFIG_PATH
+          value: /etc/agent-config/agent_config
         - name: NOOBAA_LOG_LEVEL
         - name: NOOBAA_LOG_COLOR
       command: ["/noobaa_init_files/noobaa_init.sh", "agent"]
@@ -4516,7 +4517,7 @@ spec:
         - name: tmp-logs-vol
           mountPath: /usr/local/noobaa/logs
         - name: agent-config-secret
-          mountPath: AGENT_CONFIG_MOUNT_PATH
+          mountPath: /etc/agent-config
           readOnly: true
       securityContext:
         runAsNonRoot: true