PR for Building sm-integration Branch

.gitignore

@@ -43,4 +43,205 @@ vendor/**
 
 /vendor
 
-debug.sh
+debug.sh
+
+
+/fake
+/node_modules
+
+.DS_STORE
+node_modules
+scripts/flow/*/.flowconfig
+.flowconfig
+*~
+*.pyc
+.grunt
+_SpecRunner.html
+__benchmarks__
+build/
+remote-repo/
+coverage/
+.module-cache
+fixtures/dom/public/react-dom.js
+fixtures/dom/public/react.js
+test/the-files-to-test.generated.js
+*.log*
+chrome-user-data
+*.sublime-project
+*.sublime-workspace
+.idea
+*.iml
+.vscode
+*.swp
+*.swo
+
+packages/react-devtools-core/dist
+packages/react-devtools-extensions/chrome/build
+packages/react-devtools-extensions/chrome/*.crx
+packages/react-devtools-extensions/chrome/*.pem
+packages/react-devtools-extensions/firefox/build
+packages/react-devtools-extensions/firefox/*.xpi
+packages/react-devtools-extensions/firefox/*.pem
+packages/react-devtools-extensions/shared/build
+packages/react-devtools-extensions/.tempUserDataDir
+packages/react-devtools-inline/dist
+packages/react-devtools-shell/dist
+packages/react-devtools-timeline/dist
+
+
+# compiled output
+/dist
+/tmp
+/out-tsc
+
+# Runtime vm
+pids
+*.pid
+*.seed
+*.pid.lock
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+
+# nyc test coverage
+.nyc_output
+
+# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# Bower dependency directory (https://bower.io/)
+bower_components
+
+# node-waf configuration
+.lock-wscript
+
+# IDEs and editors
+.idea
+.project
+.classpath
+.c9/
+*.launch
+.settings/
+*.sublime-workspace
+
+# IDE - VSCode
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+
+# misc
+.sass-cache
+connect.lock
+typings
+
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+
+
+# Dependency directories
+node_modules/
+jspm_packages/
+
+# Optional npm cache directory
+.npm
+
+# Optional eslint cache
+.eslintcache
+
+# Optional REPL history
+.node_repl_history
+
+# Output of 'npm pack'
+*.tgz
+
+# Yarn Integrity file
+.yarn-integrity
+
+# dotenv environment variables file
+.env
+
+# next.js build output
+.next
+
+# Lerna
+lerna-debug.log
+
+# System Files
+.DS_Store
+Thumbs.db
+
+node_modules/
+.node_modules/
+built/*
+tests/cases/rwc/*
+tests/cases/perf/*
+!tests/cases/webharness/compilerToString.js
+test-args.txt
+~*.docx
+\#*\#
+.\#*
+tests/baselines/local/*
+tests/baselines/local.old/*
+tests/services/baselines/local/*
+tests/baselines/prototyping/local/*
+tests/baselines/rwc/*
+tests/baselines/reference/projectOutput/*
+tests/baselines/local/projectOutput/*
+tests/baselines/reference/testresults.tap
+tests/services/baselines/prototyping/local/*
+tests/services/browser/typescriptServices.js
+src/harness/*.js
+src/compiler/diagnosticInformationMap.generated.ts
+src/compiler/diagnosticMessages.generated.json
+src/parser/diagnosticInformationMap.generated.ts
+src/parser/diagnosticMessages.generated.json
+rwc-report.html
+*.swp
+build.json
+*.actual
+tests/webTestServer.js
+tests/webTestServer.js.map
+tests/webhost/*.d.ts
+tests/webhost/webtsc.js
+tests/cases/**/*.js
+tests/cases/**/*.js.map
+*.config
+scripts/eslint/built/
+scripts/debug.bat
+scripts/run.bat
+scripts/**/*.js
+scripts/**/*.js.map
+coverage/
+**/.DS_Store
+.settings
+**/.vs
+**/.vscode/*
+!**/.vscode/tasks.json
+!**/.vscode/settings.template.json
+!**/.vscode/launch.template.json
+!**/.vscode/extensions.json
+!tests/cases/projects/projectOption/**/node_modules
+!tests/cases/projects/NodeModulesSearch/**/*
+!tests/baselines/reference/project/nodeModules*/**/*
+.idea
+yarn.lock
+yarn-error.log
+.parallelperf.*
+tests/baselines/reference/dt
+.failed-tests
+TEST-results.xml
+package-lock.json
+.eslintcache
+*v8.log
+/lib/
+
+/node_modules/

CODEOWNERS

@@ -3,3 +3,6 @@
 
 # Owners of all .md files in the repository
 *.md @kyma-project/technical-writers
+
+# Temporary owners of 09-10-ui.md
+/docs/contributor/09-10-ui.md @kyma-project/gopher

Dockerfile

@@ -1,3 +1,14 @@
+# Build UI static files
+FROM node:22.3.0 as ui-builder
+
+WORKDIR /btp-manager-workspace
+
+COPY ui/package.json ./
+RUN npm install
+
+COPY ui/ ./
+RUN npm run build
+
 # Build the manager binary
 FROM golang:1.23.0-alpine3.20 as builder
 
@@ -12,6 +23,9 @@ RUN go mod download
 # Copy the go source
 COPY . ./
 
+# Copy UI static files
+COPY --from=ui-builder /btp-manager-workspace/build ui/build
+
 # Build
 # the GOARCH has not a default value to allow the binary be built according to the host where the command
 # was called. For example, if we call make docker-build in a local env which has the Apple Silicon M1 SO

Makefile

@@ -69,7 +69,7 @@ generate: controller-gen ## Generate code containing DeepCopy, DeepCopyInto, and
 	$(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./..."
 
 .PHONY: test
-test: manifests kustomize generate fmt vet envtest ginkgo  test-docs ## Run tests.
+test: manifests kustomize generate ui-build fmt vet envtest ginkgo test-docs ## Run tests.
 	@. ./scripts/testing/set-env-vars.sh; \
 	go test -skip=TestAPIs ./... -timeout $(SUITE_TIMEOUT) -coverprofile cover.out -v; \
 	if [ "$(USE_EXISTING_CLUSTER)" == "true" ]; then $(GINKGO) controllers; else $(GINKGO) $(GINKGO_PARALLEL_FLAG) controllers; fi
@@ -192,10 +192,26 @@ go-lint-install: ## linter config in file at root of project -> '.golangci.yaml'
 	fi;
 
 .PHONY: go-lint
-go-lint: go-lint-install ## linter config in file at root of project -> '.golangci.yaml'
+go-lint: ui-build go-lint-install ## linter config in file at root of project -> '.golangci.yaml'
 	golangci-lint run --timeout=$(GOLINT_TIMEOUT)
 
 .PHONY: fix
 fix: go-lint-install ## try to fix automatically issues
 	go mod tidy
 	golangci-lint run --fix
+
+.PHONE: app
+app: ## Run the app
+	go run main.go
+
+.PHONY: ui
+ui: ## Run the ui
+	cd ui && npm install && npm start
+
+.PHONE: webapp
+webapp: ## Run App and UI
+	 @$(MAKE) -j ui app
+
+.PHONY: ui-build
+ui-build: ## Build the UI
+	cd ui && npm install && npm run build

config/manager/manager.yaml

@@ -28,9 +28,20 @@ spec:
         - --leader-elect
         image: controller:latest
         name: manager
+        env:
+        - name: API_PORT
+          value: "8080"
+        - name: API_READ_TIMEOUT
+          value: "30s"
+        - name: API_WRITE_TIMEOUT
+          value: "90s"
+        - name: API_IDLE_TIMEOUT
+          value: "120s"
         ports:
         - name: http
           containerPort: 8080
+        - name: metrics
+          containerPort: 9090
         securityContext:
           allowPrivilegeEscalation: false
           capabilities:

controllers/btpoperator_controller.go

@@ -107,7 +107,7 @@ var (
 		Version: btpOperatorApiVer,
 		Kind:    btpOperatorServiceBinding,
 	}
-	instanceGvk = schema.GroupVersionKind{
+	InstanceGvk = schema.GroupVersionKind{
 		Group:   btpOperatorGroup,
 		Version: btpOperatorApiVer,
 		Kind:    btpOperatorServiceInstance,
@@ -749,7 +749,7 @@ func (r *BtpOperatorReconciler) handleDeleting(ctx context.Context, cr *v1alpha1
 		if err != nil {
 			return err
 		}
-		numberOfInstances, err := r.numberOfResources(ctx, instanceGvk)
+		numberOfInstances, err := r.numberOfResources(ctx, InstanceGvk)
 		if err != nil {
 			return err
 		}
@@ -797,7 +797,7 @@ func (r *BtpOperatorReconciler) handleDeprovisioning(ctx context.Context, cr *v1
 		if err != nil {
 			return err
 		}
-		numberOfInstances, err := r.numberOfResources(ctx, instanceGvk)
+		numberOfInstances, err := r.numberOfResources(ctx, InstanceGvk)
 		if err != nil {
 			return err
 		}
@@ -894,13 +894,13 @@ func (r *BtpOperatorReconciler) handleHardDelete(ctx context.Context, namespaces
 		}
 	}
 
-	siCrdExists, err := r.crdExists(ctx, instanceGvk)
+	siCrdExists, err := r.crdExists(ctx, InstanceGvk)
 	if err != nil {
-		logger.Error(err, "while checking CRD existence", "GVK", instanceGvk.String())
+		logger.Error(err, "while checking CRD existence", "GVK", InstanceGvk.String())
 		errs = append(errs, err)
 	}
 	if siCrdExists {
-		if err := r.hardDelete(ctx, instanceGvk, namespaces); err != nil {
+		if err := r.hardDelete(ctx, InstanceGvk, namespaces); err != nil {
 			logger.Error(err, "while deleting Service Instances")
 			if !errors.Is(err, context.DeadlineExceeded) {
 				errs = append(errs, err)
@@ -931,7 +931,7 @@ func (r *BtpOperatorReconciler) handleHardDelete(ctx context.Context, namespaces
 		}
 
 		if siCrdExists {
-			siResourcesLeft, err = r.resourcesExist(ctx, namespaces, instanceGvk)
+			siResourcesLeft, err = r.resourcesExist(ctx, namespaces, InstanceGvk)
 			if err != nil {
 				logger.Error(err, "ServiceInstance leftover resources check failed")
 				hardDeleteSucceededCh <- false
@@ -1087,9 +1087,9 @@ func (r *BtpOperatorReconciler) handleSoftDelete(ctx context.Context, namespaces
 		return err
 	}
 
-	siCrdExists, err := r.crdExists(ctx, instanceGvk)
+	siCrdExists, err := r.crdExists(ctx, InstanceGvk)
 	if err != nil {
-		logger.Error(err, "while checking CRD existence", "GVK", instanceGvk.String())
+		logger.Error(err, "while checking CRD existence", "GVK", InstanceGvk.String())
 		return err
 	}
 
@@ -1107,11 +1107,11 @@ func (r *BtpOperatorReconciler) handleSoftDelete(ctx context.Context, namespaces
 
 	if siCrdExists {
 		logger.Info("Removing finalizers in Service Instances")
-		if err := r.softDelete(ctx, instanceGvk); err != nil {
+		if err := r.softDelete(ctx, InstanceGvk); err != nil {
 			logger.Error(err, "while deleting Service Instances")
 			return err
 		}
-		if err := r.ensureResourcesDontExist(ctx, instanceGvk); err != nil {
+		if err := r.ensureResourcesDontExist(ctx, InstanceGvk); err != nil {
 			logger.Error(err, "Service Instances still exist")
 			return err
 		}

controllers/btpoperator_controller_cr_rotation_test.go

@@ -110,8 +110,8 @@ var _ = Describe("BTP Operator CR leader replacement", func() {
 				Eventually(func() error { return k8sClient.Create(ctx, btpOperator1) }).WithTimeout(k8sOpsTimeout).WithPolling(k8sOpsPollingInterval).Should(Succeed())
 				Eventually(updateCh).Should(Receive(matchState(v1alpha1.StateReady)))
 
-				siUnstructured := createResource(instanceGvk, kymaNamespace, instanceName)
-				ensureResourceExists(instanceGvk)
+				siUnstructured := createResource(InstanceGvk, kymaNamespace, instanceName)
+				ensureResourceExists(InstanceGvk)
 
 				sbUnstructured := createResource(bindingGvk, kymaNamespace, bindingName)
 				ensureResourceExists(bindingGvk)