Skip to content

Commit

Permalink
Merge branch 'main' into feat/KDL6-46-data-privacy
Browse files Browse the repository at this point in the history
  • Loading branch information
igzor committed Jan 10, 2025
2 parents e2a3b40 + 8d360c5 commit f623652
Show file tree
Hide file tree
Showing 144 changed files with 4,580 additions and 11,148 deletions.
3 changes: 2 additions & 1 deletion .github/.golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -220,8 +220,9 @@ issues:
exclude-rules:
- path: _test\.go
linters:
- mnd
- gochecknoglobals
- gosec
- mnd
# https://github.com/go-critic/go-critic/issues/926
- linters:
- gocritic
Expand Down
13 changes: 12 additions & 1 deletion .github/dependabot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,14 @@ updates:
- enhancement
- dependency-management
- devops-team
groups:
github-actions:
patterns:
- "*"

- package-ecosystem: gomod
directories:
- "/app/api"
- "/cleaner"
- "/repo-cloner"
schedule:
interval: monthly
Expand All @@ -22,6 +25,10 @@ updates:
- enhancement
- dependency-management
- develop-team
groups:
golang-dependencies:
patterns:
- "*"

- package-ecosystem: docker
directories:
Expand All @@ -36,3 +43,7 @@ updates:
- dependency-management
- develop-team
- devops-team
groups:
docker-updates:
patterns:
- "*"
4 changes: 2 additions & 2 deletions .github/workflows/component-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
persist-credentials: false
Expand Down Expand Up @@ -72,7 +72,7 @@ jobs:
org.opencontainers.image.vendor=Konstellation
tags: |
type=raw,value=${{ env.TAG_NAME_FIXED }}
type=raw,value=latest
type=raw,value=latest,enable=${{ env.TAG_NAME_FIXED != 'develop' }}
type=sha,enable=false
- name: Set up QEMU
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/component-linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,15 @@ jobs:
matrix:
directory:
- app
- cleaner
- filebrowser
- mlflow
- project-operator
- repo-cloner
- user-tools-operator

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4

- name: "[${{ matrix.directory }}] Pass hadolint"
uses: hadolint/[email protected]
Expand Down
73 changes: 0 additions & 73 deletions .github/workflows/quality-check-kdl-server-cleaner.yml

This file was deleted.

4 changes: 2 additions & 2 deletions .github/workflows/quality-check-kdl-server-ui.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
persist-credentials: false

- name: Setup Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ vars.NODE_VERSION_UI_TESTS }}
cache: yarn
Expand All @@ -53,7 +53,7 @@ jobs:
./app/ui/test-report.xml
- name: UI Run e2e tests
uses: cypress-io/github-action@v5
uses: cypress-io/github-action@v6
with:
browser: chrome
tag: node-${{ vars.NODE_VERSION_UI_TESTS }}
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/releases-create.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
name: "[Releases] Create"

env:
COMPONENTS: "app,cleaner,mlflow,project-operator,repo-cloner,user-tools-operator"
COMPONENTS: "app,mlflow,filebrowser,project-operator,repo-cloner,user-tools-operator"

on:
workflow_dispatch:
Expand All @@ -17,7 +17,7 @@ on:
options:
- all
- kdl-app
- cleaner
- filebrowser
- mlflow
- project-operator
- repo-cloner
Expand All @@ -34,14 +34,14 @@ jobs:
if: github.event_name == 'workflow_dispatch'
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
fetch-tags: true
persist-credentials: false

- name: Setup Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ vars.NODE_VERSION }}

Expand All @@ -64,7 +64,7 @@ jobs:
if: github.event_name != 'workflow_dispatch'
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
fetch-tags: true
Expand All @@ -88,7 +88,7 @@ jobs:
echo "CHANGED_COMPONENTS=$COMPONENTS_LIST" >> $GITHUB_ENV
- name: Setup Node
uses: actions/setup-node@v3
uses: actions/setup-node@v4
with:
node-version: ${{ vars.NODE_VERSION }}

Expand Down
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ repos:
- id: check-symlinks
- id: end-of-file-fixer
- id: check-yaml
exclude: ^(project-operator|user-tools-operator)/
exclude: ^(project-operator|user-tools-operator|hack/scripts/helmfile/helmfile.yaml)

- repo: https://github.com/zricethezav/gitleaks
rev: v8.21.2
Expand All @@ -19,7 +19,7 @@ repos:
rev: v0.5.1
hooks:
- id: golangci-lint
args: ['--config', '.github/.golangci.yml', 'app/api/...', 'cleaner/...', 'repo-cloner/...']
args: ['--config', '.github/.golangci.yml', 'app/api/...', 'repo-cloner/...']

- repo: https://github.com/gruntwork-io/pre-commit
rev: v0.1.24
Expand Down
1 change: 0 additions & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,6 @@ The following is the list of supported component:

* `api`
* `ui`
* `cleaner`
* `mlflow`
* `project-operator`
* `repo-cloner`
Expand Down
10 changes: 9 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ docker-lint: ## Lints Dockerfile defined in dir Example: make docker-lint dir=ap

.PHONY: tidy
tidy: ## Run golangci-lint, goimports and gofmt
golangci-lint run --config .github/.golangci.yml --build-tags=integration,unit app/api/... cleaner/... repo-cloner/... && goimports -w app/api cleaner repo-cloner && gofmt -s -w -e -d app/api cleaner repo-cloner
golangci-lint run --config .github/.golangci.yml --build-tags=integration,unit app/api/... repo-cloner/... && goimports -w app/api repo-cloner && gofmt -s -w -e -d app/api repo-cloner

.PHONY: create
create: ## Creates a complete local environment
Expand Down Expand Up @@ -54,3 +54,11 @@ test-api: ## Executes api tests
.PHONY: coverage-api
coverage-api: ## Executes api tests, generates coverage and opens the browser
cd app/api && go test ./... --tags=integration,unit -v -cover -coverprofile=coverage.out && go tool cover -html=coverage.out && rm coverage.out && cd -

.PHONY: test-repo-cloner
test-repo-cloner: ## Executes repo-cloner tests
cd repo-cloner && go test ./... --tags=integration,unit -v && cd -

.PHONY: coverage-repo-cloner
coverage-repo-cloner: ## Executes repo-cloner tests, generates coverage and opens the browser
cd repo-cloner && go test ./... --tags=integration,unit -v -cover -coverprofile=coverage.out && go tool cover -html=coverage.out && rm coverage.out && cd -
11 changes: 0 additions & 11 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ The main goal of KAI Lab is to provide a user-friendly environment for Data Scie
| ----------- | ----- | --------- | ---------------------- | --------- | -------- |
| app-api | [![api-report-bugs-badge]][api-report-bugs-link] | [![api-report-coverage-badge]][api-report-coverage-link] | [![api-report-maintain-badge]][api-report-maintain-link] | [![go-report][api-report-badge]][api-report-link] | [![api-report-security-badge]][api-report-security-link] |
| app-ui | [![ui-report-bugs-badge]][ui-report-bugs-link] | [![ui-report-coverage-badge]][ui-report-coverage-link] | [![ui-report-maintain-badge]][ui-report-maintain-link] | - | [![ui-report-security-badge]][ui-report-security-link] |
| cleaner | [![cleaner-report-bugs-badge]][cleaner-report-bugs-link] | [![cleaner-report-coverage-badge]][cleaner-report-coverage-link] | [![cleaner-report-maintain-badge]][cleaner-report-maintain-link] | [![go-report][api-report-badge]][cleaner-report-link] | [![cleaner-report-security-badge]][cleaner-report-security-link] |
| repo-cloner | [![repo-cloner-report-bugs-badge]][repo-cloner-report-bugs-link] | [![repo-cloner-report-coverage-badge]][repo-cloner-report-coverage-link] | [![repo-cloner-report-maintain-badge]][repo-cloner-report-maintain-link] | [![go-report][repo-cloner-report-badge]][repo-cloner-report-link] | [![repo-cloner-report-security-badge]][repo-cloner-report-security-link] |

[api-report-bugs-badge]: https://sonarcloud.io/api/project_badges/measure?project=kdl-server_app-api&metric=bugs
Expand All @@ -31,15 +30,6 @@ The main goal of KAI Lab is to provide a user-friendly environment for Data Scie
[ui-report-maintain-link]: https://sonarcloud.io/summary/new_code?id=kdl-server_app-ui
[ui-report-security-badge]: https://sonarcloud.io/api/project_badges/measure?project=kdl-server_app-ui&metric=security_rating
[ui-report-security-link]: https://sonarcloud.io/summary/new_code?id=kdl-server_app-ui
[cleaner-report-bugs-badge]: https://sonarcloud.io/api/project_badges/measure?project=kdl-server_cleaner&metric=bugs
[cleaner-report-bugs-link]: https://sonarcloud.io/summary/new_code?id=kdl-server_cleaner
[cleaner-report-coverage-badge]: https://sonarcloud.io/api/project_badges/measure?project=kdl-server_cleaner&metric=coverage
[cleaner-report-coverage-link]: https://sonarcloud.io/summary/new_code?id=kdl-server_cleaner
[cleaner-report-maintain-badge]: https://sonarcloud.io/api/project_badges/measure?project=kdl-server_cleaner&metric=sqale_rating
[cleaner-report-maintain-link]: https://sonarcloud.io/summary/new_code?id=kdl-server_cleaner
[cleaner-report-security-badge]: https://sonarcloud.io/api/project_badges/measure?project=kdl-server_cleaner&metric=security_rating
[cleaner-report-security-link]: https://sonarcloud.io/summary/new_code?id=kdl-server_cleaner
[cleaner-report-link]: https://goreportcard.com/report/github.com/konstellation-io/kdl-server/cleaner
[repo-cloner-report-bugs-badge]: https://sonarcloud.io/api/project_badges/measure?project=kdl-server_repo-cloner&metric=bugs
[repo-cloner-report-bugs-link]: https://sonarcloud.io/summary/new_code?id=kdl-server_repo-cloner
[repo-cloner-report-coverage-badge]: https://sonarcloud.io/api/project_badges/measure?project=kdl-server_repo-cloner&metric=coverage
Expand All @@ -55,7 +45,6 @@ The main goal of KAI Lab is to provide a user-friendly environment for Data Scie

* `app-api`: main component of the application, providing API access for other components and managing interactions with `MongoDB`.
* `app-ui`: web application offering the interface for data scientists.
* `cleaner`: (*DEPRECATED*) currently unused, potentially slated for deprecation.
* `project-operator`: Kubernetes operator listening to `KAI Lab API`, on new project creation in the UI, it deploys a project-specific pod with `mlflow` and `filebrowser`.
* `repo-cloner`: in-house solution that clones all accessible repositories into the user's `user-tools` pod.
* `user-tools-operator`: Kubernetes operator monitoring `KAI Lab API`, each time a user starts or changes runtime in the UI, this operator deploys a pod with a `runtime` containers based on selected image.
Expand Down
2 changes: 1 addition & 1 deletion app/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ RUN apk update && \
WORKDIR /app

# copy from app-api and app-ui stages
COPY --from=api-builder --chown=${USER}:${USER} /app/kdl-server /app/config.yml ./
COPY --from=api-builder --chown=${USER}:${USER} /app/kdl-server ./
COPY --from=ui-builder --chown=${USER}:${USER} /app/build/ /public

RUN setcap 'cap_net_bind_service=+ep' /app/kdl-server
Expand Down
23 changes: 0 additions & 23 deletions app/api/.env.dev

This file was deleted.

Loading

0 comments on commit f623652

Please sign in to comment.