@@ -57,7 +57,12 @@ func (d *Deployer) Deploy(f faas.Function) (err error) {
57
57
if d .Verbose {
58
58
fmt .Printf ("Creating Knative Service: %v\n " , serviceName )
59
59
}
60
- err := client .CreateService (generateNewService (serviceName , f .ImageWithDigest (), f .Runtime ))
60
+ service , err := generateNewService (serviceName , f .ImageWithDigest (), f .Runtime , f .EnvVars )
61
+ if err != nil {
62
+ err = fmt .Errorf ("knative deployer failed to generate the service: %v" , err )
63
+ return err
64
+ }
65
+ err = client .CreateService (service )
61
66
if err != nil {
62
67
err = fmt .Errorf ("knative deployer failed to deploy the service: %v" , err )
63
68
return err
@@ -114,13 +119,10 @@ func probeFor(url string) *corev1.Probe {
114
119
}
115
120
}
116
121
117
- func generateNewService (name , image , runtime string ) * servingv1.Service {
122
+ func generateNewService (name , image , runtime string , envVars map [ string ] string ) ( * servingv1.Service , error ) {
118
123
containers := []corev1.Container {
119
124
{
120
125
Image : image ,
121
- Env : []corev1.EnvVar {
122
- {Name : "VERBOSE" , Value : "true" },
123
- },
124
126
},
125
127
}
126
128
@@ -129,7 +131,7 @@ func generateNewService(name, image, runtime string) *servingv1.Service {
129
131
containers [0 ].ReadinessProbe = probeFor ("/health/readiness" )
130
132
}
131
133
132
- return & v1.Service {
134
+ service := & v1.Service {
133
135
ObjectMeta : metav1.ObjectMeta {
134
136
Name : name ,
135
137
Labels : map [string ]string {
@@ -149,6 +151,8 @@ func generateNewService(name, image, runtime string) *servingv1.Service {
149
151
},
150
152
},
151
153
}
154
+
155
+ return setEnvVars (service , envVars )
152
156
}
153
157
154
158
func updateService (image string , envVars map [string ]string ) func (service * servingv1.Service ) (* servingv1.Service , error ) {
@@ -157,11 +161,11 @@ func updateService(image string, envVars map[string]string) func(service *servin
157
161
if err != nil {
158
162
return service , err
159
163
}
160
- return updateEnvVars (service , envVars )
164
+ return setEnvVars (service , envVars )
161
165
}
162
166
}
163
167
164
- func updateEnvVars (service * servingv1.Service , envVars map [string ]string ) (* servingv1.Service , error ) {
168
+ func setEnvVars (service * servingv1.Service , envVars map [string ]string ) (* servingv1.Service , error ) {
165
169
builtEnvVarName := "BUILT"
166
170
builtEnvVarValue := time .Now ().Format ("20060102T150405" )
167
171
0 commit comments