From debbb9b45097566e056d94e6e9e2098f99857823 Mon Sep 17 00:00:00 2001 From: Modassar Rana Date: Thu, 11 Jul 2024 17:59:11 +0530 Subject: [PATCH] updated changes for supporting s390x & ppc64le (#190) * updated changes for multi-arch * Updated order * Update README.md * Update README.md --- .github/workflows/build-images.yaml | 16 ++++++---------- Makefile | 2 +- README.md | 11 +++++++++++ ...authorino-operator.clusterserviceversion.yaml | 7 ++++++- ...-operator.clusterserviceversion.template.yaml | 5 +++++ ...authorino-operator.clusterserviceversion.yaml | 5 +++++ 6 files changed, 34 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build-images.yaml b/.github/workflows/build-images.yaml index 7b73d87..3077056 100644 --- a/.github/workflows/build-images.yaml +++ b/.github/workflows/build-images.yaml @@ -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 @@ -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 }} @@ -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 }} @@ -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: | diff --git a/Makefile b/Makefile index 34518b2..2f8b6f8 100644 --- a/Makefile +++ b/Makefile @@ -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 diff --git a/README.md b/README.md index b599531..ead0d56 100644 --- a/README.md +++ b/README.md @@ -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.: diff --git a/bundle/manifests/authorino-operator.clusterserviceversion.yaml b/bundle/manifests/authorino-operator.clusterserviceversion.yaml index e37c174..e9fe4af 100644 --- a/bundle/manifests/authorino-operator.clusterserviceversion.yaml +++ b/bundle/manifests/authorino-operator.clusterserviceversion.yaml @@ -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: diff --git a/config/manifests/bases/authorino-operator.clusterserviceversion.template.yaml b/config/manifests/bases/authorino-operator.clusterserviceversion.template.yaml index 3fd8f6b..3b38843 100644 --- a/config/manifests/bases/authorino-operator.clusterserviceversion.template.yaml +++ b/config/manifests/bases/authorino-operator.clusterserviceversion.template.yaml @@ -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 spec: apiservicedefinitions: {} customresourcedefinitions: diff --git a/config/manifests/bases/authorino-operator.clusterserviceversion.yaml b/config/manifests/bases/authorino-operator.clusterserviceversion.yaml index dd7ede9..071dfa7 100644 --- a/config/manifests/bases/authorino-operator.clusterserviceversion.yaml +++ b/config/manifests/bases/authorino-operator.clusterserviceversion.yaml @@ -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: