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

Jump to bottom

updated changes for supporting s390x & ppc64le #190

Merged
merged 4 commits into from
Jul 11, 2024
Merged

updated changes for supporting s390x & ppc64le #190

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
57b052c
updated changes for multi-arch
modassarrana89 Jul 8, 2024
935707c
Updated order
modassarrana89 Jul 11, 2024
3b4c6ae
Update README.md
modassarrana89 Jul 11, 2024
7b28217
Update README.md
modassarrana89 Jul 11, 2024
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
16 changes: 6 additions & 10 deletions .github/workflows/build-images.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,8 @@ jobs:
else
echo "VERSION=${{ github.sha }}" >> $GITHUB_ENV
fi
- name: Install qemu dependency
run: |
sudo apt-get update
sudo apt-get install -y qemu-user-static
- name: Set up QEMU
uses: docker/setup-qemu-action@v3
- name: Install yq dependency
run: make yq
- name: Set default authorino image
Expand All @@ -64,7 +62,7 @@ jobs:
with:
image: ${{ env.OPERATOR_NAME }}
tags: ${{ env.IMG_TAGS }}
platforms: linux/amd64,linux/arm64
platforms: linux/amd64,linux/arm64,linux/s390x,linux/ppc64le
build-args: |
VERSION=${{ env.VERSION }}
DEFAULT_AUTHORINO_IMAGE=${{ env.DEFAULT_AUTHORINO_IMAGE }}
Expand Down Expand Up @@ -116,10 +114,8 @@ jobs:
else
echo "VERSION=${{ github.sha }}" >> $GITHUB_ENV
fi
- name: Install qemu dependency
run: |
sudo apt-get update
sudo apt-get install -y qemu-user-static
- name: Set up QEMU
uses: docker/setup-qemu-action@v3
- name: Run make bundle (main)
if: ${{ github.ref_name == env.MAIN_BRANCH_NAME }}
run: make bundle REGISTRY=${{ env.IMG_REGISTRY_HOST }} ORG=${{ env.IMG_REGISTRY_ORG }} IMAGE_TAG=${{ github.sha }}
Expand All @@ -140,7 +136,7 @@ jobs:
with:
image: ${{ env.OPERATOR_NAME }}-bundle
tags: ${{ env.IMG_TAGS }}
platforms: linux/amd64,linux/arm64
platforms: linux/amd64,linux/arm64,linux/s390x,linux/ppc64le
build-args: |
version=${{ env.VERSION }}
containerfiles: |
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ ifeq (,$(shell which opm 2>/dev/null))
set -e ;\
mkdir -p $(dir $(OPM)) ;\
OS=$(shell go env GOOS) && ARCH=$(shell go env GOARCH) && \
curl -sSLo $(OPM) https://github.com/operator-framework/operator-registry/releases/download/v1.15.1/$${OS}-$${ARCH}-opm ;\
curl -sSLo $(OPM) https://github.com/operator-framework/operator-registry/releases/download/v1.20.0/$${OS}-$${ARCH}-opm ;\
chmod +x $(OPM) ;\
}
else
Expand Down
11 changes: 11 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,17 @@ spec:
EOF
```

## Deploy authorino operator using operator-sdk
1. Install operator-sdk bin
```sh
make operator-sdk
```
2. Run operator-sdk bundle command
```
./bin/operator-sdk run bundle quay.io/kuadrant/authorino-operator-bundle:latest
```
Note: For s390x & ppc64le , use operator-sdk to install authorino-operator

## Requesting an Authorino instance

Once the Operator is up and running, you can request instances of Authorino by creating `Authorino` CRs. E.g.:
Expand Down
7 changes: 6 additions & 1 deletion bundle/manifests/authorino-operator.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,11 +83,16 @@ metadata:
capabilities: Basic Install
categories: Integration & Delivery
containerImage: quay.io/kuadrant/authorino-operator:latest
createdAt: "2024-07-01T08:30:34Z"
createdAt: "2024-07-11T09:10:47Z"
operators.operatorframework.io/builder: operator-sdk-v1.32.0
operators.operatorframework.io/project_layout: go.kubebuilder.io/v3
repository: https://github.com/Kuadrant/authorino-operator
support: kuadrant
labels:
operatorframework.io/arch.amd64: supported
operatorframework.io/arch.ppc64le: supported
operatorframework.io/arch.s390x: supported
operatorframework.io/os.linux: supported
name: authorino-operator.v0.0.0
namespace: placeholder
spec:
Expand Down
5 changes: 5 additions & 0 deletions config/manifests/bases/authorino-operator.clusterserviceversion.template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,11 @@ metadata:
support: kuadrant
name: authorino-operator.v${BUNDLE_VERSION}
namespace: placeholder
labels:
operatorframework.io/arch.amd64: supported
operatorframework.io/arch.s390x: supported
operatorframework.io/arch.ppc64le: supported
operatorframework.io/os.linux: supported
Copy link
Contributor

Choose a reason for hiding this comment

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

Out of curiosity is there a operatorframework.io/arch.arm64: supported label for olm? This seems to be the only missing architecture label that we also build the image for in the workflow 🤔

Copy link
Collaborator

Choose a reason for hiding this comment

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

Yes, we build for arm64 but mainly because of devs who work on this platform. We've never had a request to release for it for production use though.

spec:
apiservicedefinitions: {}
customresourcedefinitions:
Expand Down
5 changes: 5 additions & 0 deletions config/manifests/bases/authorino-operator.clusterserviceversion.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,11 @@ metadata:
support: kuadrant
name: authorino-operator.v0.0.0
namespace: placeholder
labels:
operatorframework.io/arch.amd64: supported
operatorframework.io/arch.s390x: supported
operatorframework.io/arch.ppc64le: supported
operatorframework.io/os.linux: supported
spec:
apiservicedefinitions: {}
customresourcedefinitions:
Expand Down
Loading