Skip to content
This repository was archived by the owner on Dec 15, 2021. It is now read-only.

Commit bf2871f

Browse files
dannyqiuandresmgot
authored andcommitted
Fix typos and clean up (#938)
* Remove old binaries from before trigger controller refactor * Recompile kubeless.yaml when kubeless-non-rbac.jsonnet changes * Put time in RFC3339 format * Fix typos in documentation * Warn instead of returning an error for empty handler and body * Test for RFC3339 timestamp
1 parent a6b8485 commit bf2871f

File tree

11 files changed

+17
-14
lines changed

11 files changed

+17
-14
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ binary-cross:
3838

3939
all-yaml: kubeless.yaml kubeless-non-rbac.yaml kubeless-openshift.yaml kafka-zookeeper.yaml
4040

41-
kubeless.yaml: kubeless.jsonnet
41+
kubeless.yaml: kubeless.jsonnet kubeless-non-rbac.jsonnet
4242

4343
kubeless-non-rbac.yaml: kubeless-non-rbac.jsonnet
4444

cmd/kubeless/function/call.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ var callCmd = &cobra.Command{
9797
logrus.Fatalf("Unable to generate ID %v", err)
9898
}
9999
req.SetHeader("event-id", eventID)
100-
req.SetHeader("event-time", timestamp.String())
100+
req.SetHeader("event-time", timestamp.Format(time.RFC3339))
101101
req.SetHeader("event-namespace", "cli.kubeless.io")
102102
res, err := req.Do().Raw()
103103
if err != nil {

cmd/kubeless/trigger/kafka/create.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ var createCmd = &cobra.Command{
113113
func init() {
114114
createCmd.Flags().StringP("namespace", "n", "", "Specify namespace for the kafka trigger")
115115
createCmd.Flags().StringP("trigger-topic", "", "", "Specify topic to listen to in Kafka broker")
116-
createCmd.Flags().StringP("function-selector", "", "", "Selector (label query) to select function on (e.g. -function-selector key1=value1,key2=value2)")
116+
createCmd.Flags().StringP("function-selector", "", "", "Selector (label query) to select function on (e.g. --function-selector key1=value1,key2=value2)")
117117
createCmd.MarkFlagRequired("trigger-topic")
118118
createCmd.MarkFlagRequired("function-selector")
119119
createCmd.Flags().Bool("dryrun", false, "Output JSON manifest of the function without creating it")

cmd/kubeless/trigger/kafka/update.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ var updateCmd = &cobra.Command{
107107
func init() {
108108
updateCmd.Flags().StringP("namespace", "n", "", "Specify namespace for the function")
109109
updateCmd.Flags().StringP("trigger-topic", "", "", "Specify topic to listen to in Kafka broker")
110-
updateCmd.Flags().StringP("function-selector", "", "", "Selector (label query) to select function on (e.g. -function-selector key1=value1,key2=value2)")
110+
updateCmd.Flags().StringP("function-selector", "", "", "Selector (label query) to select function on (e.g. --function-selector key1=value1,key2=value2)")
111111
updateCmd.Flags().Bool("dryrun", false, "Output JSON manifest of the function without creating it")
112112
updateCmd.Flags().StringP("output", "o", "yaml", "Output format")
113113
}

cmd/kubeless/trigger/nats/create.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ var createCmd = &cobra.Command{
114114
func init() {
115115
createCmd.Flags().StringP("namespace", "n", "", "Specify namespace for the NATS trigger")
116116
createCmd.Flags().StringP("trigger-topic", "", "", "Specify topic to listen to in NATS")
117-
createCmd.Flags().StringP("function-selector", "", "", "Selector (label query) to select function on (e.g. -function-selector key1=value1,key2=value2)")
117+
createCmd.Flags().StringP("function-selector", "", "", "Selector (label query) to select function on (e.g. --function-selector key1=value1,key2=value2)")
118118
createCmd.MarkFlagRequired("trigger-topic")
119119
createCmd.MarkFlagRequired("function-selector")
120120
createCmd.Flags().Bool("dryrun", false, "Output JSON manifest of the function without creating it")

cmd/kubeless/trigger/nats/update.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ var updateCmd = &cobra.Command{
107107
func init() {
108108
updateCmd.Flags().StringP("namespace", "n", "", "Specify namespace for the NATS trigger")
109109
updateCmd.Flags().StringP("trigger-topic", "", "", "Specify topic to listen to in NATS")
110-
updateCmd.Flags().StringP("function-selector", "", "", "Selector (label query) to select function on (e.g. -function-selector key1=value1,key2=value2)")
110+
updateCmd.Flags().StringP("function-selector", "", "", "Selector (label query) to select function on (e.g. --function-selector key1=value1,key2=value2)")
111111
updateCmd.Flags().Bool("dryrun", false, "Output JSON manifest of the function without creating it")
112112
updateCmd.Flags().StringP("output", "o", "yaml", "Output format")
113113
}

docs/advanced-function-deployment.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ kind: Function
88
metadata:
99
name: get-python
1010
namespace: default
11+
label:
12+
created-by: kubeless
13+
function: get-python
1114
spec:
1215
runtime: python2.7
1316
timeout: "180"

examples/Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ post-go-verify:
173173
# Verify event context
174174
logs=`kubectl logs -l function=post-go`; \
175175
echo $$logs | grep -q "it.*alive" && \
176-
echo $$logs | grep -q "UTC" && \
176+
echo $$logs | grep -q "Z" && \
177177
echo $$logs | grep -q "application/json" && \
178178
echo $$logs | grep -q "cli.kubeless.io"
179179

@@ -305,7 +305,7 @@ post-python-verify:
305305
# Verify event context
306306
logs=`kubectl logs -l function=post-python`; \
307307
echo $$logs | grep -q "it.*alive" && \
308-
echo $$logs | grep -q "event-time.*UTC" && \
308+
echo $$logs | grep -q "event-time.*Z" && \
309309
echo $$logs | grep -q "event-type.*application/json" && \
310310
echo $$logs | grep -q "event-namespace.*cli.kubeless.io" && \
311311
echo $$logs | grep -q "event-id.*"
@@ -325,7 +325,7 @@ post-nodejs-verify:
325325
# Verify event context
326326
logs=`kubectl logs -l function=post-nodejs`; \
327327
echo $$logs | grep -q "it.*alive" && \
328-
echo $$logs | grep -q "event-time.*UTC" && \
328+
echo $$logs | grep -q "event-time.*Z" && \
329329
echo $$logs | grep -q "event-type.*application/json" && \
330330
echo $$logs | grep -q "event-namespace.*cli.kubeless.io" && \
331331
echo $$logs | grep -q "event-id.*"
@@ -338,7 +338,7 @@ post-ruby-verify:
338338
# Verify event context
339339
logs=`kubectl logs -l function=post-ruby`; \
340340
echo $$logs | grep -q "it.*alive" && \
341-
echo $$logs | grep -q "event-time.*UTC" && \
341+
echo $$logs | grep -q "event-time.*Z" && \
342342
echo $$logs | grep -q "event-type.*application/json" && \
343343
echo $$logs | grep -q "event-namespace.*cli.kubeless.io" && \
344344
echo $$logs | grep -q "event-id.*"

pkg/controller/function_controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ func (c *FunctionController) processItem(key string) error {
230230
c.logger.Errorf("Failed to remove function controller as finalizer to Function Obj: %s object due to: %v: ", key, err)
231231
return err
232232
}
233-
c.logger.Infof("Function object %s has been successfully processed and marked for deleteion", key)
233+
c.logger.Infof("Function object %s has been successfully processed and marked for deletion", key)
234234
return nil
235235
}
236236

pkg/utils/kubelessutil.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -641,6 +641,8 @@ func EnsureFuncDeployment(client kubernetes.Interface, funcObj *kubelessApi.Func
641641
Value: dpm.Spec.Template.Spec.Containers[0].Resources.Limits.Memory().String(),
642642
},
643643
)
644+
} else {
645+
logrus.Warn("Expected non-empty handler and non-empty function content")
644646
}
645647

646648
dpm.Spec.Template.Spec.Containers[0].Env = append(dpm.Spec.Template.Spec.Containers[0].Env,

0 commit comments

Comments
 (0)