Merge branch '887-enable-scheduler-via-mtar' into 885-enable-scalingengine-via-mtar

Author: bonzofenix

.github/workflows/java-ci-lint.yaml

@@ -36,7 +36,7 @@ jobs:
 
       - name: Checkstyle
         run: |
-          pushd src/scheduler
+          pushd src/autoscaler/scheduler
             mvn --no-transfer-progress jxr:jxr
             mvn --no-transfer-progress checkstyle:checkstyle
           popd

.gitignore

@@ -85,3 +85,5 @@ keys/
 /result-*
 
 .direnv
+
+**/.claude

.sonarcloud.properties

@@ -1 +1,2 @@
 sonar.exclusions=spec/**
+sonar.cpd.exclusions=**/*.sql

Makefile

@@ -7,7 +7,7 @@ autoscaler-dir := ./src/autoscaler
 changelog-dir := ./src/changelog
 changeloglockcleaner-dir := ./src/changeloglockcleaner
 db-dir := ./src/db
-scheduler-dir := ./src/scheduler
+scheduler-dir := ./src/autoscaler/scheduler
 test-app-dir := ${acceptance-dir}/assets/app/go_app
 
 # 🚧 To-do: Remove me!
@@ -79,12 +79,12 @@ clean-autoscaler:
 	@make --directory='${autoscaler-dir}' clean
 clean-scheduler:
 	@echo " - cleaning scheduler test resources"
-	@rm -rf src/scheduler/src/test/resources/certs
-	@rm -rf src/scheduler/target
+	@rm -rf ${scheduler-dir}/src/test/resources/certs
+	@rm -rf ${scheduler-dir}/target
 clean-certs:
 	@echo " - cleaning test certs"
 	@rm -f test-certs/*
-	@rm --force --recursive src/scheduler/src/test/resources/certs
+	@rm --force --recursive ${scheduler-dir}/src/test/resources/certs
 clean-bosh-release:
 	@echo " - cleaning bosh dev releases"
 	@rm -rf dev_releases
@@ -95,7 +95,6 @@ clean-acceptance:
 	@rm -rf src/acceptance/results &> /dev/null || true
 
 
-
 .PHONY: build_all build_programs build_tests
 build_all: build_programs build_tests
 build_programs: autoscaler.build db.java-libs scheduler.build build-test-app
@@ -152,15 +151,18 @@ $(addprefix test_,$(go_modules)):
 
 
 .PHONY: test-certs
-test-certs: target/autoscaler_test_certs src/scheduler/src/test/resources/certs
+test-certs: target/autoscaler_test_certs ${scheduler-dir}/src/test/resources/certs
+
+
 target/autoscaler_test_certs:
 	@./scripts/generate_test_certs.sh
 	@touch $@
-src/scheduler/src/test/resources/certs:
-	@./src/scheduler/scripts/generate_unit_test_certs.sh
+${scheduler-dir}/src/test/resources/certs:
+	@./${scheduler-dir}/scripts/generate_unit_test_certs.sh
+
 
 
-.PHONY: test test-autoscaler test-scheduler test-changelog test-changeloglockcleaner
+.PHONY: test test-autoscaler test-changelog test-changeloglockcleaner
 test: test-autoscaler scheduler.test test-changelog test-changeloglockcleaner test-acceptance-unit ## Run all unit tests
 test-autoscaler: check-db_type init-db test-certs
 	@echo ' - using DBURL=${DBURL} TEST=${TEST}'
@@ -457,10 +459,7 @@ cleanup-autoscaler-deployments:
 
 .PHONY: cf-login
 cf-login:
-	@echo '⚠️ Please note that this login only works for cf and concourse,' \
-		  'in spite of performing a login as well on bosh and credhub.' \
-		  'The necessary changes to the environment get lost when make exits its process.'
-	@${CI_DIR}/autoscaler/scripts/os-infrastructure-login.sh
+	make --directory='${autoscaler-dir}' cf-login
 
 .PHONY: uaa-login
 uaa-login: ## Login to OSS CF dev environment

ci/autoscaler/scripts/deploy-apps.sh

@@ -11,6 +11,7 @@ bosh_login "${BBL_STATE_PATH}"
 function deploy() {
 	log "Deploying autoscaler apps for bosh deployment '${deployment_name}' "
 	pushd "${autoscaler_dir}/src/autoscaler" > /dev/null
+
 		make mta-deploy
 	popd > /dev/null
 }

jobs/scheduler/spec

@@ -148,11 +148,6 @@ properties:
   autoscaler.scheduler.health.password:
     description: "the password to protect the health endpoint"
     default: ''
-  autoscaler.scheduler.health.unprotected_endpoints:
-    description: |
-      List of all health-endpoints, that run _without_ basic access authentication.
-      Valid endpoints are /health/liveness, /health/prometheus
-    default: [] # protect everything
   autoscaler.changeloglock_timeout_seconds:
     default: 180
     description: "Liquibase changelog lock timeout duration in seconds"

jobs/scheduler/templates/scheduler.yml.erb

@@ -158,7 +158,6 @@ scheduler:
     port: <%=p('autoscaler.scheduler.health.port') %>
     username: "<%=p('autoscaler.scheduler.health.username') %>"
     basicAuthEnabled: <%=p('autoscaler.scheduler.health.basicAuthEnabled') %>
-    unprotected_endpoints: <%=p('autoscaler.scheduler.health.unprotected_endpoints') %>
 ############################################################
 #    Server SSL keys
 ############################################################

operations/use-cf-services.yml

@@ -65,4 +65,8 @@
 
 ## ScalingEngine - remove scalingengine
 - type: remove
-  path: /instance_groups/name=scalingengine
+  path: /instance_groups/name=scalingengine
+
+## SCHEDULER - remove scheduler
+- type: remove
+  path: /instance_groups/name=scheduler

packages/scheduler/packaging

@@ -1,5 +1,5 @@
 # abort script on any command that exits with a non zero value
 set -e
 
-cp -R scheduler/db ${BOSH_INSTALL_TARGET}
-cp scheduler/target/scheduler-*.war ${BOSH_INSTALL_TARGET}
+cp -R autoscaler/scheduler/db ${BOSH_INSTALL_TARGET}
+cp autoscaler/scheduler/target/scheduler-*.war ${BOSH_INSTALL_TARGET}

packages/scheduler/spec

@@ -5,4 +5,4 @@ dependencies:
 - openjdk-21
 
 files:
-- scheduler/**/*
+- autoscaler/scheduler/**/*