Skip to content

Commit

Permalink
Rename data-buffer to data-buffer-fs
Browse files Browse the repository at this point in the history
  • Loading branch information
mtneug committed Jan 9, 2025
1 parent 3eb2509 commit 4f15fac
Show file tree
Hide file tree
Showing 12 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/container-images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
strategy:
matrix:
image:
- function-data-buffer
- function-data-buffer-fs
- function-data-copy
- function-data-discard
- function-generic-noop
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ clean: ## Cleanup build output
.PHONY: image
image: $(addprefix image-, $(IMAGES)) ## Build all container images

## image-function-data-buffer: ## Build data-buffer function container image
## image-function-data-buffer-fs: ## Build data-buffer-fs function container image
## image-function-data-copy: ## Build data-copy function container image
## image-function-data-discard: ## Build data-discard function container image
## image-function-generic-noop: ## Build generic-noop function container image
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ ARG TARGETOS \
LABEL maintainer="Matthias Neugebauer <[email protected]>" \
org.opencontainers.image.created="${BUILD_DATE}" \
org.opencontainers.image.authors="Matthias Neugebauer <[email protected]>" \
org.opencontainers.image.url="ghcr.io/nagare-media/engine/function-data-buffer" \
org.opencontainers.image.url="ghcr.io/nagare-media/engine/function-data-buffer-fs" \
org.opencontainers.image.documentation="https://nagare.media" \
org.opencontainers.image.source="https://github.com/nagare-media/engine" \
org.opencontainers.image.version="${VERSION}" \
Expand All @@ -65,7 +65,7 @@ LABEL maintainer="Matthias Neugebauer <[email protected]>" \

WORKDIR /
COPY --from=build "/app/bin/task-shim-${VERSION}-${TARGETOS}-${TARGETARCH}" /task-shim
COPY --from=build "/app/bin/functions-${VERSION}-${TARGETOS}-${TARGETARCH}" /data-buffer
COPY --from=build "/app/bin/functions-${VERSION}-${TARGETOS}-${TARGETARCH}" /data-buffer-fs
USER 65532:65532

COPY <<EOF /config/task-shim.yaml
Expand All @@ -82,7 +82,7 @@ task:
- name: execute function
action: task-shim.engine.nagare.media/exec
config:
command: /data-buffer
command: /data-buffer-fs
args: ["/tmp/nbmp.tdd"]
EOF

Expand Down
2 changes: 1 addition & 1 deletion cmd/functions/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
"github.com/nagare-media/engine/cmd/functions/cli"

// Import nagare media functions to be included in this multi-binary.
_ "github.com/nagare-media/engine/internal/functions/functions/data-buffer"
_ "github.com/nagare-media/engine/internal/functions/functions/data-buffer-fs"
_ "github.com/nagare-media/engine/internal/functions/functions/data-copy"
_ "github.com/nagare-media/engine/internal/functions/functions/data-discard"
_ "github.com/nagare-media/engine/internal/functions/functions/generic-noop"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ kind: ClusterFunction
metadata:
labels:
app.kubernetes.io/name: function
app.kubernetes.io/instance: data-buffer
app.kubernetes.io/instance: data-buffer-fs
app.kubernetes.io/version: "0.0.1"
app.kubernetes.io/part-of: nagare-media-engine
app.kubernetes.io/created-by: nagare-media-engine
beta.engine.nagare.media/function-type: data
name: data-buffer
name: data-buffer-fs
spec:
version: 0.0.1
template: # JobTemplate
Expand All @@ -25,7 +25,7 @@ spec:
runAsGroup: 0
containers:
- name: function
image: ghcr.io/nagare-media/engine/function-data-buffer:dev
image: ghcr.io/nagare-media/engine/function-data-buffer-fs:dev
imagePullPolicy: IfNotPresent
ports:
- name: stream-http
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (

// Function description
const (
Name = "data-buffer"
Name = "data-buffer-fs"
)

// function buffers input stream.
Expand All @@ -37,7 +37,7 @@ type function struct {

var _ nbmp.Function = &function{}

// Exec data-buffer function.
// Exec data-buffer-fs function.
func (f *function) Exec(ctx context.Context) error {
ctx, cancel := context.WithCancel(ctx)
defer cancel()
Expand All @@ -50,7 +50,7 @@ func (f *function) Exec(ctx context.Context) error {
return nil
}

// BuildTask from data-buffer function.
// BuildTask from data-buffer-fs function.
func BuildTask(ctx context.Context, t *nbmpv2.Task) (nbmp.Function, error) {
f := &function{}
return f, nil
Expand Down
8 changes: 4 additions & 4 deletions skaffold.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@ metadata:
name: nagare-media-engine
build:
artifacts:
- image: ghcr.io/nagare-media/engine/function-data-buffer
- image: ghcr.io/nagare-media/engine/function-data-buffer-fs
runtimeType: go
context: .
docker:
dockerfile: build/package/image/function-data-buffer/Dockerfile.generic.generic
dockerfile: build/package/image/function-data-buffer-fs/Dockerfile.generic.generic
pullParent: false
noCache: false
squash: false
Expand Down Expand Up @@ -257,7 +257,7 @@ deploy:
- "--name"
- "nagare-media-mgmt"
- "ghcr.io/nagare-media/engine/workflow-manager-helper:dev"
- "ghcr.io/nagare-media/engine/function-data-buffer:dev"
- "ghcr.io/nagare-media/engine/function-data-buffer-fs:dev"
- "ghcr.io/nagare-media/engine/function-generic-noop:dev"
- "ghcr.io/nagare-media/engine/function-generic-sleep:dev"
- "ghcr.io/nagare-media/engine/function-media-encode:dev"
Expand All @@ -275,7 +275,7 @@ deploy:
- "--name"
- "nagare-media-edge"
- "ghcr.io/nagare-media/engine/workflow-manager-helper:dev"
- "ghcr.io/nagare-media/engine/function-data-buffer:dev"
- "ghcr.io/nagare-media/engine/function-data-buffer-fs:dev"
- "ghcr.io/nagare-media/engine/function-generic-noop:dev"
- "ghcr.io/nagare-media/engine/function-generic-sleep:dev"
- "ghcr.io/nagare-media/engine/function-media-encode:dev"
Expand Down

0 comments on commit 4f15fac

Please sign in to comment.