chore: adjust makefile to be able to use in GH action (#73 )

[nickboldt]

What does this PR do?

chore: adjust makefile to be able to use in GH action (#73 )

Signed-off-by: RHDH Build (rhdh-bot) rhdh-bot@redhat.com

Screenshot/screencast of this PR

N/A

What issues does this PR fix or reference?

N/A (or see commit message above for issue number)

How to test this PR?

N/A

PR Checklist

As the author of this Pull Request I made sure that:

• The Eclipse Contributor Agreement is valid
• Code produced is complete
• Code builds without errors
• Tests are covering the bugfix
• The repository devfile is up to date and works, if one exists
• Sections What issues does this PR fix or reference and How to test this PR completed
• Relevant user documentation updated
• Relevant contributing documentation updated
• CI/CD changes implemented, documented and communicated

Reviewers

Reviewers, please comment how you tested the PR when approving it.

[nickboldt]

@rm3l do we need the pr.yaml to run on BOTH docker and podman? I would think we would be good enough with just podman, until such time as we want multi-arch builds upstream with docker buildx. For now, we should be fine with the simpler podman build approach, which means the local builds I do in Fedora with the makefile are the same as those done in GH action.

Do you use docker locally? If so we could switch to using docker in the GH actions...

[github-actions]

PR images are available:

1. https://quay.io/janus/operator:pr-123-76d6b73
2. https://quay.io/janus/operator-bundle:pr-123-76d6b73
3. https://quay.io/janus/operator-catalog:pr-123-76d6b73

[github-actions]

PR images are available:

1. https://quay.io/janus/operator:pr-123-5425055
2. https://quay.io/janus/operator-bundle:pr-123-5425055
3. https://quay.io/janus/operator-catalog:pr-123-5425055

[nickboldt]

Tested locally with:

export CONTAINER_ENGINE=podman 
export VERSION=pr-1234-f00cafebabe
CONTAINER_ENGINE=${CONTAINER_ENGINE} VERSION=0.0.1-${VERSION} make release-build release-push

Result is this diff:

diff --git a/bundle/manifests/backstage-operator.clusterserviceversion.yaml b/bundle/manifests/backstage-operator.clusterserviceversion.yaml
index bde72d8..652962e 100644
--- a/bundle/manifests/backstage-operator.clusterserviceversion.yaml
+++ b/bundle/manifests/backstage-operator.clusterserviceversion.yaml
@@ -21,10 +21,10 @@ metadata:
         }
       ]
     capabilities: Basic Install
     operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
-  name: backstage-operator.v0.0.1
+  name: backstage-operator.v0.0.1-pr-1234-f00cafebabe
   namespace: placeholder
 spec:
   apiservicedefinitions: {}
@@ -206,7 +206,7 @@ spec:
                   value: quay.io/fedora/postgresql-15:latest
                 - name: RELATED_IMAGE_backstage
                   value: quay.io/janus-idp/backstage-showcase:next
-                image: quay.io/janus/operator:next
+                image: quay.io/janus/operator:0.0.1-pr-1234-f00cafebabe
                 livenessProbe:
                   httpGet:
                     path: /healthz
@@ -309,4 +309,4 @@ spec:
     name: postgresql
   - image: quay.io/janus-idp/backstage-showcase:next
     name: backstage
-  version: 0.0.1
+  version: 0.0.1-pr-1234-f00cafebabe
 
diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml
index 027d0ce..413bbc1 100644
--- a/config/manager/kustomization.yaml
+++ b/config/manager/kustomization.yaml
@@ -5,7 +5,7 @@ kind: Kustomization
 images:
 - name: controller
   newName: quay.io/janus/operator
-  newTag: v0.0.1
+  newTag: 0.0.1-pr-1234-f00cafebabe
 
 generatorOptions:
   disableNameSuffixHash: true

[github-actions]

PR images are available:

1. https://quay.io/janus/operator:pr-123-78f3c35
2. https://quay.io/janus/operator-bundle:pr-123-78f3c35
3. https://quay.io/janus/operator-catalog:pr-123-78f3c35

[github-actions]

PR images are available:

1. https://quay.io/janus/operator:pr-123-e20da7e
2. https://quay.io/janus/operator-bundle:pr-123-e20da7e
3. https://quay.io/janus/operator-catalog:pr-123-e20da7e

[rm3l]

@rm3l do we need the pr.yaml to run on BOTH docker and podman? I would think we would be good enough with just podman, until such time as we want multi-arch builds upstream with docker buildx. For now, we should be fine with the simpler podman build approach, which means the local builds I do in Fedora with the makefile are the same as those done in GH action.

Do you use docker locally? If so we could switch to using docker in the GH actions...

I have both docker and podman locally, and use whatever default container engine is set in our Makefile. I didn't override it.
But I am fine with simplifying pr.yaml file as well. IIRC, it was there to ensure both targets run correctly, as we had a typo issue in one of them back then.

[rm3l]

Also, in .github/workflows/pr-container-build.yaml, can you rename the pr-docker-build job (along with its name field), since it is not using Docker?

[nickboldt]

@rm3l do we need the pr.yaml to run on BOTH docker and podman? I would think we would be good enough with just podman, until such time as we want multi-arch builds upstream with docker buildx. For now, we should be fine with the simpler podman build approach, which means the local builds I do in Fedora with the makefile are the same as those done in GH action.
Do you use docker locally? If so we could switch to using docker in the GH actions...

I have both docker and podman locally, and use whatever default container engine is set in our Makefile. I didn't override it. But I am fine with simplifying pr.yaml file as well. IIRC, it was there to ensure both targets run correctly, as we had a typo issue in one of them back then.

On my machine with podman and the docker-podman wrapper (Fedora 36):

docker build --platform linux/amd64 -f docker/Dockerfile -t quay.io/janus/operator:0.0.1 --label quay.expires-after=14d .
Got permission denied while trying to connect to the Docker daemon socket at unix:///var/run/docker.sock: Post "http://%2Fvar%2Frun%2Fdocker.sock/v1.24/build?buildargs=%7B%7D&cachefrom=%5B%5D&cgroupparent=&cpuperiod=0&cpuquota=0&cpusetcpus=&cpusetmems=&cpushares=0&dockerfile=docker%2FDockerfile&labels=%7B%22quay.expires-after%22%3A%2214d%22%7D&memory=0&memswap=0&networkmode=default&platform=linux%2Famd64&rm=1&shmsize=0&t=quay.io%2Fjanus%2Foperator%3A0.0.1&target=&ulimits=null&version=1": dial unix /var/run/docker.sock: connect: permission denied
make: *** [Makefile:148: operator-build] Error 1

I know there's a workaround for this, but I prefer to just use the tool we support inside RH. :D

[github-actions]

PR images are available:

1. https://quay.io/janus/operator:pr-123-01b3617
2. https://quay.io/janus/operator-bundle:pr-123-01b3617
3. https://quay.io/janus/operator-catalog:pr-123-01b3617

[jianrongzhang89]

@rm3l do we need the pr.yaml to run on BOTH docker and podman? I would think we would be good enough with just podman, until such time as we want multi-arch builds upstream with docker buildx. For now, we should be fine with the simpler podman build approach, which means the local builds I do in Fedora with the makefile are the same as those done in GH action.
Do you use docker locally? If so we could switch to using docker in the GH actions...

I have both docker and podman locally, and use whatever default container engine is set in our Makefile. I didn't override it. But I am fine with simplifying pr.yaml file as well. IIRC, it was there to ensure both targets run correctly, as we had a typo issue in one of them back then.

On my machine with podman and the docker-podman wrapper (Fedora 36):

docker build --platform linux/amd64 -f docker/Dockerfile -t quay.io/janus/operator:0.0.1 --label quay.expires-after=14d .
Got permission denied while trying to connect to the Docker daemon socket at unix:///var/run/docker.sock: Post "http://%2Fvar%2Frun%2Fdocker.sock/v1.24/build?buildargs=%7B%7D&cachefrom=%5B%5D&cgroupparent=&cpuperiod=0&cpuquota=0&cpusetcpus=&cpusetmems=&cpushares=0&dockerfile=docker%2FDockerfile&labels=%7B%22quay.expires-after%22%3A%2214d%22%7D&memory=0&memswap=0&networkmode=default&platform=linux%2Famd64&rm=1&shmsize=0&t=quay.io%2Fjanus%2Foperator%3A0.0.1&target=&ulimits=null&version=1": dial unix /var/run/docker.sock: connect: permission denied
make: *** [Makefile:148: operator-build] Error 1

I know there's a workaround for this, but I prefer to just use the tool we support inside RH. :D

If you use docker you should start the docker daemon first.

[nickboldt]

If you use docker you should start the docker daemon first.

sudo dockerd &

make release-build
...
docker build --platform linux/amd64 -f docker/Dockerfile -t quay.io/janus/operator:0.0.1 --label quay.expires-after=14d .
Got permission denied while trying to connect to the Docker daemon socket at unix:///var/run/docker.sock: Post "http://%2Fvar%2Frun%2Fdocker.sock/v1.24/build?buildargs=%7B%7D&cachefrom=%5B%5D&cgroupparent=&cpuperiod=0&cpuquota=0&cpusetcpus=&cpusetmems=&cpushares=0&dockerfile=docker%2FDockerfile&labels=%7B%22quay.expires-after%22%3A%2214d%22%7D&memory=0&memswap=0&networkmode=default&platform=linux%2Famd64&rm=1&shmsize=0&t=quay.io%2Fjanus%2Foperator%3A0.0.1&target=&ulimits=null&version=1": dial unix /var/run/docker.sock: connect: permission denied
make: *** [Makefile:148: operator-build] Error 1

[github-actions]

PR images are available:

1. https://quay.io/janus/operator:pr-123-9cd997d
2. https://quay.io/janus/operator-bundle:pr-123-9cd997d
3. https://quay.io/janus/operator-catalog:pr-123-9cd997d

[gazarenkov]

@rm3l do we need the pr.yaml to run on BOTH docker and podman? I would think we would be good enough with just podman, until such time as we want multi-arch builds upstream with docker buildx. For now, we should be fine with the simpler podman build approach, which means the local builds I do in Fedora with the makefile are the same as those done in GH action.

Do you use docker locally? If so we could switch to using docker in the GH actions...

As discussed, let's keep both of them for the time.
Yes, it is used locally.