Skip to content

Commit 81ab86e

Browse files
author
datacore-bolt-ci
committed
ci(stability): merge the develop branch
2 parents 724f5c8 + f270cdc commit 81ab86e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+1314
-468
lines changed

.github/workflows/fossa.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
name: Fossa CLI
2+
on:
3+
push:
4+
branches:
5+
- 'develop'
6+
- 'release/**'
7+
8+
jobs:
9+
fossa-scan:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- uses: actions/checkout@v4
13+
with:
14+
submodules: recursive
15+
- uses: fossas/[email protected]
16+
with:
17+
api-key: ${{ secrets.FOSSA_API_KEY }}

.github/workflows/k8s-ci.yml

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ jobs:
88
runs-on: ubuntu-latest
99
steps:
1010
- uses: actions/checkout@v4
11+
with:
12+
submodules: recursive
1113
- uses: DeterminateSystems/nix-installer-action@v11
1214
with:
1315
kvm: true
@@ -17,12 +19,22 @@ jobs:
1719
export NIX_PATH=nixpkgs=$(jq '.nixpkgs.url' nix/sources.json -r)
1820
echo "NIX_PATH=$NIX_PATH" >> $GITHUB_ENV
1921
nix-shell ./scripts/k8s/shell.nix --run "echo"
22+
- name: Build binaries and images
23+
id: build
24+
run: |
25+
TAG=$(nix-shell ./shell.nix --run './scripts/python/generate-test-tag.sh')
26+
BIN=$(mktemp -p . -d -t test-bin-XXXXXX)
27+
nix-shell ./shell.nix --run "./scripts/python/tag-chart.sh $TAG"
28+
RUSTFLAGS="-C debuginfo=0 -C strip=debuginfo" ./scripts/release.sh --tag $TAG --build-bins --build-binary-out $BIN --no-static-linking --skip-publish --debug
29+
echo "tag=$TAG" >> $GITHUB_OUTPUT
30+
echo "bin=$BIN" >> $GITHUB_OUTPUT
2031
- name: BootStrap k8s cluster
2132
run: |
2233
nix-shell ./scripts/k8s/shell.nix --run "./scripts/k8s/deployer.sh start --label"
23-
- name: Install Helm Chart
24-
run: |
25-
nix-shell ./scripts/k8s/shell.nix --run "./scripts/helm/install.sh --dep-update --wait"
34+
- name: Load images to Kind cluster
35+
run: nix-shell ./scripts/k8s/shell.nix --run "./scripts/k8s/load-images-to-kind.sh --tag ${{ steps.build.outputs.tag }} --trim-debug-suffix"
36+
- name: Run Pytests
37+
run: nix-shell ./shell.nix --run './scripts/python/test.sh'
2638
- name: The job has failed
2739
if: ${{ failure() }}
2840
run: |

.gitignore

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,5 @@ __pycache__
2222
/kubectl-plugin
2323

2424
# Pytest assets
25+
/test-bin-*
2526
tests/bdd/venv
26-
27-
# Minikube assets
28-
tests/bdd/minikube/.cleanup_config.yaml
29-
tests/bdd/minikube/.cleanup_config.yaml.lock
30-
tests/bdd/minikube/bin

Cargo.lock

Lines changed: 21 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

README.md

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
1-
# mayastor-extensions
2-
Components and utilities which extend the core Mayastor (control & data plane) functionality
1+
# Mayastor Extensions
2+
3+
[![FOSSA Status](https://app.fossa.com/api/projects/custom%2B162%2Fgithub.com%2Fopenebs%2Fmayastor-extensions.svg?type=shield&issueType=license)](https://app.fossa.com/projects/custom%2B162%2Fgithub.com%2Fopenebs%2Fmayastor-extensions?ref=badge_shield&issueType=license)
4+
[![OpenSSF Best Practices](https://www.bestpractices.dev/projects/9638/badge)](https://www.bestpractices.dev/projects/9638)
5+
[![Slack](https://img.shields.io/badge/chat-slack-ff1493.svg?style=flat-square)](https://kubernetes.slack.com/messages/openebs/)
6+
[![Community Meetings](https://img.shields.io/badge/Community-Meetings-blue)](https://us05web.zoom.us/j/87535654586?pwd=CigbXigJPn38USc6Vuzt7qSVFoO79X.1)
7+
[![built with nix](https://builtwithnix.org/badge.svg)](https://builtwithnix.org)
8+
9+
Components and utilities which extend the core Mayastor (control & data plane) functionality.
310

411
## License
512

@@ -8,8 +15,10 @@ other open source projects and are distributed under their respective licenses.
815

916
```http://www.apache.org/licenses/LICENSE-2.0```
1017

11-
### Contributions
18+
## Contributions
1219

1320
Unless you explicitly state otherwise, any contribution intentionally submitted for
1421
inclusion in Mayastor by you, as defined in the Apache-2.0 license, is licensed as above,
1522
without any additional terms or conditions.
23+
24+
[![FOSSA Status](https://app.fossa.com/api/projects/custom%2B162%2Fgithub.com%2Fopenebs%2Fmayastor-extensions.svg?type=large&issueType=license)](https://app.fossa.com/projects/custom%2B162%2Fgithub.com%2Fopenebs%2Fmayastor-extensions?ref=badge_large&issueType=license)

chart/templates/mayastor/agents/ha/ha-node-daemonset.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,8 @@ spec:
7272
args:
7373
- "--node-name=$(MY_NODE_NAME)"
7474
- "--csi-socket={{ default .Values.csi.node.pluginMountPath .Values.csi.node.pluginMounthPath }}/{{ .Values.csi.node.socketPath }}"
75-
- "--grpc-endpoint=$(MY_POD_IP):50053"
75+
- "--grpc-ip=$(MY_POD_IP)"
76+
- "--grpc-port=50053"
7677
- "--cluster-agent=https://{{ .Release.Name }}-agent-core:50052"{{ if .Values.base.jaeger.enabled }}
7778
- "--jaeger={{ include "jaeger_url" . }}"{{ end }}{{ if .Values.eventing.enabled }}
7879
- "--events-url=nats://{{ .Release.Name }}-nats:4222"{{ end }}

chart/templates/mayastor/csi/csi-node-daemonset.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,8 @@ spec:
9090
- "--node-name=$(MY_NODE_NAME)"
9191
- "--rest-endpoint=http://{{ .Release.Name }}-api-rest:8081"
9292
- "--enable-registration"
93-
- "--grpc-endpoint=$(MY_POD_IP):10199"{{ if .Values.csi.node.nvme.io_timeout }}
93+
- "--grpc-ip=$(MY_POD_IP)"
94+
- "--grpc-port=10199"{{ if .Values.csi.node.nvme.io_timeout }}
9495
- "--nvme-io-timeout={{ .Values.csi.node.nvme.io_timeout }}"
9596
- "--nvme-core-io-timeout={{ .Values.csi.node.nvme.io_timeout }}"{{ else }}
9697
- "--nvme-io-timeout={{ .Values.io_engine.nvme.ioTimeout }}10s"

chart/templates/mayastor/io/io-engine-daemonset.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ spec:
9898
# For example -l 1,2,10-20 means use core 1, 2, 10 to 20.
9999
# Note: Ensure that the CPU resources are updated accordingly.
100100
# If you use 2 CPUs, the CPU: field should also read 2.
101-
- "-g$(MY_POD_IP)"
101+
- "--grpc-ip=$(MY_POD_IP)"
102102
- "-N$(MY_NODE_NAME)"
103103
- "-Rhttps://{{ .Release.Name }}-agent-core:50051"
104104
- "-y/var/local/{{ .Release.Name }}/io-engine/config.yaml"

default.nix

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,18 @@
1-
{ system ? null, allInOne ? true, incremental ? false, static ? false, img_tag ? "", tag ? "", img_org ? "", product_prefix ? "" }:
1+
{ system ? null
2+
, allInOne ? true
3+
, incremental ? false
4+
, static ? false
5+
, img_tag ? ""
6+
, tag ? ""
7+
, img_org ? ""
8+
, product_prefix ? ""
9+
, rustFlags ? ""
10+
}:
211
let
312
sources = import ./nix/sources.nix;
413
hostSystem = (import sources.nixpkgs { }).hostPlatform.system;
514
pkgs = import sources.nixpkgs {
6-
overlays = [ (_: _: { inherit sources; }) (import ./nix/overlay.nix { inherit allInOne incremental static img_tag tag img_org product_prefix; }) (import sources.rust-overlay) ];
15+
overlays = [ (_: _: { inherit sources; }) (import ./nix/overlay.nix { inherit allInOne incremental static img_tag tag img_org product_prefix rustFlags; }) (import sources.rust-overlay) ];
716
system = if system != null then system else hostSystem;
817
};
918
in

dependencies/control-plane

Submodule control-plane updated 83 files

0 commit comments

Comments
 (0)