Skip to content

Commit 7ddacc3

Browse files
committed
feat(controller): rename injected ENVs to match new runtime naming convention
1 parent 6e4e41a commit 7ddacc3

3 files changed

Lines changed: 13 additions & 13 deletions

File tree

components/buildless-serverless/internal/controller/resources/deployment.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -662,7 +662,7 @@ func generalEnvs(f *serverlessv1alpha2.Function, c *config.FunctionConfig) []cor
662662
Value: string(spec.Runtime),
663663
},
664664
{
665-
Name: "SERVICE_NAMESPACE",
665+
Name: "FUNC_NAMESPACE",
666666
Value: f.Namespace,
667667
},
668668
{
@@ -682,11 +682,11 @@ func generalEnvs(f *serverlessv1alpha2.Function, c *config.FunctionConfig) []cor
682682
Value: "TRUE",
683683
},
684684
{
685-
Name: "MOD_NAME",
685+
Name: "HANDLER_MODULE_NAME",
686686
Value: "handler",
687687
},
688688
{
689-
Name: "FUNC_HANDLER",
689+
Name: "HANDLER_FUNCTION_NAME",
690690
Value: "main",
691691
},
692692
}...)
@@ -721,7 +721,7 @@ func sourceEnvs(f *serverlessv1alpha2.Function) []corev1.EnvVar {
721721
if f.HasPythonRuntime() {
722722
envs = append(envs, []corev1.EnvVar{
723723
{
724-
Name: "FUNCTION_PATH",
724+
Name: "HANDLER_FOLDER",
725725
Value: "/kubeless",
726726
},
727727
}...)

components/buildless-serverless/internal/controller/resources/deployment_test.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1225,7 +1225,7 @@ func TestDeployment_envs(t *testing.T) {
12251225
Value: "nodejs20",
12261226
},
12271227
{
1228-
Name: "SERVICE_NAMESPACE",
1228+
Name: "FUNC_NAMESPACE",
12291229
Value: "function-namespace",
12301230
},
12311231
{
@@ -1277,7 +1277,7 @@ func TestDeployment_envs(t *testing.T) {
12771277
Value: "nodejs22",
12781278
},
12791279
{
1280-
Name: "SERVICE_NAMESPACE",
1280+
Name: "FUNC_NAMESPACE",
12811281
Value: "function-namespace",
12821282
},
12831283
{
@@ -1329,7 +1329,7 @@ func TestDeployment_envs(t *testing.T) {
13291329
Value: "nodejs24",
13301330
},
13311331
{
1332-
Name: "SERVICE_NAMESPACE",
1332+
Name: "FUNC_NAMESPACE",
13331333
Value: "function-namespace",
13341334
},
13351335
{
@@ -1384,7 +1384,7 @@ func TestDeployment_envs(t *testing.T) {
13841384
Value: "nodejs22",
13851385
},
13861386
{
1387-
Name: "SERVICE_NAMESPACE",
1387+
Name: "FUNC_NAMESPACE",
13881388
Value: "function-namespace",
13891389
},
13901390
{
@@ -1428,15 +1428,15 @@ func TestDeployment_envs(t *testing.T) {
14281428
Value: "python312",
14291429
},
14301430
{
1431-
Name: "SERVICE_NAMESPACE",
1431+
Name: "FUNC_NAMESPACE",
14321432
Value: "function-namespace",
14331433
},
14341434
{
14351435
Name: "FUNC_HANDLER_SOURCE",
14361436
Value: "function-source-py",
14371437
},
14381438
{
1439-
Name: "FUNCTION_PATH",
1439+
Name: "HANDLER_FOLDER",
14401440
Value: "/kubeless",
14411441
},
14421442
{
@@ -1456,11 +1456,11 @@ func TestDeployment_envs(t *testing.T) {
14561456
Value: "TRUE",
14571457
},
14581458
{
1459-
Name: "MOD_NAME",
1459+
Name: "HANDLER_MODULE_NAME",
14601460
Value: "handler",
14611461
},
14621462
{
1463-
Name: "FUNC_HANDLER",
1463+
Name: "HANDLER_FUNCTION_NAME",
14641464
Value: "main",
14651465
},
14661466
},

components/buildless-serverless/internal/endpoint/runtime/resources_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ spec:
132132
value: test-function
133133
- name: FUNC_RUNTIME
134134
value: nodejs24
135-
- name: SERVICE_NAMESPACE
135+
- name: FUNC_NAMESPACE
136136
value: test-namespace
137137
- name: TRACE_COLLECTOR_ENDPOINT
138138
- name: PUBLISHER_PROXY_ADDRESS

0 commit comments

Comments
 (0)