Skip to content

Commit f0be048

Browse files
authored
fix: set envVars when creating a function (#250)
Signed-off-by: Zbynek Roubalik <zroubali@redhat.com>
1 parent ed9a405 commit f0be048

File tree

1 file changed

+12
-8
lines changed

1 file changed

+12
-8
lines changed

knative/deployer.go

+12-8
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,12 @@ func (d *Deployer) Deploy(f faas.Function) (err error) {
5757
if d.Verbose {
5858
fmt.Printf("Creating Knative Service: %v\n", serviceName)
5959
}
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)
6166
if err != nil {
6267
err = fmt.Errorf("knative deployer failed to deploy the service: %v", err)
6368
return err
@@ -114,13 +119,10 @@ func probeFor(url string) *corev1.Probe {
114119
}
115120
}
116121

117-
func generateNewService(name, image, runtime string) *servingv1.Service {
122+
func generateNewService(name, image, runtime string, envVars map[string]string) (*servingv1.Service, error) {
118123
containers := []corev1.Container{
119124
{
120125
Image: image,
121-
Env: []corev1.EnvVar{
122-
{Name: "VERBOSE", Value: "true"},
123-
},
124126
},
125127
}
126128

@@ -129,7 +131,7 @@ func generateNewService(name, image, runtime string) *servingv1.Service {
129131
containers[0].ReadinessProbe = probeFor("/health/readiness")
130132
}
131133

132-
return &v1.Service{
134+
service := &v1.Service{
133135
ObjectMeta: metav1.ObjectMeta{
134136
Name: name,
135137
Labels: map[string]string{
@@ -149,6 +151,8 @@ func generateNewService(name, image, runtime string) *servingv1.Service {
149151
},
150152
},
151153
}
154+
155+
return setEnvVars(service, envVars)
152156
}
153157

154158
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
157161
if err != nil {
158162
return service, err
159163
}
160-
return updateEnvVars(service, envVars)
164+
return setEnvVars(service, envVars)
161165
}
162166
}
163167

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) {
165169
builtEnvVarName := "BUILT"
166170
builtEnvVarValue := time.Now().Format("20060102T150405")
167171

0 commit comments

Comments
 (0)