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.

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

[backport into 5.17] Backports into 5.17 #1421

Merged
merged 8 commits into from
Aug 27, 2024
Merged
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
27 changes: 14 additions & 13 deletions .github/workflows/manual-build.yml
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
name: Manual Operator Build Dispatch

on:
on:
workflow_dispatch:
inputs:
branch:
description: 'Branch to Build From'
description: "Branch to Build From"
required: true
tag:
description: 'Additional tag for the build (such as alpha, beta, etc.) - Optional'
default: ''
description: "Additional tag for the build (such as alpha, beta, etc.) - Optional"
default: ""

jobs:
publish-image:
Expand All @@ -19,7 +19,7 @@ jobs:
uses: actions/checkout@v4
with:
ref: ${{ github.event.inputs.branch }}
- uses: actions/setup-go@v4
- uses: actions/setup-go@v5
with:
go-version: "1.21"

Expand Down Expand Up @@ -74,17 +74,18 @@ jobs:
env:
DOCKERHUB_OWNER: ${{ secrets.GHACTIONSDOCKERHUBNAME }}
run: |
make image VERSION=latest
docker tag noobaa/noobaa-operator ${{ steps.prep.outputs.operatortags }}
docker push ${{ steps.prep.outputs.operatortags }}
make image VERSION=latest
docker tag noobaa/noobaa-operator ${{ steps.prep.outputs.operatortags }}
docker push ${{ steps.prep.outputs.operatortags }}

- name: Build Bundle
run: |
make bundle-image \
csv-name=noobaa-operator.clusterserviceversion.yaml \
core-image=quay.io/${{ github.event.inputs.branch }}-${{ steps.prep.outputs.version }}${{ steps.suffix.outputs.suffix }} \
operator-image=quay.io/${{ steps.prep.outputs.operatortags }} \
db-image=centos/postgresql-12-centos7 \
db-image=centos/postgresql-15-centos7 \
psql-12-image=centos/postgresql-12-centos7 \
obc-crd="owned" \
BUNDLE_IMAGE=quay.io/${{ steps.prep.outputs.operatorbundletags }}

Expand All @@ -95,9 +96,9 @@ jobs:
env:
DOCKERHUB_OWNER: ${{ secrets.GHACTIONQUAYNAME }}
run: |
docker tag ${{ steps.prep.outputs.operatortags }} quay.io/${{ steps.prep.outputs.operatortags }}
docker push quay.io/${{ steps.prep.outputs.operatortags }}
docker push quay.io/${{ steps.prep.outputs.operatorbundletags }}
docker tag ${{ steps.prep.outputs.operatortags }} quay.io/${{ steps.prep.outputs.operatortags }}
docker push quay.io/${{ steps.prep.outputs.operatortags }}
docker push quay.io/${{ steps.prep.outputs.operatorbundletags }}

- name: Push to ocs-dev as latest
env:
Expand All @@ -108,7 +109,7 @@ jobs:
docker push quay.io/${{ steps.prep.outputs.ocsdevlatest }}

- name: Push CLI Binary
run: |
run: |
make cli
make release-cli VERSION=-${{ github.event.inputs.branch }}-${{ steps.prep.outputs.version }}${{ steps.suffix.outputs.suffix }}
#noobaa-operator-cli
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/releaser.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
- name: Fetch all tags
run: git fetch --force --tags
- name: Set up Go
uses: actions/setup-go@v2
uses: actions/setup-go@v5
with:
go-version: 1.21
- name: Release
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/run_admission_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
path: "noobaa-operator"

- name: Setup Go on runner
uses: actions/setup-go@v4
uses: actions/setup-go@v5
with:
go-version: "1.21"

Expand Down Expand Up @@ -84,7 +84,7 @@ jobs:

- name: Save logs
if: ${{ failure() }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: admission-tests-logs
path: noobaa-operator/admission-tests-logs
Expand Down
7 changes: 3 additions & 4 deletions .github/workflows/run_ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@ jobs:
steps:
- name: checkout
uses: actions/checkout@v4
- uses: actions/setup-go@v2 # Could not change to version 3, see issue:
# https://github.com/noobaa/noobaa-operator/issues/1031
- uses: actions/setup-go@v5
with:
go-version: "1.21"

Expand Down Expand Up @@ -50,7 +49,7 @@ jobs:
steps:
- name: checkout
uses: actions/checkout@v4
- uses: actions/setup-go@v2
- uses: actions/setup-go@v5
with:
go-version: "1.21"

Expand Down Expand Up @@ -79,7 +78,7 @@ jobs:
steps:
- name: checkout
uses: actions/checkout@v4
- uses: actions/setup-go@v2
- uses: actions/setup-go@v5
with:
go-version: "1.21"

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/run_cosi_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
path: "noobaa-operator"

- name: Setup Go on runner
uses: actions/setup-go@v4
uses: actions/setup-go@v5
with:
go-version: "1.21"

Expand Down Expand Up @@ -91,7 +91,7 @@ jobs:

- name: Save logs - COSI
if: ${{ failure() }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: cosi-tests-logs
path: noobaa-operator/cosi-tests-logs
2 changes: 1 addition & 1 deletion .github/workflows/run_hac_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
steps:
- name: checkout
uses: actions/checkout@v4
- uses: actions/setup-go@v4
- uses: actions/setup-go@v5
with:
go-version: "1.21"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/run_kms_azure_vault_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
steps:
- name: checkout
uses: actions/checkout@v4
- uses: actions/setup-go@v4
- uses: actions/setup-go@v5
with:
go-version: "1.21"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/run_kms_dev_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
steps:
- name: checkout
uses: actions/checkout@v4
- uses: actions/setup-go@v4
- uses: actions/setup-go@v5
with:
go-version: "1.21"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/run_kms_ibm_kp_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
steps:
- name: checkout
uses: actions/checkout@v4
- uses: actions/setup-go@v4
- uses: actions/setup-go@v5
with:
go-version: "1.21"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/run_kms_kmip_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
steps:
- name: checkout
uses: actions/checkout@v4
- uses: actions/setup-go@v4
- uses: actions/setup-go@v5
with:
go-version: "1.21"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/run_kms_rotate_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
steps:
- name: checkout
uses: actions/checkout@v4
- uses: actions/setup-go@v4
- uses: actions/setup-go@v5
with:
go-version: "1.21"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/run_kms_tls_sa_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
steps:
- name: checkout
uses: actions/checkout@v4
- uses: actions/setup-go@v4
- uses: actions/setup-go@v5
with:
go-version: "1.21"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/run_kms_tls_token_test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
steps:
- name: checkout
uses: actions/checkout@v4
- uses: actions/setup-go@v4
- uses: actions/setup-go@v5
with:
go-version: "1.21"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/testing.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:
steps:
- name: Checkout
uses: actions/checkout@v4
- uses: actions/setup-go@v4
- uses: actions/setup-go@v5
with:
go-version: "1.21"

Expand Down
Loading
Loading