From 9ddd0fa36d3ec9d3406cc43576fa1d8ccd505182 Mon Sep 17 00:00:00 2001 From: aavarghese Date: Thu, 18 Jul 2024 10:09:53 -0400 Subject: [PATCH] images: push to ibm ghcr namespace Signed-off-by: aavarghese Signed-off-by: aavarghese Signed-off-by: Nick Mitchell --- charts/shell/templates/containers/workdir.yaml | 2 +- charts/values.yaml | 2 +- .../workerpool/templates/containers/watcher.yaml | 2 +- .../workerpool/templates/containers/workdir.yaml | 2 +- .../templates/containers/workstealer.yaml | 2 +- images/base-images/ai/README.md | 15 --------------- images/base-images/fastparquet/README.md | 15 --------------- .../base-images/{ai => lunchpail-ai}/Dockerfile | 1 + images/base-images/lunchpail-ai/README.md | 15 +++++++++++++++ .../Dockerfile | 1 + .../base-images/lunchpail-fastparquet/README.md | 15 +++++++++++++++ .../{rclone => lunchpail-rclone}/Dockerfile | 1 + images/base-images/lunchpail-rclone/README.md | 15 +++++++++++++++ images/base-images/rclone/README.md | 15 --------------- .../.gitignore | 0 .../Dockerfile | 3 ++- .../main.sh | 0 .../{workdir => lunchpail-workdir}/Dockerfile | 1 + .../{workdir => lunchpail-workdir}/clone.sh | 0 .../Dockerfile | 1 + .../README.md | 0 .../sysctl.conf | 0 .../Dockerfile | 1 + .../Dockerfile | 1 + .../go.mod | 0 .../go.sum | 0 .../main.go | 0 .../Dockerfile | 1 + .../README.md | 0 .../{workstealer => lunchpail-workstealer}/go.mod | 0 .../{workstealer => lunchpail-workstealer}/go.sum | 0 .../main.go | 0 .../api/dispatch/parametersweep/transpile.go | 2 +- pkg/fe/transformer/api/dispatch/s3/transpile.go | 2 +- pkg/lunchpail/settings.go | 2 +- tests/tests/test7/pail/app.yaml | 2 +- tests/tests/test7b/pail/app.yaml | 2 +- tests/tests/test7c/pail/app.yaml | 2 +- tests/tests/test7d/pail/app.yaml | 2 +- tests/tests/test7e-by-role-autorun/pail/app.yaml | 2 +- tests/tests/test7e-by-role/pail/app.yaml | 2 +- tests/tests/test7e/pail/app.yaml | 2 +- .../pail/logic/worker.yaml | 2 +- tests/tests/test7f-external/settings.sh | 2 +- tests/tests/test7f-repo/pail/app.yaml | 2 +- tests/tests/test7f/pail/worker.yaml | 2 +- tests/tests/test7g/pail/app.yaml | 2 +- tests/tests/test7g/pail/workdispatcher-app.yaml | 2 +- tests/tests/test7h/pail/app.yaml | 2 +- tests/tests/test8/settings.sh | 2 +- tests/tests/test8b/settings.sh | 2 +- 51 files changed, 79 insertions(+), 70 deletions(-) delete mode 100644 images/base-images/ai/README.md delete mode 100644 images/base-images/fastparquet/README.md rename images/base-images/{ai => lunchpail-ai}/Dockerfile (77%) create mode 100644 images/base-images/lunchpail-ai/README.md rename images/base-images/{fastparquet => lunchpail-fastparquet}/Dockerfile (94%) create mode 100644 images/base-images/lunchpail-fastparquet/README.md rename images/base-images/{rclone => lunchpail-rclone}/Dockerfile (85%) create mode 100644 images/base-images/lunchpail-rclone/README.md delete mode 100644 images/base-images/rclone/README.md rename images/components/{tasksimulator-parquet => lunchpail-tasksimulator-parquet}/.gitignore (100%) rename images/components/{tasksimulator-parquet => lunchpail-tasksimulator-parquet}/Dockerfile (73%) rename images/components/{tasksimulator-parquet => lunchpail-tasksimulator-parquet}/main.sh (100%) rename images/components/{workdir => lunchpail-workdir}/Dockerfile (67%) rename images/components/{workdir => lunchpail-workdir}/clone.sh (100%) rename images/components/{worker-alpine => lunchpail-worker-alpine}/Dockerfile (81%) rename images/components/{worker-alpine => lunchpail-worker-alpine}/README.md (100%) rename images/components/{worker-alpine => lunchpail-worker-alpine}/sysctl.conf (100%) rename images/components/{worker-python-alpine => lunchpail-worker-python-alpine}/Dockerfile (82%) rename images/components/{worker-watcher => lunchpail-worker-watcher}/Dockerfile (85%) rename images/components/{worker-watcher => lunchpail-worker-watcher}/go.mod (100%) rename images/components/{worker-watcher => lunchpail-worker-watcher}/go.sum (100%) rename images/components/{worker-watcher => lunchpail-worker-watcher}/main.go (100%) rename images/components/{workstealer => lunchpail-workstealer}/Dockerfile (94%) rename images/components/{workstealer => lunchpail-workstealer}/README.md (100%) rename images/components/{workstealer => lunchpail-workstealer}/go.mod (100%) rename images/components/{workstealer => lunchpail-workstealer}/go.sum (100%) rename images/components/{workstealer => lunchpail-workstealer}/main.go (100%) diff --git a/charts/shell/templates/containers/workdir.yaml b/charts/shell/templates/containers/workdir.yaml index 6c90189d..c05e0654 100644 --- a/charts/shell/templates/containers/workdir.yaml +++ b/charts/shell/templates/containers/workdir.yaml @@ -1,7 +1,7 @@ {{- define "containers/workdir" }} {{- if .Values.workdir.repo }} - name: workdir - image: {{ print .Values.lunchpail.image.registry "/" .Values.lunchpail.image.repo "/workdir:" .Values.lunchpail.image.version }} + image: {{ print .Values.lunchpail.image.registry "/" .Values.lunchpail.image.repo "/lunchpail-workdir:" .Values.lunchpail.image.version }} volumeMounts: {{ include "workdir/volumeMount" . | indent 4 }} env: diff --git a/charts/values.yaml b/charts/values.yaml index 74949962..e8600178 100644 --- a/charts/values.yaml +++ b/charts/values.yaml @@ -7,5 +7,5 @@ gpu-operator: # these values may be overriden by hack/up.sh image: registry: ghcr.io - repo: lunchpail + repo: ibm version: 0.0.1 diff --git a/charts/workerpool/templates/containers/watcher.yaml b/charts/workerpool/templates/containers/watcher.yaml index c05486a4..37a8c2e4 100644 --- a/charts/workerpool/templates/containers/watcher.yaml +++ b/charts/workerpool/templates/containers/watcher.yaml @@ -1,6 +1,6 @@ {{- define "containers/watcher" }} - name: watcher - image: {{ print .Values.watcher.image.registry "/" .Values.lunchpail "/worker-watcher:" .Values.watcher.image.version }} + image: {{ print .Values.watcher.image.registry "/" .Values.watcher.image.repo "/lunchpail-worker-watcher:" .Values.watcher.image.version }} volumeMounts: {{ include "workdir/volumeMount" . | indent 4 }} command: diff --git a/charts/workerpool/templates/containers/workdir.yaml b/charts/workerpool/templates/containers/workdir.yaml index 3667598d..0d5435ec 100644 --- a/charts/workerpool/templates/containers/workdir.yaml +++ b/charts/workerpool/templates/containers/workdir.yaml @@ -1,7 +1,7 @@ {{- define "containers/workdir" }} {{- if .Values.workdir.repo }} - name: workdir - image: {{ print .Values.watcher.image.registry "/" .Values.watcher.image.repo "/workdir:" .Values.watcher.image.version }} + image: {{ print .Values.watcher.image.registry "/" .Values.watcher.image.repo "/lunchpail-workdir:" .Values.watcher.image.version }} volumeMounts: {{ include "workdir/volumeMount" . | indent 4 }} env: diff --git a/charts/workstealer/templates/containers/workstealer.yaml b/charts/workstealer/templates/containers/workstealer.yaml index b43b94f3..b69f6730 100644 --- a/charts/workstealer/templates/containers/workstealer.yaml +++ b/charts/workstealer/templates/containers/workstealer.yaml @@ -1,6 +1,6 @@ {{- define "containers/workstealer" }} - name: workstealer - image: {{ print .Values.image.registry "/" .Values.image.repo "/workstealer:" .Values.image.version }} + image: {{ print .Values.image.registry "/" .Values.image.repo "/lunchpail-workstealer:" .Values.image.version }} command: ["/opt/lunchpail/workstealer/scripts/workstealer.sh"] volumeMounts: {{- include "scripts/volumeMount" . | indent 4 }} diff --git a/images/base-images/ai/README.md b/images/base-images/ai/README.md deleted file mode 100644 index f4ed957b..00000000 --- a/images/base-images/ai/README.md +++ /dev/null @@ -1,15 +0,0 @@ -For example: - -```shell -podman manifest create ghcr.io/lunchpail/ai:0.0.4 -podman build \ - --platform=linux/arm64/v8,linux/amd64 \ - --manifest ghcr.io/lunchpail/ai:0.0.4 . -``` - -Then, to push: - -```shell -podman manifest push ghcr.io/lunchpail/ai:0.0.4 -``` - diff --git a/images/base-images/fastparquet/README.md b/images/base-images/fastparquet/README.md deleted file mode 100644 index ada2bd94..00000000 --- a/images/base-images/fastparquet/README.md +++ /dev/null @@ -1,15 +0,0 @@ -For example: - -```shell -podman manifest create ghcr.io/lunchpail/fastparquet:0.0.1 -podman build \ - --platform=linux/arm64/v8,linux/amd64 \ - --manifest ghcr.io/lunchpail/fastparquet:0.0.1 . -``` - -Then, to push: - -```shell -podman manifest push ghcr.io/lunchpail/fastparquet:0.0.1 -``` - diff --git a/images/base-images/ai/Dockerfile b/images/base-images/lunchpail-ai/Dockerfile similarity index 77% rename from images/base-images/ai/Dockerfile rename to images/base-images/lunchpail-ai/Dockerfile index b9a3ba7e..eff78779 100644 --- a/images/base-images/ai/Dockerfile +++ b/images/base-images/lunchpail-ai/Dockerfile @@ -1,4 +1,5 @@ FROM docker.io/python:3.12-slim +LABEL org.opencontainers.image.source="https://github.com/IBM/lunchpail" RUN apt update && apt install -y bc && apt autoremove -y && apt clean && rm -rf ~/.cache && rm -rf /var/lib/apt/lists/* && \ pip install --no-cache-dir \ diff --git a/images/base-images/lunchpail-ai/README.md b/images/base-images/lunchpail-ai/README.md new file mode 100644 index 00000000..c75bde02 --- /dev/null +++ b/images/base-images/lunchpail-ai/README.md @@ -0,0 +1,15 @@ +For example: + +```shell +podman manifest create ghcr.io/ibm/lunchpail-ai:0.0.4 +podman build \ + --platform=linux/arm64/v8,linux/amd64 \ + --manifest ghcr.io/ibm/lunchpail-ai:0.0.4 . +``` + +Then, to push: + +```shell +podman manifest push ghcr.io/ibm/lunchpail-ai:0.0.4 +``` + diff --git a/images/base-images/fastparquet/Dockerfile b/images/base-images/lunchpail-fastparquet/Dockerfile similarity index 94% rename from images/base-images/fastparquet/Dockerfile rename to images/base-images/lunchpail-fastparquet/Dockerfile index 14acbe17..702e81b0 100644 --- a/images/base-images/fastparquet/Dockerfile +++ b/images/base-images/lunchpail-fastparquet/Dockerfile @@ -1,4 +1,5 @@ FROM docker.io/alpine:3 +LABEL org.opencontainers.image.source="https://github.com/IBM/lunchpail" # RUN apk add --no-cache maven curl build-base openjdk11 && \ # cd /tmp && \ diff --git a/images/base-images/lunchpail-fastparquet/README.md b/images/base-images/lunchpail-fastparquet/README.md new file mode 100644 index 00000000..46b59d9b --- /dev/null +++ b/images/base-images/lunchpail-fastparquet/README.md @@ -0,0 +1,15 @@ +For example: + +```shell +podman manifest create ghcr.io/ibm/lunchpail-fastparquet:0.0.1 +podman build \ + --platform=linux/arm64/v8,linux/amd64 \ + --manifest ghcr.io/ibm/lunchpail-fastparquet:0.0.1 . +``` + +Then, to push: + +```shell +podman manifest push ghcr.io/ibm/lunchpail-fastparquet:0.0.1 +``` + diff --git a/images/base-images/rclone/Dockerfile b/images/base-images/lunchpail-rclone/Dockerfile similarity index 85% rename from images/base-images/rclone/Dockerfile rename to images/base-images/lunchpail-rclone/Dockerfile index 2e43f8cf..0f3de082 100644 --- a/images/base-images/rclone/Dockerfile +++ b/images/base-images/lunchpail-rclone/Dockerfile @@ -1,4 +1,5 @@ FROM alpine:3 +LABEL org.opencontainers.image.source="https://github.com/IBM/lunchpail" RUN ARCH=$(uname -m); if [ $ARCH = "x86_64" ]; then TARGETARCH=amd64; else TARGETARCH=arm64; fi ; \ apk update && apk add --no-cache bash && \ diff --git a/images/base-images/lunchpail-rclone/README.md b/images/base-images/lunchpail-rclone/README.md new file mode 100644 index 00000000..47572a04 --- /dev/null +++ b/images/base-images/lunchpail-rclone/README.md @@ -0,0 +1,15 @@ +For example: + +```shell +podman manifest create ghcr.io/ibm/lunchpail-rclone:0.0.1 +podman build \ + --platform=linux/arm64/v8,linux/amd64 \ + --manifest ghcr.io/ibm/lunchpail-rclone:0.0.1 . +``` + +Then, to push: + +```shell +podman manifest push ghcr.io/ibm/lunchpail-rclone:0.0.1 +``` + diff --git a/images/base-images/rclone/README.md b/images/base-images/rclone/README.md deleted file mode 100644 index af761d5b..00000000 --- a/images/base-images/rclone/README.md +++ /dev/null @@ -1,15 +0,0 @@ -For example: - -```shell -podman manifest create ghcr.io/lunchpail/rclone:0.0.1 -podman build \ - --platform=linux/arm64/v8,linux/amd64 \ - --manifest ghcr.io/lunchpail/rclone:0.0.1 . -``` - -Then, to push: - -```shell -podman manifest push ghcr.io/lunchpail/rclone:0.0.1 -``` - diff --git a/images/components/tasksimulator-parquet/.gitignore b/images/components/lunchpail-tasksimulator-parquet/.gitignore similarity index 100% rename from images/components/tasksimulator-parquet/.gitignore rename to images/components/lunchpail-tasksimulator-parquet/.gitignore diff --git a/images/components/tasksimulator-parquet/Dockerfile b/images/components/lunchpail-tasksimulator-parquet/Dockerfile similarity index 73% rename from images/components/tasksimulator-parquet/Dockerfile rename to images/components/lunchpail-tasksimulator-parquet/Dockerfile index 6243f866..f1b59e64 100644 --- a/images/components/tasksimulator-parquet/Dockerfile +++ b/images/components/lunchpail-tasksimulator-parquet/Dockerfile @@ -1,4 +1,5 @@ -FROM ghcr.io/lunchpail/fastparquet:0.0.1 +FROM ghcr.io/ibm/lunchpail-fastparquet:0.0.1 +LABEL org.opencontainers.image.source="https://github.com/IBM/lunchpail" COPY --chmod=755 main.sh /opt/lunchpail/bin/main.sh diff --git a/images/components/tasksimulator-parquet/main.sh b/images/components/lunchpail-tasksimulator-parquet/main.sh similarity index 100% rename from images/components/tasksimulator-parquet/main.sh rename to images/components/lunchpail-tasksimulator-parquet/main.sh diff --git a/images/components/workdir/Dockerfile b/images/components/lunchpail-workdir/Dockerfile similarity index 67% rename from images/components/workdir/Dockerfile rename to images/components/lunchpail-workdir/Dockerfile index f17b72a3..806d54dd 100644 --- a/images/components/workdir/Dockerfile +++ b/images/components/lunchpail-workdir/Dockerfile @@ -1,4 +1,5 @@ FROM alpine:3 +LABEL org.opencontainers.image.source="https://github.com/IBM/lunchpail" RUN apk update && apk add --no-cache git ca-certificates bash ADD clone.sh /opt/lunchpail/bin/clone.sh diff --git a/images/components/workdir/clone.sh b/images/components/lunchpail-workdir/clone.sh similarity index 100% rename from images/components/workdir/clone.sh rename to images/components/lunchpail-workdir/clone.sh diff --git a/images/components/worker-alpine/Dockerfile b/images/components/lunchpail-worker-alpine/Dockerfile similarity index 81% rename from images/components/worker-alpine/Dockerfile rename to images/components/lunchpail-worker-alpine/Dockerfile index 93074bb9..54a171e9 100644 --- a/images/components/worker-alpine/Dockerfile +++ b/images/components/lunchpail-worker-alpine/Dockerfile @@ -1,4 +1,5 @@ FROM docker.io/alpine:3 +LABEL org.opencontainers.image.source="https://github.com/IBM/lunchpail" # Note: watcher.sh depends on some bash-isms at the moment RUN apk update && \ diff --git a/images/components/worker-alpine/README.md b/images/components/lunchpail-worker-alpine/README.md similarity index 100% rename from images/components/worker-alpine/README.md rename to images/components/lunchpail-worker-alpine/README.md diff --git a/images/components/worker-alpine/sysctl.conf b/images/components/lunchpail-worker-alpine/sysctl.conf similarity index 100% rename from images/components/worker-alpine/sysctl.conf rename to images/components/lunchpail-worker-alpine/sysctl.conf diff --git a/images/components/worker-python-alpine/Dockerfile b/images/components/lunchpail-worker-python-alpine/Dockerfile similarity index 82% rename from images/components/worker-python-alpine/Dockerfile rename to images/components/lunchpail-worker-python-alpine/Dockerfile index a842adee..0d7bb2a9 100644 --- a/images/components/worker-python-alpine/Dockerfile +++ b/images/components/lunchpail-worker-python-alpine/Dockerfile @@ -1,4 +1,5 @@ FROM docker.io/alpine:3 +LABEL org.opencontainers.image.source="https://github.com/IBM/lunchpail" # Note: watcher.sh depends on some bash-isms at the moment RUN apk update && \ diff --git a/images/components/worker-watcher/Dockerfile b/images/components/lunchpail-worker-watcher/Dockerfile similarity index 85% rename from images/components/worker-watcher/Dockerfile rename to images/components/lunchpail-worker-watcher/Dockerfile index af5ca5d1..91b62717 100644 --- a/images/components/worker-watcher/Dockerfile +++ b/images/components/lunchpail-worker-watcher/Dockerfile @@ -1,4 +1,5 @@ FROM docker.io/golang:1.22.1-alpine +LABEL org.opencontainers.image.source="https://github.com/IBM/lunchpail" WORKDIR /init COPY go.* . diff --git a/images/components/worker-watcher/go.mod b/images/components/lunchpail-worker-watcher/go.mod similarity index 100% rename from images/components/worker-watcher/go.mod rename to images/components/lunchpail-worker-watcher/go.mod diff --git a/images/components/worker-watcher/go.sum b/images/components/lunchpail-worker-watcher/go.sum similarity index 100% rename from images/components/worker-watcher/go.sum rename to images/components/lunchpail-worker-watcher/go.sum diff --git a/images/components/worker-watcher/main.go b/images/components/lunchpail-worker-watcher/main.go similarity index 100% rename from images/components/worker-watcher/main.go rename to images/components/lunchpail-worker-watcher/main.go diff --git a/images/components/workstealer/Dockerfile b/images/components/lunchpail-workstealer/Dockerfile similarity index 94% rename from images/components/workstealer/Dockerfile rename to images/components/lunchpail-workstealer/Dockerfile index 8fb5d47d..a271d742 100644 --- a/images/components/workstealer/Dockerfile +++ b/images/components/lunchpail-workstealer/Dockerfile @@ -1,5 +1,6 @@ # Build stage FROM docker.io/golang:1.22.1-alpine +LABEL org.opencontainers.image.source="https://github.com/IBM/lunchpail" WORKDIR /workstealer COPY go.* ./ diff --git a/images/components/workstealer/README.md b/images/components/lunchpail-workstealer/README.md similarity index 100% rename from images/components/workstealer/README.md rename to images/components/lunchpail-workstealer/README.md diff --git a/images/components/workstealer/go.mod b/images/components/lunchpail-workstealer/go.mod similarity index 100% rename from images/components/workstealer/go.mod rename to images/components/lunchpail-workstealer/go.mod diff --git a/images/components/workstealer/go.sum b/images/components/lunchpail-workstealer/go.sum similarity index 100% rename from images/components/workstealer/go.sum rename to images/components/lunchpail-workstealer/go.sum diff --git a/images/components/workstealer/main.go b/images/components/lunchpail-workstealer/main.go similarity index 100% rename from images/components/workstealer/main.go rename to images/components/lunchpail-workstealer/main.go diff --git a/pkg/fe/transformer/api/dispatch/parametersweep/transpile.go b/pkg/fe/transformer/api/dispatch/parametersweep/transpile.go index 07dcf31f..2e860534 100644 --- a/pkg/fe/transformer/api/dispatch/parametersweep/transpile.go +++ b/pkg/fe/transformer/api/dispatch/parametersweep/transpile.go @@ -13,7 +13,7 @@ func transpile(sweep hlir.ParameterSweep) (hlir.Application, error) { app.ApiVersion = sweep.ApiVersion app.Kind = "Application" app.Metadata.Name = sweep.Metadata.Name - app.Spec.Image = fmt.Sprintf("%s/%s/rclone:0.0.1", lunchpail.ImageRegistry, lunchpail.ImageRepo) + app.Spec.Image = fmt.Sprintf("%s/%s/lunchpail-rclone:0.0.1", lunchpail.ImageRegistry, lunchpail.ImageRepo) app.Spec.Api = "shell" app.Spec.Role = "dispatcher" app.Spec.Command = "./main.sh" diff --git a/pkg/fe/transformer/api/dispatch/s3/transpile.go b/pkg/fe/transformer/api/dispatch/s3/transpile.go index 0be218d0..f0ede62e 100644 --- a/pkg/fe/transformer/api/dispatch/s3/transpile.go +++ b/pkg/fe/transformer/api/dispatch/s3/transpile.go @@ -21,7 +21,7 @@ func transpile(s3 hlir.ProcessS3Objects) (hlir.Application, error) { app.ApiVersion = s3.ApiVersion app.Kind = "Application" app.Metadata.Name = s3.Metadata.Name - app.Spec.Image = fmt.Sprintf("%s/%s/rclone:0.0.1", lunchpail.ImageRegistry, lunchpail.ImageRepo) + app.Spec.Image = fmt.Sprintf("%s/%s/lunchpail-rclone:0.0.1", lunchpail.ImageRegistry, lunchpail.ImageRepo) app.Spec.Api = "shell" app.Spec.Role = "dispatcher" app.Spec.Command = "./main.sh" diff --git a/pkg/lunchpail/settings.go b/pkg/lunchpail/settings.go index c4437e4f..ef89daa9 100644 --- a/pkg/lunchpail/settings.go +++ b/pkg/lunchpail/settings.go @@ -2,6 +2,6 @@ package lunchpail const ( ImageRegistry = "ghcr.io" - ImageRepo = "lunchpail" + ImageRepo = "ibm" LocalClusterName = "lunchpail" ) diff --git a/tests/tests/test7/pail/app.yaml b/tests/tests/test7/pail/app.yaml index f23cf853..85dd6423 100644 --- a/tests/tests/test7/pail/app.yaml +++ b/tests/tests/test7/pail/app.yaml @@ -5,7 +5,7 @@ metadata: spec: api: workqueue role: worker - image: {{ print .Values.global.image.registry "/" .Values.global.image.repo "/worker-alpine:" .Chart.AppVersion }} + image: {{ print .Values.global.image.registry "/" .Values.global.image.repo "/lunchpail-worker-alpine:" .Chart.AppVersion }} code: - name: main.sh source: | diff --git a/tests/tests/test7b/pail/app.yaml b/tests/tests/test7b/pail/app.yaml index bc0b3222..38106f41 100644 --- a/tests/tests/test7b/pail/app.yaml +++ b/tests/tests/test7b/pail/app.yaml @@ -5,7 +5,7 @@ metadata: spec: api: workqueue role: worker - image: {{ print .Values.global.image.registry "/" .Values.global.image.repo "/worker-alpine:" .Chart.AppVersion }} + image: {{ print .Values.global.image.registry "/" .Values.global.image.repo "/lunchpail-worker-alpine:" .Chart.AppVersion }} code: - name: main.sh source: | diff --git a/tests/tests/test7c/pail/app.yaml b/tests/tests/test7c/pail/app.yaml index adf51981..a9d95f01 100644 --- a/tests/tests/test7c/pail/app.yaml +++ b/tests/tests/test7c/pail/app.yaml @@ -23,7 +23,7 @@ spec: echo "Done with $in" command: ./literal.sh - image: {{ print .Values.global.image.registry "/" .Values.global.image.repo "/worker-alpine:" .Chart.AppVersion }} + image: {{ print .Values.global.image.registry "/" .Values.global.image.repo "/lunchpail-worker-alpine:" .Chart.AppVersion }} env: MESSAGE: {{ .Values.message | default "BUG" }} # TODO: dataset.py in run controller doesn't currently support adding both as mount and configmap diff --git a/tests/tests/test7d/pail/app.yaml b/tests/tests/test7d/pail/app.yaml index 91bcb64a..5d03539d 100644 --- a/tests/tests/test7d/pail/app.yaml +++ b/tests/tests/test7d/pail/app.yaml @@ -22,5 +22,5 @@ spec: echo "Done with $in" command: ./literal.sh - image: {{ print .Values.global.image.registry "/" .Values.global.image.repo "/worker-alpine:" .Chart.AppVersion }} + image: {{ print .Values.global.image.registry "/" .Values.global.image.repo "/lunchpail-worker-alpine:" .Chart.AppVersion }} {{- end }} diff --git a/tests/tests/test7e-by-role-autorun/pail/app.yaml b/tests/tests/test7e-by-role-autorun/pail/app.yaml index a77dd308..61a5f804 100644 --- a/tests/tests/test7e-by-role-autorun/pail/app.yaml +++ b/tests/tests/test7e-by-role-autorun/pail/app.yaml @@ -21,7 +21,7 @@ spec: role: worker command: ./literal.sh - image: {{ print .Values.global.image.registry "/" .Values.global.image.repo "/worker-alpine:" .Chart.AppVersion }} + image: {{ print .Values.global.image.registry "/" .Values.global.image.repo "/lunchpail-worker-alpine:" .Chart.AppVersion }} # TODO: dataset.py in run controller doesn't currently support adding both as mount and configmap # inputs: diff --git a/tests/tests/test7e-by-role/pail/app.yaml b/tests/tests/test7e-by-role/pail/app.yaml index 6bbcecdf..6e4e0850 100644 --- a/tests/tests/test7e-by-role/pail/app.yaml +++ b/tests/tests/test7e-by-role/pail/app.yaml @@ -22,7 +22,7 @@ spec: role: worker command: ./literal.sh - image: {{ print .Values.global.image.registry "/" .Values.global.image.repo "/worker-alpine:" .Chart.AppVersion }} + image: {{ print .Values.global.image.registry "/" .Values.global.image.repo "/lunchpail-worker-alpine:" .Chart.AppVersion }} # TODO: dataset.py in run controller doesn't currently support adding both as mount and configmap # inputs: diff --git a/tests/tests/test7e/pail/app.yaml b/tests/tests/test7e/pail/app.yaml index dcd56238..218b833e 100644 --- a/tests/tests/test7e/pail/app.yaml +++ b/tests/tests/test7e/pail/app.yaml @@ -28,7 +28,7 @@ spec: echo "Done with $in" command: ./literal.sh - image: {{ print .Values.global.image.registry "/" .Values.global.image.repo "/worker-alpine:" .Chart.AppVersion }} + image: {{ print .Values.global.image.registry "/" .Values.global.image.repo "/lunchpail-worker-alpine:" .Chart.AppVersion }} # TODO: dataset.py in run controller doesn't currently support adding both as mount and configmap # inputs: diff --git a/tests/tests/test7f-by-role-autorun-autodispatcher/pail/logic/worker.yaml b/tests/tests/test7f-by-role-autorun-autodispatcher/pail/logic/worker.yaml index a1a9c4fe..17af24ac 100644 --- a/tests/tests/test7f-by-role-autorun-autodispatcher/pail/logic/worker.yaml +++ b/tests/tests/test7f-by-role-autorun-autodispatcher/pail/logic/worker.yaml @@ -21,4 +21,4 @@ spec: echo "Done with $in" command: ./literal.sh - image: {{ print .Values.image.registry "/" .Values.image.repo "/worker-alpine:" .Chart.AppVersion }} + image: {{ print .Values.image.registry "/" .Values.image.repo "/lunchpail-worker-alpine:" .Chart.AppVersion }} diff --git a/tests/tests/test7f-external/settings.sh b/tests/tests/test7f-external/settings.sh index 30b431ea..b210015c 100644 --- a/tests/tests/test7f-external/settings.sh +++ b/tests/tests/test7f-external/settings.sh @@ -1,6 +1,6 @@ api=workqueue app=https://github.com/IBM/lunchpail-demo.git -branch=v0.0.15 +branch=v0.1.0 deployname=lunchpail-demo # /queue/0,1 <-- 2 workers diff --git a/tests/tests/test7f-repo/pail/app.yaml b/tests/tests/test7f-repo/pail/app.yaml index d2e0b100..8ab89fa7 100644 --- a/tests/tests/test7f-repo/pail/app.yaml +++ b/tests/tests/test7f-repo/pail/app.yaml @@ -7,6 +7,6 @@ spec: role: worker repo: https://github.com/IBM/lunchpail/tree/main/tests/tests/test7f-repo/pail command: ./src/main.sh - image: {{ print .Values.global.image.registry "/" .Values.global.image.repo "/worker-alpine:" .Chart.AppVersion }} + image: {{ print .Values.global.image.registry "/" .Values.global.image.repo "/lunchpail-worker-alpine:" .Chart.AppVersion }} env: WORK_TIME: {{ .Values.duration | default 5 | quote }} diff --git a/tests/tests/test7f/pail/worker.yaml b/tests/tests/test7f/pail/worker.yaml index 63d96841..f75109a9 100644 --- a/tests/tests/test7f/pail/worker.yaml +++ b/tests/tests/test7f/pail/worker.yaml @@ -23,6 +23,6 @@ spec: echo "Done with $in" command: ./literal.sh - image: {{ print .Values.global.image.registry "/" .Values.global.image.repo "/worker-alpine:" .Chart.AppVersion }} + image: {{ print .Values.global.image.registry "/" .Values.global.image.repo "/lunchpail-worker-alpine:" .Chart.AppVersion }} env: WORK_TIME: {{ .Values.duration | default 5 | quote }} diff --git a/tests/tests/test7g/pail/app.yaml b/tests/tests/test7g/pail/app.yaml index eb2ddea2..5cd1e95c 100644 --- a/tests/tests/test7g/pail/app.yaml +++ b/tests/tests/test7g/pail/app.yaml @@ -22,5 +22,5 @@ spec: echo "Done with $in" command: ./literal.sh - image: {{ print .Values.global.image.registry "/" .Values.global.image.repo "/worker-alpine:" .Chart.AppVersion }} + image: {{ print .Values.global.image.registry "/" .Values.global.image.repo "/lunchpail-worker-alpine:" .Chart.AppVersion }} {{- end }} diff --git a/tests/tests/test7g/pail/workdispatcher-app.yaml b/tests/tests/test7g/pail/workdispatcher-app.yaml index 5c928ae8..c2a0a5ee 100644 --- a/tests/tests/test7g/pail/workdispatcher-app.yaml +++ b/tests/tests/test7g/pail/workdispatcher-app.yaml @@ -30,7 +30,7 @@ spec: sleep 10000 command: ./literal.sh - image: {{ print .Values.global.image.registry "/" .Values.global.image.repo "/worker-alpine:" .Chart.AppVersion }} + image: {{ print .Values.global.image.registry "/" .Values.global.image.repo "/lunchpail-worker-alpine:" .Chart.AppVersion }} env: # main.sh from workdispatcher1 uses $taskprefix and $taskprefix2; this overrides an env var from ./workdispatcher-app.yaml taskprefix: tasky diff --git a/tests/tests/test7h/pail/app.yaml b/tests/tests/test7h/pail/app.yaml index 3a42b733..ea147a32 100644 --- a/tests/tests/test7h/pail/app.yaml +++ b/tests/tests/test7h/pail/app.yaml @@ -22,7 +22,7 @@ spec: echo "Done with $in" command: ./literal.sh - image: {{ print .Values.global.image.registry "/" .Values.global.image.repo "/worker-alpine:" .Chart.AppVersion }} + image: {{ print .Values.global.image.registry "/" .Values.global.image.repo "/lunchpail-worker-alpine:" .Chart.AppVersion }} # TODO: dataset.py in run controller doesn't currently support adding both as mount and configmap # inputs: diff --git a/tests/tests/test8/settings.sh b/tests/tests/test8/settings.sh index 68ec2167..904f3e71 100644 --- a/tests/tests/test8/settings.sh +++ b/tests/tests/test8/settings.sh @@ -1,6 +1,6 @@ api=workqueue app=https://github.com/IBM/lunchpail-openroad-max-utilization.git -branch=v0.1.0 +branch=v0.2.0 deployname=lunchpail-openroad-max-utilization # we kill the process before it is finishes diff --git a/tests/tests/test8b/settings.sh b/tests/tests/test8b/settings.sh index 68ec2167..904f3e71 100644 --- a/tests/tests/test8b/settings.sh +++ b/tests/tests/test8b/settings.sh @@ -1,6 +1,6 @@ api=workqueue app=https://github.com/IBM/lunchpail-openroad-max-utilization.git -branch=v0.1.0 +branch=v0.2.0 deployname=lunchpail-openroad-max-utilization # we kill the process before it is finishes