Skip to content

Commit

Permalink
drop docker from makefile and README (#1114)
Browse files Browse the repository at this point in the history
* drop docker from makefile and README

* leftovers

* reword
  • Loading branch information
MatousJobanek authored Dec 19, 2024
1 parent 9237d9c commit 1798976
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 59 deletions.
6 changes: 3 additions & 3 deletions README.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ image:https://goreportcard.com/badge/github.com/codeready-toolchain/host-operato
image:https://godoc.org/github.com/codeready-toolchain/host-operator?status.png[GoDoc,link="https://godoc.org/github.com/codeready-toolchain/host-operator"]
image:https://codecov.io/gh/codeready-toolchain/host-operator/branch/master/graph/badge.svg[Codecov.io,link="https://codecov.io/gh/codeready-toolchain/host-operator"]
image:https://github.com/codeready-toolchain/host-operator/actions/workflows/operator-cd.yml/badge.svg[Operator CD,link="https://github.com/codeready-toolchain/host-operator/actions/workflows/operator-cd.yml"]
image:https://quay.io/repository/codeready-toolchain/host-operator/status["Docker Repository on Quay", link="https://quay.io/repository/codeready-toolchain/host-operator"]
image:https://quay.io/repository/codeready-toolchain/host-operator/status["Image Repository on Quay", link="https://quay.io/repository/codeready-toolchain/host-operator"]

This is the CodeReady Toolchain Host Operator repository. It contains the OpenShift Operator that is deployed on the "host" cluster in the SaaS.

Expand Down Expand Up @@ -34,7 +34,7 @@ NOTE: If the problem occurred when releasing registration-service, then don't do

1. Log in to quay.io using an account that has the write permissions in quay.io/codeready-toolchain/host-operator repo.
2. Checkout to the problematic (missing) commit that failed in the pipeline and that has to be manually released.
3. Run `make docker-push QUAY_NAMESPACE=codeready-toolchain`
3. Run `make podman-push QUAY_NAMESPACE=codeready-toolchain`
4. Run `make push-to-quay-staging QUAY_NAMESPACE=codeready-toolchain`

=== End-to-End tests
Expand Down Expand Up @@ -75,7 +75,7 @@ There are two Makefile targets that will execute the e2e tests:
* `make test-e2e-local` - this target doesn't clone anything, but it runs run e2e tests for both operators from the directory `../toolchain-e2e`. As deployment for `host-operator` it uses the current code that is at HEAD.

The tests executed within https://github.com/codeready-toolchain/toolchain-e2e[toolchain-e2e] repo will take care of creating all needed namespaces with random names (or see below for enforcing some specific namespace names).
It will also create all required CRDs, role and role bindings for the service accounts, build the Docker images for both operators and push them to the OpenShift container registry. Finally, it will deploy the operators and run the tests using the operator-sdk.
It will also create all required CRDs, role and role bindings for the service accounts, build the images for both operators and push them to the image registry. Finally, it will deploy the operators and run the tests.

NOTE: you can override the default namespace names where the end-to-end tests are going to be executed - eg.: `make test-e2e HOST_NS=my-host MEMBER_NS=my-member` file.

Expand Down
56 changes: 0 additions & 56 deletions make/docker.mk

This file was deleted.

24 changes: 24 additions & 0 deletions make/podman.mk
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
QUAY_NAMESPACE ?= ${GO_PACKAGE_ORG_NAME}
TARGET_REGISTRY := quay.io
IMAGE_TAG ?= ${GIT_COMMIT_ID_SHORT}
IMAGE ?= ${TARGET_REGISTRY}/${QUAY_NAMESPACE}/${GO_PACKAGE_REPO_NAME}:${IMAGE_TAG}
QUAY_USERNAME ?= ${QUAY_NAMESPACE}
IMAGE_PLATFORM ?= linux/amd64

.PHONY: podman-image
## Build the binary image
podman-image: build
$(Q)podman build --platform ${IMAGE_PLATFORM} -f build/Dockerfile -t ${IMAGE} .

.PHONY: podman-push
## Push the binary image to quay.io registry
podman-push: check-namespace podman-image
$(Q)podman push ${IMAGE}

.PHONY: check-namespace
check-namespace:
ifeq ($(QUAY_NAMESPACE),${GO_PACKAGE_ORG_NAME})
@echo "#################################################### WARNING ####################################################"
@echo you are going to push to $(QUAY_NAMESPACE) namespace, make sure you have set QUAY_NAMESPACE variable appropriately
@echo "#################################################################################################################"
endif

0 comments on commit 1798976

Please sign in to comment.