add linkerd_disabled env var if not enabled

nais · Dec 21, 2024 · 3c076c7 · 3c076c7
1 parent 58a49d6
commit 3c076c7
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 5 deletions.
diff --git a/pkg/resourcecreator/pod/pod.go b/pkg/resourcecreator/pod/pod.go
@@ -271,6 +271,10 @@ func imagePullSecrets(cfg Config) []corev1.LocalObjectReference {
 func CreateContainerEnvVars(app EnvSource, ast *resource.Ast, cfg Config) {
 	ast.Env = append(ast.Env, defaultEnvVars(app, cfg.GetClusterName(), app.GetImage())...)
 	ast.Env = append(ast.Env, app.GetEnv().ToKubernetes()...)
+	if !cfg.IsLinkerdEnabled() {
+		disableLinkerd := corev1.EnvVar{Name: "LINKERD_DISABLED", Value: "true"}
+		ast.Env = append(ast.Env, disableLinkerd)
+	}
 }
 
 func CreateAppContainer(app Source, ast *resource.Ast, cfg Config) error {
@@ -561,4 +565,4 @@ func readOnlyFileSystem(annotations map[string]string) bool {
 	}
 
 	return strings.ToLower(val) != "false"
-}
+}
diff --git a/pkg/resourcecreator/testdata/env.yaml b/pkg/resourcecreator/testdata/env.yaml
@@ -87,8 +87,10 @@ tests:
                         valueFrom:
                           fieldRef:
                             fieldPath: status.podIP
+                      - name: LINKERD_DISABLED
+                        value: "true"
                     envFrom:
                       - configMapRef:
                           name: mycm
                       - secretRef:
-                          name: mysecret
+                          name: mysecret
diff --git a/pkg/resourcecreator/testdata/gcp_gar_toleration_with_non_gar_image.yaml b/pkg/resourcecreator/testdata/gcp_gar_toleration_with_non_gar_image.yaml
@@ -63,6 +63,8 @@ tests:
                         value: "8080"
                       - name: BIND_ADDRESS
                         value: "0.0.0.0:8080"
+                      - name: LINKERD_DISABLED
+                        value: "true"
                     image: ghcr.io/nais/testapp:latest
                     imagePullPolicy: IfNotPresent
                     lifecycle:
@@ -94,4 +96,4 @@ tests:
                         type: RuntimeDefault
                     volumeMounts:
                       - mountPath: /tmp
-                        name: writable-tmp
+                        name: writable-tmp
diff --git a/pkg/resourcecreator/testdata/naisjob/cronjob_features_on_premises.yaml b/pkg/resourcecreator/testdata/naisjob/cronjob_features_on_premises.yaml
@@ -114,6 +114,8 @@ tests:
                             value: "8080"
                           - name: BIND_ADDRESS
                             value: "0.0.0.0:8080"
+                          - name: LINKERD_DISABLED
+                            value: "true"
                         image: navikt/mynaisjob:1.2.3
                         securityContext:
                           runAsUser: 1069
@@ -196,4 +198,4 @@ tests:
                               topologyKey: kubernetes.io/hostname
                             weight: 10
             schedule: "* 2 * * *"
-            successfulJobsHistoryLimit: 4
+            successfulJobsHistoryLimit: 4
diff --git a/pkg/resourcecreator/testdata/naisjob/job_features_on_premises.yaml b/pkg/resourcecreator/testdata/naisjob/job_features_on_premises.yaml
@@ -113,6 +113,8 @@ tests:
                         value: "8080"
                       - name: BIND_ADDRESS
                         value: "0.0.0.0:8080"
+                      - name: LINKERD_DISABLED
+                        value: "true"
                     image: navikt/mynaisjob:1.2.3
                     securityContext:
                       runAsUser: 1069
@@ -194,4 +196,4 @@ tests:
                                   - mynaisjob
                           topologyKey: kubernetes.io/hostname
                         weight: 10
-            ttlSecondsAfterFinished: 3
+            ttlSecondsAfterFinished: 3
diff --git a/pkg/resourcecreator/testdata/naisjob/vanilla_cronjob_on_premises.yaml b/pkg/resourcecreator/testdata/naisjob/vanilla_cronjob_on_premises.yaml
@@ -112,6 +112,8 @@ tests:
                             value: "8080"
                           - name: BIND_ADDRESS
                             value: "0.0.0.0:8080"
+                          - name: LINKERD_DISABLED
+                            value: "true"
                         image: navikt/mynaisjob:1.2.3
                         securityContext:
                           runAsUser: 1069

diff --git a/pkg/resourcecreator/testdata/naisjob/vanilla_job_on_premises.yaml b/pkg/resourcecreator/testdata/naisjob/vanilla_job_on_premises.yaml
@@ -109,6 +109,8 @@ tests:
                         value: "8080"
                       - name: BIND_ADDRESS
                         value: "0.0.0.0:8080"
+                      - name: LINKERD_DISABLED
+                        value: "true"
                     image: navikt/mynaisjob:1.2.3
                     securityContext:
                       runAsUser: 1069

diff --git a/pkg/resourcecreator/testdata/vanilla_on_premises.yaml b/pkg/resourcecreator/testdata/vanilla_on_premises.yaml
@@ -163,6 +163,8 @@ tests:
                         value: "8080"
                       - name: BIND_ADDRESS
                         value: "0.0.0.0:8080"
+                      - name: LINKERD_DISABLED
+                        value: "true"
                     resources:
                       limits:
                         memory: 512Mi