Skip to content

Commit e5269d0

Browse files
liranmaudaliranmauda
authored
Merge pull request #1609 from liranmauda/liran-bump-version-5.18
[5.18] Bumping version from 5.18.3 to 5.18.4
2 parents 132ea88 + eb85ab6 commit e5269d0

File tree

12 files changed

+201
-151
lines changed

12 files changed

+201
-151
lines changed

‎.github/workflows/cli-tests.yml‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
name: Run CLI Tests
2+
3+
on: [push, pull_request, workflow_dispatch]
4+
5+
concurrency:
6+
group: ${{ github.workflow }}-${{ github.ref }}
7+
cancel-in-progress: true
8+
9+
jobs:
10+
run-cli-tests:
11+
runs-on: ubuntu-latest
12+
timeout-minutes: 90
13+
14+
steps:
15+
- name: Checkout
16+
uses: actions/checkout@v4
17+
18+
- name: Set up Go
19+
uses: actions/setup-go@v5
20+
with:
21+
go-version: "1.23"
22+
23+
- name: Set environment variables
24+
run: |
25+
echo "PATH=$PATH:$HOME/go/bin" >> $GITHUB_ENV
26+
echo "OPERATOR_IMAGE=noobaa/noobaa-operator:integration" >> $GITHUB_ENV
27+
28+
- name: Setup Minikube
29+
uses: medyagh/setup-minikube@v0.0.14
30+
with:
31+
driver: docker
32+
kubernetes-version: v1.29.0
33+
34+
- name: Verify Minikube is running
35+
run: minikube status
36+
37+
- name: Install Tools
38+
run: |
39+
bash ./.travis/install-tools.sh
40+
bash ./.travis/install-python.sh
41+
42+
- name: Build operator image
43+
run: |
44+
set -x
45+
make cli
46+
make image
47+
docker tag noobaa/noobaa-operator:$(go run cmd/version/main.go) $OPERATOR_IMAGE
48+
minikube image load $OPERATOR_IMAGE
49+
50+
- name: Run CLI Tests
51+
run: make test-cli-flow

‎.github/workflows/core-config-map-tests.yml‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
name: Run Core Config Map Tests
2+
3+
on: [push, pull_request, workflow_dispatch]
4+
5+
concurrency:
6+
group: ${{ github.workflow }}-${{ github.ref }}
7+
cancel-in-progress: true
8+
9+
jobs:
10+
run-core-config-map-tests:
11+
runs-on: ubuntu-latest
12+
timeout-minutes: 90
13+
14+
steps:
15+
- name: Checkout
16+
uses: actions/checkout@v4
17+
18+
- name: Set up Go
19+
uses: actions/setup-go@v5
20+
with:
21+
go-version: "1.23"
22+
23+
- name: Set environment variables
24+
run: |
25+
echo "PATH=$PATH:$HOME/go/bin" >> $GITHUB_ENV
26+
echo "OPERATOR_IMAGE=noobaa/noobaa-operator:integration" >> $GITHUB_ENV
27+
28+
- name: Setup Minikube
29+
uses: medyagh/setup-minikube@v0.0.14
30+
with:
31+
driver: docker
32+
kubernetes-version: v1.29.0
33+
34+
- name: Verify Minikube is running
35+
run: minikube status
36+
37+
- name: Install Tools
38+
run: |
39+
bash ./.travis/install-tools.sh
40+
bash ./.travis/install-python.sh
41+
42+
- name: Build operator image
43+
run: |
44+
set -x
45+
make cli
46+
make image
47+
docker tag noobaa/noobaa-operator:$(go run cmd/version/main.go) $OPERATOR_IMAGE
48+
minikube image load $OPERATOR_IMAGE
49+
50+
- name: Run Core Config Map Tests
51+
run: make test-core-config-map-flow

‎.github/workflows/operator-olm-tests.yml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
name: Run Operator OLM Tests
2+
3+
#TODO: this test is disabled as it is failing
4+
# it should be enabled when the issue is fixed
5+
#on: [push, pull_request, workflow_dispatch]
6+
on: [workflow_dispatch]
7+
8+
concurrency:
9+
group: ${{ github.workflow }}-${{ github.ref }}
10+
cancel-in-progress: true
11+
12+
jobs:
13+
run-operator-olm-tests:
14+
runs-on: ubuntu-latest
15+
timeout-minutes: 90
16+
17+
steps:
18+
- name: Checkout
19+
uses: actions/checkout@v4
20+
21+
- name: Set up Go
22+
uses: actions/setup-go@v5
23+
with:
24+
go-version: "1.23"
25+
26+
- name: Run OLM Tests
27+
run: make test-olm

‎.github/workflows/operator-tests.yml‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: Run Operator Unit Tests
2+
3+
on: [push, pull_request, workflow_dispatch]
4+
5+
concurrency:
6+
group: ${{ github.workflow }}-${{ github.ref }}
7+
cancel-in-progress: true
8+
9+
jobs:
10+
run-operator-tests:
11+
runs-on: ubuntu-latest
12+
timeout-minutes: 90
13+
14+
steps:
15+
- name: Checkout
16+
uses: actions/checkout@v4
17+
18+
- name: Set up Go
19+
uses: actions/setup-go@v5
20+
with:
21+
go-version: "1.23"
22+
23+
- name: Generate API
24+
run: make gen-api-fail-if-dirty --always-make
25+
26+
- name: Run Tests
27+
run: make test
28+

‎.github/workflows/run_admission_test.yml‎

Lines changed: 18 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
name: Admission Webhook Tests
2+
23
on: [push, pull_request, workflow_dispatch]
34

45
jobs:
@@ -8,46 +9,46 @@ jobs:
89
concurrency:
910
group: ${{ github.workflow }}-${{ github.ref }}
1011
cancel-in-progress: true
12+
1113
steps:
1214
- name: Checkout noobaa-operator
1315
uses: actions/checkout@v4
1416
with:
1517
repository: "noobaa/noobaa-operator"
1618
path: "noobaa-operator"
1719

18-
- name: Setup Go on runner
20+
- name: Setup Go
1921
uses: actions/setup-go@v5
2022
with:
2123
go-version: "1.23"
2224

2325
- name: Set environment variables
2426
run: |
25-
echo PATH=$PATH:$HOME/go/bin >> $GITHUB_ENV
26-
echo OPERATOR_IMAGE=noobaa/noobaa-operator:integration >> $GITHUB_ENV
27-
echo CHANGE_MINIKUBE_NONE_USER=true >> $GITHUB_ENV
27+
echo "PATH=$PATH:$HOME/go/bin" >> $GITHUB_ENV
28+
echo "OPERATOR_IMAGE=noobaa/noobaa-operator:integration" >> $GITHUB_ENV
2829
29-
- name: Deploy dependencies
30-
run: |
31-
set -x
32-
cd ./noobaa-operator
33-
sudo bash .travis/install-minikube.sh
34-
go get -v github.com/onsi/ginkgo/v2
35-
go install -v github.com/onsi/ginkgo/v2/ginkgo
36-
ginkgo version
30+
- name: Setup Minikube
31+
uses: medyagh/setup-minikube@v0.0.14
32+
with:
33+
driver: docker
34+
kubernetes-version: v1.29.0
35+
36+
- name: Verify Minikube is running
37+
run: minikube status
3738

38-
- name: Change settings for k8s and minikube
39+
- name: Setup Ginkgo
3940
run: |
40-
sudo mv /root/.kube /root/.minikube $HOME
41-
sudo chown -R $USER $HOME/.kube $HOME/.minikube
42-
sed "s/root/home\/$USER/g" $HOME/.kube/config > tmp; mv tmp $HOME/.kube/config
41+
go install github.com/onsi/ginkgo/v2/ginkgo@latest
42+
ginkgo version
4343
4444
- name: Build operator image
4545
run: |
4646
set -x
4747
cd ./noobaa-operator
4848
make cli
4949
make image
50-
sudo docker tag noobaa/noobaa-operator:$(go run cmd/version/main.go) $OPERATOR_IMAGE
50+
docker tag noobaa/noobaa-operator:$(go run cmd/version/main.go) $OPERATOR_IMAGE
51+
minikube image load $OPERATOR_IMAGE
5152
5253
- name: Install noobaa system
5354
run: |
@@ -88,9 +89,3 @@ jobs:
8889
with:
8990
name: admission-tests-logs
9091
path: noobaa-operator/admission-tests-logs
91-
92-
# Uncomment this step in case where you want to connect to the VM of this workflow using SSH.
93-
# Pay attention that this workflow was configured with a timeout, and you might change it for this step.
94-
# - name: Setup tmate session
95-
# if: ${{ failure() }}
96-
# uses: mxschmitt/action-tmate@v3

‎.github/workflows/run_ci.yml‎

Lines changed: 0 additions & 102 deletions
This file was deleted.

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ test-cli-flow-dev:
200200
.PHONY: test-cli-flow-dev
201201

202202
test-core-config-map-flow:
203-
$(TIME) ./test/cli/test_cli_flow.sh --check_core_config_map
203+
$(TIME) ./test/cli/test_cli_flow.sh --check_core_config_map --dev
204204
@echo "✅ test-core-config-map-flow"
205205
.PHONY: test-core-config-map-flow
206206

‎README.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -154,8 +154,8 @@ The following options can be passed to any command:
154154
--manual-default-backingstore=false: allow to delete the default backingstore
155155
--mini=false: Signal the operator that it is running in a low resource environment
156156
-n, --namespace='default': Target namespace
157-
--noobaa-image='noobaa/noobaa-core:5.18.3': NooBaa image
158-
--operator-image='noobaa/noobaa-operator:5.18.3': Operator image
157+
--noobaa-image='noobaa/noobaa-core:5.18.4': NooBaa image
158+
--operator-image='noobaa/noobaa-operator:5.18.4': Operator image
159159
--pg-ssl-cert='': ssl cert for postgres (client-side cert - need to be signed by external pg accepted CA)
160160
--pg-ssl-key='': ssl key for postgres (client-side cert - need to be signed by external pg accepted CA)
161161
--pg-ssl-required=false: Force noobaa to work with ssl (external postgres - server-side) [if server cert is self-signed, needs to add --ssl-unauthorized]
@@ -177,9 +177,9 @@ $ noobaa version
177177
```
178178

179179
```
180-
INFO[0000] CLI version: 5.18.3
181-
INFO[0000] noobaa-image: noobaa/noobaa-core:5.18.3
182-
INFO[0000] operator-image: noobaa/noobaa-operator:5.18.3
180+
INFO[0000] CLI version: 5.18.4
181+
INFO[0000] noobaa-image: noobaa/noobaa-core:5.18.4
182+
INFO[0000] operator-image: noobaa/noobaa-operator:5.18.4
183183
```
184184

185185
## Troubleshooting

0 commit comments

Comments
 (0)