feat: Add Kyma config from kyma-dashboard #3321

dbadura · 2024-09-02T12:26:48Z

Description

Changes proposed in this pull request:

copy configuration from kyma-dashboard
new dockerfiles for kyma-dashboard
adjust directories and gulp files
add build jobs

Related issue(s)

#3298

Definition of done

The PR's title starts with one of the following prefixes:
- feat: A new feature
- fix: A bug fix
- docs: Documentation only changes
- refactor: A code change that neither fixes a bug nor adds a feature
- test: Adding tests
- chore: Maintainance changes to the build process or auxiliary tools, libraries, workflows, etc.
Related issues are linked. To link internal trackers, use the issue IDs like backlog#4567
Explain clearly why you created the PR and what changes it introduces
All necessary steps are delivered, for example, tests, documentation, merging

kyma-bot · 2024-09-02T12:26:51Z

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

mrCherry97

check dockerigonre

mrCherry97 · 2024-09-04T07:02:56Z

kyma-envs/package.json

+    "prepare-all-dev": "ENV=dev npm run prepare-extensions && ENV=dev npm run pack-extensions && ENV=dev npm run prepare-wizards && ENV=dev npm run pack-wizards && ENV=dev npm run prepare-statics && ENV=dev npm run pack-statics",
+    "prepare-all-stage": "ENV=stage npm run prepare-extensions && ENV=stage npm run pack-extensions && ENV=stage npm run prepare-wizards && ENV=stage npm run pack-wizards && ENV=stage npm run prepare-statics && ENV=stage npm run pack-statics",
+    "prepare-all-prod": "ENV=prod npm run prepare-extensions && ENV=prod npm run pack-extensions && ENV=prod npm run prepare-wizards && ENV=prod npm run pack-wizards && ENV=prod npm run prepare-statics && ENV=prod npm run pack-statics",
+    "clean-all": ""


Suggested change

"clean-all": ""

mrCherry97 · 2024-09-04T11:42:08Z

.github/workflows/busola-kyma-web-build.yml

+    branches:
+      - main
+    paths:
+      - ".github/workflows/busola-web-build.yml"


should be kyma-web

mrCherry97 · 2024-09-04T11:42:16Z

.github/workflows/busola-kyma-web-build.yml

+  pull_request_target:
+    types: [opened, edited, synchronize, reopened, ready_for_review]
+    paths:
+      - ".github/workflows/busola-kyma-web-build.yml"


should be kyma-web

mrCherry97 · 2024-09-04T11:47:01Z

kyma/package.json

+    "prepare-all-dev": "ENV=dev npm run prepare-extensions && ENV=dev npm run pack-extensions && ENV=dev npm run prepare-wizards && ENV=dev npm run pack-wizards && ENV=dev npm run prepare-statics && ENV=dev npm run pack-statics",
+    "prepare-all-stage": "ENV=stage npm run prepare-extensions && ENV=stage npm run pack-extensions && ENV=stage npm run prepare-wizards && ENV=stage npm run pack-wizards && ENV=stage npm run prepare-statics && ENV=stage npm run pack-statics",
+    "prepare-all-prod": "ENV=prod npm run prepare-extensions && ENV=prod npm run pack-extensions && ENV=prod npm run prepare-wizards && ENV=prod npm run pack-wizards && ENV=prod npm run prepare-statics && ENV=prod npm run pack-statics",
+    "clean-all": ""


Suggested change

"clean-all": ""

mrCherry97 · 2024-09-04T11:47:24Z

kyma/package.json

+    "pack-wizards": "gulp pack-wizards",
+    "prepare-wizards": "gulp clean-wizards && gulp get-wizards",
+    "lint-fix": "prettier --config ./.prettierrc --write '**/*.{ts,tsx,js,jsx,json,html,css,yaml,md}' --ignore-path ./.prettierignore",
+    "prepare-all-dev": "ENV=dev npm run prepare-extensions && ENV=dev npm run pack-extensions && ENV=dev npm run prepare-wizards && ENV=dev npm run pack-wizards && ENV=dev npm run prepare-statics && ENV=dev npm run pack-statics",


Suggested change

"prepare-all-dev": "ENV=dev npm run prepare-extensions && ENV=dev npm run pack-extensions && ENV=dev npm run prepare-wizards && ENV=dev npm run pack-wizards && ENV=dev npm run prepare-statics && ENV=dev npm run pack-statics",

"prepare-extensibility-dev": "ENV=dev npm run prepare-extensions && ENV=dev npm run pack-extensions && ENV=dev npm run prepare-wizards && ENV=dev npm run pack-wizards && ENV=dev npm run prepare-statics && ENV=dev npm run pack-statics",

mrCherry97 · 2024-09-04T11:48:07Z

kyma/package.json

+{
+  "name": "kyma-dashboard",
+  "version": "1.0.0",
+  "description": "",


Suggested change

"description": "",

mrCherry97 · 2024-09-04T11:51:31Z

kyma/environments/dev/env.sh

+export WEB_IMAGE=v20240808-1bae12fe
+export BACKEND_IMAGE=v20240719-f64157c5
+export LOCAL_IMAGE=v20240808-1bae12fe


probably that's unnecessary with this flow

Dockerfile.local.kyma

mrCherry97 · 2024-09-04T11:55:05Z

kyma/.gitignore

@@ -0,0 +1,5 @@
+build


Suggested change

build

mrCherry97 · 2024-09-05T06:30:51Z

kyma/Makefile

+prepare-all-dev:
+	npm run prepare-extensibility-dev
+	ENV=dev make copy-config
+prepare-all-stage:
+	npm run prepare-extensibility-stage
+	ENV=stage make copy-config
+prepare-all-prod:
+	npm run prepare-extensibility-prod
+	ENV=prod make copy-config


I'll suggest to rename it, because prepare-all is suggesting, that after running this command, I have busola running, but it's only for whole configuration (extensibility + config)

Suggested change

prepare-all-dev:

npm run prepare-extensibility-dev

ENV=dev make copy-config

prepare-all-stage:

npm run prepare-extensibility-stage

ENV=stage make copy-config

prepare-all-prod:

npm run prepare-extensibility-prod

ENV=prod make copy-config

prepare-configuration-dev:

npm run prepare-extensibility-dev

ENV=dev make copy-config

prepare-configuration-stage:

npm run prepare-extensibility-stage

ENV=stage make copy-config

prepare-configuration-prod:

npm run prepare-extensibility-prod

ENV=prod make copy-config

mrCherry97 · 2024-09-05T06:32:56Z

kyma/extensions/modules/api-gateway-regular.yaml

@@ -0,0 +1,113 @@
+apiVersion: operator.kyma-project.io/v1beta2
+kind: ModuleTemplate


I don't think that these files are currently necessary, because it's only for testing part, and should be in tests directory.

Now I moved them to tests/kyma. Then those files will be adjusted when adding integration tests

mrCherry97 · 2024-09-05T06:33:06Z

kyma/extensions/modules/eventing-fast.yaml

@@ -0,0 +1,116 @@
+apiVersion: operator.kyma-project.io/v1beta2
+kind: ModuleTemplate


mrCherry97 · 2024-09-05T06:33:12Z

kyma/extensions/modules/eventing-regular.yaml

@@ -0,0 +1,116 @@
+apiVersion: operator.kyma-project.io/v1beta2
+kind: ModuleTemplate


mrCherry97

LGTM

kyma-bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Sep 2, 2024

kyma-bot added cla: yes Indicates the PR's author has signed the CLA. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Sep 2, 2024

dbadura marked this pull request as ready for review September 2, 2024 14:40

dbadura requested review from akucharska, mrCherry97, chriskari and OliwiaGowor as code owners September 2, 2024 14:40

kyma-bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Sep 2, 2024

dbadura changed the title ~~Add Kyma config from kyma-dashboard~~ feat: Add Kyma config from kyma-dashboard Sep 2, 2024

dbadura added 4 commits September 3, 2024 11:45

initial impl

0951085

test github actions

a9e511a

add separate build job for kyma busola version

6d73211

fix name

79a17c6

dbadura force-pushed the kyma-config branch from 2464bd5 to 79a17c6 Compare September 3, 2024 09:46

dbadura added 3 commits September 3, 2024 11:56

small cleanup of dockerfiles

ea27ae9

remove unused code

31019a3

use kyma as directory

0661a17

mrCherry97 requested changes Sep 4, 2024

View reviewed changes

kyma-bot assigned mrCherry97 Sep 4, 2024

dbadura added 2 commits September 4, 2024 15:29

adjustment after review

c32944e

Merge branch 'main' into kyma-config

9a39e52

dbadura mentioned this pull request Sep 4, 2024

feat: Add kyma dashboard build jobs #3329

Closed

4 tasks

dbadura linked an issue Sep 4, 2024 that may be closed by this pull request

Move Kyma-dashboard to busola #3298

Open

11 tasks

dbadura removed a link to an issue Sep 4, 2024

Move Kyma-dashboard to busola #3298

Open

11 tasks

mrCherry97 requested changes Sep 5, 2024

View reviewed changes

adjustment after review

b141141

mrCherry97 reviewed Sep 5, 2024

View reviewed changes

akucharska approved these changes Sep 5, 2024

View reviewed changes

kyma-bot assigned akucharska Sep 5, 2024

kyma-bot added the lgtm Looks good to me! label Sep 5, 2024

mrCherry97 approved these changes Sep 5, 2024

View reviewed changes

mrCherry97 merged commit 4d280f5 into kyma-project:main Sep 5, 2024
12 checks passed

dbadura deleted the kyma-config branch September 5, 2024 13:07

dbadura mentioned this pull request Sep 12, 2024

Move Kyma-dashboard to busola #3298

Open

11 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: Add Kyma config from kyma-dashboard #3321

feat: Add Kyma config from kyma-dashboard #3321

dbadura commented Sep 2, 2024 •

edited

Loading

kyma-bot commented Sep 2, 2024

mrCherry97 left a comment

mrCherry97 Sep 4, 2024

mrCherry97 Sep 4, 2024

mrCherry97 Sep 4, 2024

dbadura Sep 4, 2024

mrCherry97 Sep 4, 2024

mrCherry97 Sep 4, 2024

mrCherry97 Sep 4, 2024

mrCherry97 Sep 4, 2024

mrCherry97 Sep 4, 2024

mrCherry97 Sep 5, 2024

mrCherry97 Sep 5, 2024

dbadura Sep 5, 2024

mrCherry97 Sep 5, 2024

mrCherry97 Sep 5, 2024

mrCherry97 left a comment

	"prepare-all-dev": "ENV=dev npm run prepare-extensions && ENV=dev npm run pack-extensions && ENV=dev npm run prepare-wizards && ENV=dev npm run pack-wizards && ENV=dev npm run prepare-statics && ENV=dev npm run pack-statics",
	"prepare-extensibility-dev": "ENV=dev npm run prepare-extensions && ENV=dev npm run pack-extensions && ENV=dev npm run prepare-wizards && ENV=dev npm run pack-wizards && ENV=dev npm run prepare-statics && ENV=dev npm run pack-statics",

		@@ -0,0 +1,113 @@
		apiVersion: operator.kyma-project.io/v1beta2
		kind: ModuleTemplate

		@@ -0,0 +1,116 @@
		apiVersion: operator.kyma-project.io/v1beta2
		kind: ModuleTemplate

feat: Add Kyma config from kyma-dashboard #3321

feat: Add Kyma config from kyma-dashboard #3321

Conversation

dbadura commented Sep 2, 2024 • edited Loading

kyma-bot commented Sep 2, 2024

mrCherry97 left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mrCherry97 left a comment

Choose a reason for hiding this comment

dbadura commented Sep 2, 2024 •

edited

Loading