Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions cmd/func-util/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -101,10 +101,6 @@ func scaffold(ctx context.Context) error {
middlewareVersion = "<unknown>"
}

if err := os.WriteFile("/tekton/results/middlewareVersion", []byte(middlewareVersion), 0644); err != nil {
return fmt.Errorf("cannot write middleware version as a result: %w", err)
}

Comment on lines -104 to -107

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is not needed anymore. This was for "inter-step" communication, but as we write the file in line 104 too, we can use this one too

if err := os.WriteFile(middlewareFileName, []byte(middlewareVersion), 0644); err != nil {
return fmt.Errorf("cannot write middleware version as a file: %w", err)
}
Expand Down
10 changes: 10 additions & 0 deletions pkg/pipelines/tekton/task-buildpack.yaml.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,16 @@ spec:
fi
done

# Add middleware version as image label
middleware_version_file="$(workspaces.source.path)/middleware-version"
if [ -f "$middleware_version_file" ]; then
middleware_version="$(cat "$middleware_version_file")"
echo "--> Adding middleware version label: $middleware_version"
echo -n "middleware-version=$middleware_version" >> "${ENV_DIR}/BP_IMAGE_LABELS"
else
echo "No middleware-version file ($middleware_version_file) found"
fi

############################################
##### Added part for Knative Functions #####
############################################
Expand Down
Loading