Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
38 changes: 32 additions & 6 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
arch: ["arm64", "amd64", "s390x"]
arch: ["arm64", "amd64", "s390x", "ppc64le"]
fail-fast: true
steps:
- name: Checkout
Expand Down Expand Up @@ -207,19 +207,22 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
arch: ["arm64", "amd64", "s390x"]
arch: ["arm64", "amd64"]
env:
repo: ${{github.event.repository.name}}
version: ${{needs.get-product-version.outputs.product-version}}
image_tag: ${{needs.get-product-version.outputs.product-version}}-ubi
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
#- name: Clean dist
# shell: bash
# run: |
# make clean-dist
- name: Setup scripts directory
shell: bash
run: |
make ci-build-scripts-dir GOARCH="${{ matrix.arch }}"
- name: Docker Build (Action)
if: ${{ matrix.arch != 's390x' }}
uses: hashicorp/actions-docker-build@v2
env:
VERSION: ${{ needs.get-product-version.outputs.product-version }}
Expand All @@ -232,8 +235,32 @@ jobs:
tags: |
docker.io/hashicorp/${{env.repo}}:${{env.image_tag}}
public.ecr.aws/hashicorp/${{env.repo}}:${{env.image_tag}}
- name: Docker Build (Action) s390x
if: ${{ matrix.arch == 's390x' }}

build-docker-ubi-rh-only:
name: UBI ${{ matrix.arch }} build
needs:
- get-product-version
- build-pre-checks
- build
runs-on: ubuntu-latest
strategy:
matrix:
arch: ["s390x", "ppc64le"]
env:
repo: ${{github.event.repository.name}}
version: ${{needs.get-product-version.outputs.product-version}}
image_tag: ${{needs.get-product-version.outputs.product-version}}-ubi
steps:
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
#- name: Clean dist
# shell: bash
# run: |
# make clean-dist
- name: Setup scripts directory
shell: bash
run: |
make ci-build-scripts-dir GOARCH="${{ matrix.arch }}"
- name: Docker Build (Action)
uses: hashicorp/actions-docker-build@v2
env:
VERSION: ${{ needs.get-product-version.outputs.product-version }}
Expand All @@ -244,7 +271,6 @@ jobs:
arch: ${{matrix.arch}}
redhat_tag: quay.io/redhat-isv-containers/64b072322e2773c28d30d988:${{env.image_tag}}
- name: Check binary version in container ${{ matrix.arch }}
if: ${{ matrix.arch != 's390x' }}
shell: bash
run: |
version_output=$(docker run --platform linux/${{matrix.arch}} hashicorp/${{env.repo}}:${{env.image_tag}} --version --output=json)
Expand Down
2 changes: 1 addition & 1 deletion .go-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.26.2
1.26.2
2 changes: 2 additions & 0 deletions .release/vault-secrets-operator-artifacts.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,15 @@ artifacts {
"vault-secrets-operator_${version}_linux_amd64.zip",
"vault-secrets-operator_${version}_linux_arm64.zip",
"vault-secrets-operator_${version}_linux_s390x.zip",
"vault-secrets-operator_${version}_linux_ppc64le.zip",
]
container = [
"vault-secrets-operator_release-default_linux_amd64_${version}_${commit_sha}.docker.tar",
"vault-secrets-operator_release-default_linux_arm64_${version}_${commit_sha}.docker.tar",
"vault-secrets-operator_release-ubi_linux_amd64_${version}_${commit_sha}.docker.redhat.tar",
"vault-secrets-operator_release-ubi_linux_arm64_${version}_${commit_sha}.docker.redhat.tar",
"vault-secrets-operator_release-ubi_linux_s390x_${version}_${commit_sha}.docker.redhat.tar",
"vault-secrets-operator_release-ubi_linux_ppc64le_${version}_${commit_sha}.docker.redhat.tar",
"vault-secrets-operator_release-ubi_linux_amd64_${version}_${commit_sha}.docker.tar",
"vault-secrets-operator_release-ubi_linux_arm64_${version}_${commit_sha}.docker.tar",
]
Expand Down
6 changes: 5 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ docker-push: ## Push docker image with the manager.
##@ CI

.PHONY: ci-build-scripts-dir
ci-build-scripts-dir: ## Build operator binary (without generating assets).
ci-build-scripts-dir: ## Build operator scripts directory; adds extra files to be included in the container image.
rm -rf $(BUILD_DIR)/$(GOOS)/$(GOARCH)/scripts
mkdir -p $(BUILD_DIR)/$(GOOS)/$(GOARCH)/scripts
cp -a chart/crds $(BUILD_DIR)/$(GOOS)/$(GOARCH)/scripts/.
Expand Down Expand Up @@ -665,6 +665,10 @@ build-diags:
clean:
rm -rf build

.PHONY: clean-dist
clean-dist:
rm -rf ${BUILD_DIR}

# Generate Helm reference docs from values.yaml and update Vault website.
# Usage: make gen-helm-docs
# If no options are given, helm.mdx from a local copy of the vault repository will be used.
Expand Down
Loading