Skip to content

Commit

Permalink
Revert "passt: Build and publish Passt binding CNI image"
Browse files Browse the repository at this point in the history
This reverts commit 23eed84.

Signed-off-by: Ram Lavi <[email protected]>
  • Loading branch information
RamLavi committed Dec 16, 2024
1 parent 925bee6 commit 557b045
Show file tree
Hide file tree
Showing 5 changed files with 1 addition and 92 deletions.
28 changes: 0 additions & 28 deletions .github/workflows/publish-img.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ on:
env:
REGISTRY: ghcr.io
IMAGE_NAME: kubevirt/ipam-controller
PASST_BINDING_CNI_IMAGE_NAME: kubevirt/passt-binding-cni

jobs:
push-amd64:
Expand Down Expand Up @@ -40,11 +39,6 @@ jobs:
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Fetch KubeVirt Release
run: |
KUBEVIRT_VERSION=$(curl -sSL https://storage.googleapis.com/kubevirt-prow/release/kubevirt/kubevirt/stable.txt)
echo "KUBEVIRT_VERSION=${KUBEVIRT_VERSION}" >> $GITHUB_ENV
- name: Push latest container image
if: github.repository_owner == 'kubevirt'
uses: docker/[email protected]
Expand All @@ -54,17 +48,6 @@ jobs:
tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest
file: Dockerfile

- name: Push latest passt binding cni container image
if: github.repository_owner == 'kubevirt'
uses: docker/[email protected]
with:
context: .
push: true
tags: ${{ env.REGISTRY }}/${{ env.PASST_BINDING_CNI_IMAGE_NAME }}:latest
file: passt/Dockerfile
build-args: |
KUBEVIRT_VERSION=${{ env.KUBEVIRT_VERSION }}
- name: Push stable container image
if: startsWith(github.ref, 'refs/tags/')
uses: docker/[email protected]
Expand All @@ -74,17 +57,6 @@ jobs:
tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.ref_name }}
file: Dockerfile

- name: Push stable passt binding cni container image
if: startsWith(github.ref, 'refs/tags/')
uses: docker/[email protected]
with:
context: .
push: true
tags: ${{ env.REGISTRY }}/${{ env.PASST_BINDING_CNI_IMAGE_NAME }}:${{ github.ref_name }}
file: passt/Dockerfile
build-args: |
KUBEVIRT_VERSION=${{ env.KUBEVIRT_VERSION }}
- name: Template release manifests
if: startsWith(github.ref, 'refs/tags/')
run: IMG=${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ github.ref_name }} make build-installer
Expand Down
4 changes: 0 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@

# Image URL to use all building/pushing image targets
IMG ?= kubevirt-ipam-controller:latest
PASST_IMG ?= kubevirt/passt-binding-cni:latest

export KUBECONFIG ?= $(shell pwd)/.output/kubeconfig

Expand Down Expand Up @@ -104,13 +103,10 @@ run: manifests generate fmt vet ## Run a controller from your host.
.PHONY: docker-build
docker-build: ## Build docker image with the manager.
$(CONTAINER_TOOL) build -t ${IMG} .
export KUBEVIRT_VERSION=$$(curl -sSL https://storage.googleapis.com/kubevirt-prow/release/kubevirt/kubevirt/stable.txt) && \
$(CONTAINER_TOOL) build --build-arg KUBEVIRT_VERSION=$${KUBEVIRT_VERSION} -f passt/Dockerfile -t ${PASST_IMG} .

.PHONY: docker-push
docker-push: ## Push docker image with the manager.
$(CONTAINER_TOOL) push ${IMG}
$(CONTAINER_TOOL) push ${PASST_IMG}

# PLATFORMS defines the target platforms for the manager image be built to provide support to multiple
# architectures. (i.e. make docker-buildx IMG=myregistry/mypoperator:0.0.1). To use this option you need to:
Expand Down
3 changes: 1 addition & 2 deletions hack/cluster.sh
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,8 @@ function down() {

function sync() {
local img=localhost:5000/kubevirt-ipam-controller
local passt_img=localhost:5000/passt-binding-cni
local tag=latest
IMG=$img:$tag PASST_IMG=$passt_img:$tag make \
IMG=$img:$tag make \
build \
docker-build \
docker-push
Expand Down
9 changes: 0 additions & 9 deletions passt/Dockerfile

This file was deleted.

49 changes: 0 additions & 49 deletions passt/passt-binding-cni-ds.yaml

This file was deleted.

0 comments on commit 557b045

Please sign in to comment.