Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

create Containerfiles for pushing images #3851

Merged
merged 11 commits into from
Jan 3, 2025
Merged

create Containerfiles for pushing images #3851

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
d17cd38
publish_image.sh: replace docker with podman
dhiller Dec 20, 2024
2f1a00c
rehearse: use Containerfile for push
dhiller Dec 20, 2024
16a1cbc
release-blocker: use Containerfile for push
dhiller Dec 20, 2024
6d9aabf
ci-usage-exporter: use Containerfile for push
dhiller Dec 20, 2024
da9745a
phased: use Containerfile for push
dhiller Dec 20, 2024
ce10c35
flake-report-creator: use Containerfile for push
dhiller Dec 20, 2024
5ca2040
flakefinder: use Containerfile for push
dhiller Dec 20, 2024
c5fd73d
indexpagecreator: use Containerfile for push
dhiller Dec 20, 2024
ce2a285
test-report: use Containerfile for push
dhiller Dec 20, 2024
3411528
referee: align Containerfile, use quay.io
dhiller Dec 20, 2024
c01a2da
images: update base image reference
dhiller Jan 3, 2025
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
18 changes: 18 additions & 0 deletions external-plugins/phased/Containerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
FROM quay.io/kubevirtci/golang:v20241213-57bd934 as builder
ENV GOPROXY=https://proxy.golang.org|direct \
GOFLAGS="-mod=vendor -ldflags=-extldflags=\"-static\"" \
CGO_ENABLED=0 \
GOOS=linux \
GOARCH=amd64
ENV GIMME_GO_VERSION=1.21.6
RUN mkdir kubevirt && \
cd kubevirt && \
git clone https://github.com/kubevirt/project-infra.git && \
cd project-infra && \
/usr/local/bin/runner.sh /bin/sh -ce "env GOPROXY=off go build -tags netgo -o /go/bin/phased ./external-plugins/phased/plugin/main.go" && \
/usr/local/bin/runner.sh /bin/sh -ce "go clean -cache -modcache" && \
cd .. && rm -rf ./project-infra

FROM gcr.io/k8s-prow/git:v20240729-4f255edb07
COPY --from=builder /go/bin/phased /usr/bin/phased
ENTRYPOINT ["/usr/bin/phased"]
11 changes: 6 additions & 5 deletions external-plugins/phased/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
CONTAINER_IMAGE := referee
CONTAINER_REPO := quay.io/kubevirtci/$(CONTAINER_IMAGE)

.PHONY: all clean format test push
all: format test push
bazelbin := bazelisk

build:
$(bazelbin) build //external-plugins/phased/plugin
go build ./plugin/...

format:
gofmt -w .

test:
$(bazelbin) test //external-plugins/phased/...
go test ./plugin/...

push:
$(bazelbin) run --stamp --workspace_status_command="./hack/print-workspace-status-no-git-tag.sh" //external-plugins/phased/plugin:push
bash -x ../../hack/update-deployments-with-latest-image.sh quay.io/kubevirtci/phased
cd ../../images && ./publish_image.sh $(CONTAINER_IMAGE) quay.io kubevirtci
bash -x ../../hack/update-deployments-with-latest-image.sh $(CONTAINER_REPO)
18 changes: 18 additions & 0 deletions external-plugins/rehearse/Containerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
FROM quay.io/kubevirtci/golang:v20241213-57bd934 as builder
ENV GOPROXY=https://proxy.golang.org|direct \
GOFLAGS="-mod=vendor -ldflags=-extldflags=\"-static\"" \
CGO_ENABLED=0 \
GOOS=linux \
GOARCH=amd64
ENV GIMME_GO_VERSION=1.21.6
RUN mkdir kubevirt && \
cd kubevirt && \
git clone https://github.com/kubevirt/project-infra.git && \
Copy link
Member

Choose a reason for hiding this comment

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

Why can't we use the local copy of project-infra that should be available in the postsubmit pod?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I didn't do it like that because it was more easily testable locally.

Copy link
Member

Choose a reason for hiding this comment

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

Yeah ideally the build would work locally and for the publish postsubmit - this approach will not include any local changes but we can take that as a follow on PR.

cd project-infra && \
/usr/local/bin/runner.sh /bin/sh -ce "env GOPROXY=off go build -tags netgo -o /go/bin/rehearse ./external-plugins/rehearse/plugin/main.go" && \
/usr/local/bin/runner.sh /bin/sh -ce "go clean -cache -modcache" && \
cd .. && rm -rf ./project-infra
Copy link
Member

Choose a reason for hiding this comment

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

Is this step needed? As this is just the builder container I don't think we need to worry about cleaning up too much.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Agree - we can also remove the go clean step.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

But technically doing this or not doesn't matter at all.

Copy link
Member

Choose a reason for hiding this comment

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

Yes just less steps in the build should reduce build time. Again its just a nit.


FROM gcr.io/k8s-prow/git:v20240729-4f255edb07
COPY --from=builder /go/bin/rehearse /usr/bin/rehearse
ENTRYPOINT ["/usr/bin/rehearse"]
11 changes: 6 additions & 5 deletions external-plugins/rehearse/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
CONTAINER_IMAGE := referee
CONTAINER_REPO := quay.io/kubevirtci/$(CONTAINER_IMAGE)

.PHONY: all clean format test push
all: format test push
bazelbin := bazelisk

build:
$(bazelbin) build //external-plugins/rehearse/plugin
go build ./...

format:
gofmt -w .

test:
$(bazelbin) test //external-plugins/rehearse/...
go test ./...

push:
$(bazelbin) run --stamp --workspace_status_command="./hack/print-workspace-status-no-git-tag.sh" //external-plugins/rehearse/plugin:push
bash -x ../../hack/update-deployments-with-latest-image.sh quay.io/kubevirtci/rehearse
cd ../../images && ./publish_image.sh $(CONTAINER_IMAGE) quay.io kubevirtci
bash -x ../../hack/update-deployments-with-latest-image.sh $(CONTAINER_REPO)
11 changes: 6 additions & 5 deletions external-plugins/release-blocker/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
CONTAINER_IMAGE := release-blocker
CONTAINER_REPO := quay.io/kubevirtci/$(CONTAINER_IMAGE)

.PHONY: all clean format test push
all: format test push
bazelbin := bazelisk

build:
$(bazelbin) build //external-plugins/release-blocker:release-blocker
go build ./...

format:
gofmt -w .

test:
$(bazelbin) test //external-plugins/release-blocker:*
go test ./...

push:
$(bazelbin) run //external-plugins/release-blocker:push
bash -x ../../hack/update-jobs-with-latest-image.sh quay.io/kubevirtci/release-blocker
cd ../../images && ./publish_image.sh $(CONTAINER_IMAGE) quay.io kubevirtci
bash -x ../../hack/update-jobs-with-latest-image.sh $(CONTAINER_REPO)
6 changes: 0 additions & 6 deletions github/ci/prow-deploy/files/jobs/k8snetworkplumbingwg/kubemacpool/kubemacpool-periodics.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ periodics:
env:
- name: GOOGLE_APPLICATION_CREDENTIALS
value: /etc/gcs/service-account.json
command:
- "/app/robots/cmd/flakefinder/app.binary"
args:
- --dry-run=false
- --token=/etc/github/oauth
Expand Down Expand Up @@ -46,8 +44,6 @@ periodics:
env:
- name: GOOGLE_APPLICATION_CREDENTIALS
value: /etc/gcs/service-account.json
command:
- "/app/robots/cmd/flakefinder/app.binary"
args:
- --dry-run=false
- --token=/etc/github/oauth
Expand Down Expand Up @@ -81,8 +77,6 @@ periodics:
env:
- name: GOOGLE_APPLICATION_CREDENTIALS
value: /etc/gcs/service-account.json
command:
- "/app/robots/cmd/flakefinder/app.binary"
args:
- --dry-run=false
- --token=/etc/github/oauth
Expand Down
6 changes: 0 additions & 6 deletions ...s/kubevirt/cluster-network-addons-operator/cluster-network-addons-operator-periodics.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ periodics:
spec:
containers:
- image: quay.io/kubevirtci/flakefinder:v20230112-ec14f598
command:
- "/app/robots/cmd/flakefinder/app.binary"
args:
- --dry-run=false
- --token=/etc/github/oauth
Expand All @@ -32,8 +30,6 @@ periodics:
spec:
containers:
- image: quay.io/kubevirtci/flakefinder:v20230112-ec14f598
command:
- "/app/robots/cmd/flakefinder/app.binary"
args:
- --dry-run=false
- --token=/etc/github/oauth
Expand All @@ -53,8 +49,6 @@ periodics:
spec:
containers:
- image: quay.io/kubevirtci/flakefinder:v20230112-ec14f598
command:
- "/app/robots/cmd/flakefinder/app.binary"
args:
- --dry-run=false
- --token=/etc/github/oauth
Expand Down
6 changes: 0 additions & 6 deletions ...iles/jobs/kubevirt/containerized-data-importer/containerized-data-importer-periodics.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ periodics:
spec:
containers:
- image: quay.io/kubevirtci/flakefinder:v20230112-ec14f598
command:
- "/app/robots/cmd/flakefinder/app.binary"
args:
- --dry-run=false
- --token=/etc/github/oauth
Expand All @@ -33,8 +31,6 @@ periodics:
spec:
containers:
- image: quay.io/kubevirtci/flakefinder:v20230112-ec14f598
command:
- "/app/robots/cmd/flakefinder/app.binary"
args:
- --dry-run=false
- --token=/etc/github/oauth
Expand All @@ -55,8 +51,6 @@ periodics:
spec:
containers:
- image: quay.io/kubevirtci/flakefinder:v20230112-ec14f598
command:
- "/app/robots/cmd/flakefinder/app.binary"
args:
- --dry-run=false
- --token=/etc/github/oauth
Expand Down
8 changes: 0 additions & 8 deletions github/ci/prow-deploy/files/jobs/kubevirt/kubevirt/kubevirt-periodics.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@ periodics:
- --report_output_child_path=kubevirt/kubevirt
- --skip_results_before_start_of_report=false
- --pr_base_branch=main
command:
- /app/robots/cmd/flakefinder/app.binary
image: quay.io/kubevirtci/flakefinder:v20230112-ec14f598
name: ""
resources: {}
Expand All @@ -42,8 +40,6 @@ periodics:
- --skip_results_before_start_of_report=false
- --periodic_job_dir_regex=periodic-kubevirt-e2e-.*
- --pr_base_branch=main
command:
- /app/robots/cmd/flakefinder/app.binary
image: quay.io/kubevirtci/flakefinder:v20230112-ec14f598
name: ""
resources: {}
Expand All @@ -66,8 +62,6 @@ periodics:
- --skip_results_before_start_of_report=false
- --periodic_job_dir_regex=periodic-kubevirt-e2e-.*
- --pr_base_branch=main
command:
- /app/robots/cmd/flakefinder/app.binary
image: quay.io/kubevirtci/flakefinder:v20230112-ec14f598
name: ""
resources: {}
Expand Down Expand Up @@ -176,8 +170,6 @@ periodics:
- --skip_results_before_start_of_report=false
- --periodic_job_dir_regex=periodic-kubevirt-e2e-.*
- --pr_base_branch=main
command:
- /app/robots/cmd/flakefinder/app.binary
image: quay.io/kubevirtci/flakefinder:v20230112-ec14f598
name: ""
resources: {}
Expand Down
2 changes: 0 additions & 2 deletions github/ci/prow-deploy/files/jobs/kubevirt/project-infra/project-infra-periodics.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,8 +242,6 @@ periodics:
spec:
containers:
- image: quay.io/kubevirtci/indexpagecreator:v20230102-5ed6f7d7
command:
- "/app/robots/cmd/indexpagecreator/app.binary"
args:
- --dry-run=false
- name: periodic-kubevirt-mirror-uploader
Expand Down
5 changes: 3 additions & 2 deletions github/ci/prow-deploy/files/jobs/kubevirt/project-infra/project-infra-postsubmits.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ postsubmits:
- "-c"
- |
cat "$QUAY_PASSWORD" | podman login --username $(cat "$QUAY_USER") --password-stdin=true quay.io
bazelisk run //external-plugins/release-blocker:push
make -C ./external-plugins/release-blocker push
resources:
requests:
memory: "8Gi"
Expand Down Expand Up @@ -700,7 +700,8 @@ postsubmits:
- "-c"
- |
cat "$QUAY_PASSWORD" | podman login --username $(cat "$QUAY_USER") --password-stdin=true quay.io
bazelisk run //robots/cmd/ci-usage-exporter:push
cd images
./publish_image.sh ci-usage-exporter quay.io kubevirtci
resources:
requests:
memory: "8Gi"
Expand Down
6 changes: 0 additions & 6 deletions ...ub/ci/prow-deploy/files/jobs/nmstate/kubernetes-nmstate/kubernetes-nmstate-periodics.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,6 @@ periodics:
env:
- name: GOOGLE_APPLICATION_CREDENTIALS
value: /etc/gcs/service-account.json
command:
- "/app/robots/cmd/flakefinder/app.binary"
args:
- --dry-run=false
- --token=/etc/github/oauth
Expand Down Expand Up @@ -46,8 +44,6 @@ periodics:
env:
- name: GOOGLE_APPLICATION_CREDENTIALS
value: /etc/gcs/service-account.json
command:
- "/app/robots/cmd/flakefinder/app.binary"
args:
- --dry-run=false
- --token=/etc/github/oauth
Expand Down Expand Up @@ -81,8 +77,6 @@ periodics:
env:
- name: GOOGLE_APPLICATION_CREDENTIALS
value: /etc/gcs/service-account.json
command:
- "/app/robots/cmd/flakefinder/app.binary"
args:
- --dry-run=false
- --token=/etc/github/oauth
Expand Down
2 changes: 1 addition & 1 deletion images/botreview/Containerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ RUN mkdir -p /go/src/kubevirt/ && \
go mod vendor && \
env GOPROXY=off GOFLAGS=-mod=vendor CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o /go/bin/botreview ./external-plugins/botreview/main.go

FROM gcr.io/k8s-prow/git:v20231107-c87e01249e
FROM gcr.io/k8s-prow/git:v20240729-4f255edb07
COPY --from=builder /go/bin/botreview /usr/bin/botreview
ENTRYPOINT ["/usr/bin/botreview"]
18 changes: 18 additions & 0 deletions images/ci-usage-exporter/Containerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
FROM quay.io/kubevirtci/golang:v20241213-57bd934 as builder
ENV GOPROXY=https://proxy.golang.org|direct \
GOFLAGS="-mod=vendor -ldflags=-extldflags=\"-static\"" \
CGO_ENABLED=0 \
GOOS=linux \
GOARCH=amd64
ENV GIMME_GO_VERSION=1.21.6
RUN mkdir kubevirt && \
cd kubevirt && \
git clone https://github.com/kubevirt/project-infra.git && \
cd project-infra && \
/usr/local/bin/runner.sh /bin/sh -ce "env GOPROXY=off go build -tags netgo -o /go/bin/ci-usage-exporter ./robots/cmd/ci-usage-exporter" && \
/usr/local/bin/runner.sh /bin/sh -ce "go clean -cache -modcache" && \
cd .. && rm -rf ./project-infra

FROM gcr.io/k8s-prow/git:v20240729-4f255edb07
COPY --from=builder /go/bin/ci-usage-exporter /usr/bin/ci-usage-exporter
ENTRYPOINT ["/usr/bin/ci-usage-exporter"]
18 changes: 18 additions & 0 deletions images/flake-report-creator/Containerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
FROM quay.io/kubevirtci/golang:v20241213-57bd934 as builder
ENV GOPROXY=https://proxy.golang.org|direct \
GOFLAGS="-mod=vendor -ldflags=-extldflags=\"-static\"" \
CGO_ENABLED=0 \
GOOS=linux \
GOARCH=amd64
ENV GIMME_GO_VERSION=1.21.6
RUN mkdir kubevirt && \
cd kubevirt && \
git clone https://github.com/kubevirt/project-infra.git && \
cd project-infra && \
/usr/local/bin/runner.sh /bin/sh -ce "env GOPROXY=off go build -tags netgo -o /go/bin/flake-report-creator ./robots/cmd/flake-report-creator" && \
/usr/local/bin/runner.sh /bin/sh -ce "go clean -cache -modcache" && \
cd .. && rm -rf ./project-infra

FROM gcr.io/k8s-prow/git:v20240729-4f255edb07
COPY --from=builder /go/bin/flake-report-creator /usr/bin/flake-report-creator
ENTRYPOINT ["/usr/bin/flake-report-creator"]
18 changes: 18 additions & 0 deletions images/flakefinder/Containerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
FROM quay.io/kubevirtci/golang:v20241213-57bd934 as builder
ENV GOPROXY=https://proxy.golang.org|direct \
GOFLAGS="-mod=vendor -ldflags=-extldflags=\"-static\"" \
CGO_ENABLED=0 \
GOOS=linux \
GOARCH=amd64
ENV GIMME_GO_VERSION=1.21.6
RUN mkdir kubevirt && \
cd kubevirt && \
git clone https://github.com/kubevirt/project-infra.git && \
cd project-infra && \
/usr/local/bin/runner.sh /bin/sh -ce "env GOPROXY=off go build -tags netgo -o /go/bin/flakefinder ./robots/cmd/flakefinder" && \
/usr/local/bin/runner.sh /bin/sh -ce "go clean -cache -modcache" && \
cd .. && rm -rf ./project-infra

FROM gcr.io/k8s-prow/git:v20240729-4f255edb07
COPY --from=builder /go/bin/flakefinder /usr/bin/flakefinder
ENTRYPOINT ["/usr/bin/flakefinder"]
18 changes: 18 additions & 0 deletions images/indexpagecreator/Containerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
FROM quay.io/kubevirtci/golang:v20241213-57bd934 as builder
ENV GOPROXY=https://proxy.golang.org|direct \
GOFLAGS="-mod=vendor -ldflags=-extldflags=\"-static\"" \
CGO_ENABLED=0 \
GOOS=linux \
GOARCH=amd64
ENV GIMME_GO_VERSION=1.21.6
RUN mkdir kubevirt && \
cd kubevirt && \
git clone https://github.com/kubevirt/project-infra.git && \
cd project-infra && \
/usr/local/bin/runner.sh /bin/sh -ce "env GOPROXY=off go build -tags netgo -o /go/bin/indexpagecreator ./robots/cmd/indexpagecreator" && \
/usr/local/bin/runner.sh /bin/sh -ce "go clean -cache -modcache" && \
cd .. && rm -rf ./project-infra

FROM gcr.io/k8s-prow/git:v20240729-4f255edb07
COPY --from=builder /go/bin/indexpagecreator /usr/bin/indexpagecreator
ENTRYPOINT ["/usr/bin/indexpagecreator"]
4 changes: 2 additions & 2 deletions images/publish_image.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,13 +65,13 @@ get_image_tag() {
build_image() {
local build_target="${1:?}"
local image_name="${2:?}"
docker build . -t "$image_name" -t "$build_target"
podman build . -t "$image_name" -t "$build_target"
}

publish_image() {
local full_image_name="${1:?}"

docker push "${full_image_name}"
podman push "${full_image_name}"
}

get_full_image_name() {
Expand Down
Loading