Merge remote-tracking branch 'os-origin/main' into include_schema-files

joergdw · joergdw · commit 0fd2b4dbc616 · 2025-12-17T04:50:11.000+01:00
diff --git a/.final_builds/jobs/golangapiserver/index.yml b/.final_builds/jobs/golangapiserver/index.yml
@@ -443,6 +443,10 @@ builds:
     version: fd29f7953404544ccd5bec4c1fb03d270f47a4dbe541206baa3c11fe60654ca0
     blobstore_id: addf472c-e249-489b-63a7-ac01f433b82f
     sha1: sha256:c51f443c91ae051f26c2c716d58d31ca961bee6a611ba596a3a7cb84df79d901
+  fd34b8cc7b798ab66a56afd6b8a6211d6dc8995412a3cd981ae95a896d131281:
+    version: fd34b8cc7b798ab66a56afd6b8a6211d6dc8995412a3cd981ae95a896d131281
+    blobstore_id: 7a02b9fb-05d2-4bc9-7beb-44d567076df4
+    sha1: sha256:94e15a4c17a148ba03cec50f2bd2ee1fb41588d30b734796771561b89ea3ceb5
   fff77f20c190267b6a0433ce1e6b7a1073089c778521da7b31a99d16f5b488eb:
     version: fff77f20c190267b6a0433ce1e6b7a1073089c778521da7b31a99d16f5b488eb
     blobstore_id: 6c73cb7c-3084-45cf-7130-77548f0bb74f
diff --git a/.final_builds/packages/db/index.yml b/.final_builds/packages/db/index.yml
@@ -51,6 +51,10 @@ builds:
     version: 288c50aaff41b911e49e9fcab9fcbf80850f7c42c4d93a363e279194a72aa197
     blobstore_id: 5cb8fbf8-30ac-42f0-7480-f62cc607166c
     sha1: sha256:4531cd0463e9f14393cf6a2a74a8837761b93059da5b008e4a262d351bb1c2c2
+  2b12838bbe79e36dfba671502c67758c110dbd3bdcb5d51312cacc5069b0ceda:
+    version: 2b12838bbe79e36dfba671502c67758c110dbd3bdcb5d51312cacc5069b0ceda
+    blobstore_id: 98aee91d-34f4-4a42-5e74-40561a3f1ca5
+    sha1: sha256:7825c36e4b72a9da2b3b5877ae91d06025aee28fcb952e4bca2c6d477b72b82e
   30314772b27e47ea89fdddafc21b9f2ba058c24c5631c280e19c182153d6d162:
     version: 30314772b27e47ea89fdddafc21b9f2ba058c24c5631c280e19c182153d6d162
     blobstore_id: 5e327315-ff0e-41f0-688b-ea6bebf3b128
diff --git a/.final_builds/packages/eventgenerator/index.yml b/.final_builds/packages/eventgenerator/index.yml
@@ -239,6 +239,10 @@ builds:
     version: b698f91cf6af549c897eeaba53bac09970e0e87f357576c17adaf77a3d10de34
     blobstore_id: 5d40124b-c647-4ed1-5a4f-21e96e446eef
     sha1: sha256:1d494b03cd92f6fa454b018bc9566403186988e37d14913cf26c8b70ef14b713
+  b791a2464abc114243b9da3b8010079730263e4475bffb029d8bd7fe2f30da3e:
+    version: b791a2464abc114243b9da3b8010079730263e4475bffb029d8bd7fe2f30da3e
+    blobstore_id: a626118a-5ca1-49dd-6877-0d5067f82a01
+    sha1: sha256:cbfc122a2b4af35d3de7615d570802c49a6c7d803994731317e6482f53c11fcf
   b9616b57da8702013d7bbeac418c345bcc5d2ad82d08d04520fc9525ca423b18:
     version: b9616b57da8702013d7bbeac418c345bcc5d2ad82d08d04520fc9525ca423b18
     blobstore_id: 9e8b6544-e7cf-42f9-5605-fc94491da179
diff --git a/.final_builds/packages/golangapiserver/index.yml b/.final_builds/packages/golangapiserver/index.yml
@@ -187,6 +187,10 @@ builds:
     version: 74f48f389d30c932227cf4c569335917541fc756ae26657278e982b81e600952
     blobstore_id: 1ab352c9-99c0-4ae0-4ac4-8aa225df839c
     sha1: sha256:5137abd02ba0d78f5d2d0f8cd72fe14a25a0c41491052f9abb49ed01e1dfd76b
+  7c3ffb35e8aeef3da3c5ba76b341e7ec88c4d503c42e86e0649d149a55637882:
+    version: 7c3ffb35e8aeef3da3c5ba76b341e7ec88c4d503c42e86e0649d149a55637882
+    blobstore_id: 42fae7cb-8a3e-4a61-6b5b-5ee534e1bab9
+    sha1: sha256:7dbf1742c3c8d3755b5f29b12bbd198d212ab083bd902971adde740bccb373e9
   7da38111f2c869501990152d8df08e1452f8934ea42d05823636ccb74f3089fb:
     version: 7da38111f2c869501990152d8df08e1452f8934ea42d05823636ccb74f3089fb
     blobstore_id: bc78305d-e4b2-4dd8-6350-0cddec20efdd
diff --git a/.final_builds/packages/metricsforwarder/index.yml b/.final_builds/packages/metricsforwarder/index.yml
@@ -59,6 +59,10 @@ builds:
     version: 228d9a4aba7cc8fb4286d1222a5273c37f596c95c2e6282322ac3b2130fbcaef
     blobstore_id: 686d19a2-ef39-4048-5ddf-b27bb2d0a3da
     sha1: sha256:e885334994baaf23ab04516f5711663f33253d50d095b8b4653e28dfd3ee929f
+  254f74d717eda27866d4f7b5f7b7b59f451180eb7f848af5552b4f6b79202d2b:
+    version: 254f74d717eda27866d4f7b5f7b7b59f451180eb7f848af5552b4f6b79202d2b
+    blobstore_id: 1b35e345-9b51-4909-7111-21c19a8de8ea
+    sha1: sha256:ff2245a76f4fb84305c68cf050678218040102552cd232eb221f116a7db778be
   25ca7216c2916f8ec98b13d9ece3ffb791a2ec79b70a42cf9a7b638cf7f168ab:
     version: 25ca7216c2916f8ec98b13d9ece3ffb791a2ec79b70a42cf9a7b638cf7f168ab
     blobstore_id: 942555ed-bebb-4fcb-64fa-d2d52f9d4e32
diff --git a/.final_builds/packages/operator/index.yml b/.final_builds/packages/operator/index.yml
@@ -155,6 +155,10 @@ builds:
     version: 6aaf1adbe6e250c50c17c574067f7581ad4768aac20b6aed7fc3acfc9ea728ed
     blobstore_id: 30f63976-f5a1-426a-4a91-c93e62c4b614
     sha1: sha256:d4e6788b10e2a368d0879a41b1c823e923967628f492c24456b91936e9fa912b
+  6c65b5a286c4ecf065928ba7b0427fb8445292415ce1b0333bee1922e94a4c75:
+    version: 6c65b5a286c4ecf065928ba7b0427fb8445292415ce1b0333bee1922e94a4c75
+    blobstore_id: 1924ab4a-8218-4e00-6d54-129fc0468672
+    sha1: sha256:aad1e68632f96bc9264123925c6d00020afce94719cf2e44de3a5fa9f20d38a1
   70644affcaea6a0e160c8d111ba68febad50d9069a8d22b310379016bedc0d37:
     version: 70644affcaea6a0e160c8d111ba68febad50d9069a8d22b310379016bedc0d37
     blobstore_id: 8c097df0-755c-470d-646a-ae27e3cae8a8
diff --git a/.final_builds/packages/scalingengine/index.yml b/.final_builds/packages/scalingengine/index.yml
@@ -327,6 +327,10 @@ builds:
     version: e03c360f936b5ec6394b07e8afef8949fd2ee989f32f53623cc44cd81a19e1d3
     blobstore_id: 4d9031ec-fea1-4f5b-5bbc-e7f9e31aa59b
     sha1: sha256:6f127191b29b2029b5f25f2db7a9fe586827e43bf884710efe77751470a51eb2
+  e34116ab0d731cecb08d658c86f09173a56ed05a7860a4846988a01fac988555:
+    version: e34116ab0d731cecb08d658c86f09173a56ed05a7860a4846988a01fac988555
+    blobstore_id: ab0337c4-4d25-438d-48a2-47bff6cf7ea5
+    sha1: sha256:972c684e1bdd1b5807e66dec8c9b03bc0ecfca05735aedbfe46b60b7ef90158a
   e3a196b3b8ae4247ce5acb3fb70266ae4169d5746e9e89c60568d65bde3e4823:
     version: e3a196b3b8ae4247ce5acb3fb70266ae4169d5746e9e89c60568d65bde3e4823
     blobstore_id: a5a8c9f5-3b8d-40c0-5b26-76149debb3ca
diff --git a/.final_builds/packages/scheduler/index.yml b/.final_builds/packages/scheduler/index.yml
@@ -251,6 +251,10 @@ builds:
     version: 8b88ca4fbde69e2516fc40921afb6edff62c32feee6563655abd973cdbcbb0ec
     blobstore_id: ef681c4b-327e-4d92-4343-eb15fd429bae
     sha1: sha256:1ebd3df066e43732ae5893f927805ae82b88831375f0cba4d3ff3054f7677416
+  8e3c23c9da3dc76447a99f1321a40d533124adb5c8f0f3f93898d4ca8b5ad3e6:
+    version: 8e3c23c9da3dc76447a99f1321a40d533124adb5c8f0f3f93898d4ca8b5ad3e6
+    blobstore_id: e1eaf7b9-ae35-4ce3-633d-292e6c62f1e7
+    sha1: sha256:494cd86b8aa8619df2ad470295ec83bc5524a90ce3af94a4b822a81b86769bd0
   8e793d31ceda962a97c3130b9de925262c9942e1838ee7c1ed6a6667ad3c7f23:
     version: 8e793d31ceda962a97c3130b9de925262c9942e1838ee7c1ed6a6667ad3c7f23
     blobstore_id: 1d7c4bdd-d055-4adf-4e18-efd93b92858b
diff --git a/.github/workflows/update-autoscaler-submodule.yaml b/.github/workflows/update-autoscaler-submodule.yaml
@@ -4,7 +4,6 @@ name: Update Autoscaler Submodule
 on:
   repository_dispatch:
     types: [autoscaler-release-published]
-  workflow_dispatch:
 
 permissions:
   contents: write
diff --git a/ci/autoscaler/pipeline.yml b/ci/autoscaler/pipeline.yml
@@ -371,6 +371,7 @@ jobs:
       AUTOSCALER_CI_BOT_EMAIL: ApplicationAutoscaler@sap.com
       AUTOSCALER_CI_BOT_SIGNING_KEY_PRIVATE: ((autoscaler-ci-bot-signing-key-private))
       AUTOSCALER_CI_BOT_SIGNING_KEY_PUBLIC: ((autoscaler-ci-bot-signing-key-public))
+      AUTOSCALER_CI_BOT_SSH_KEY: ((autoscaler-deploy-key-private))
   - put: release-bucket
     params:
       file: "build/artifacts/app-autoscaler-v*.tgz"
diff --git a/ci/autoscaler/scripts/release-autoscaler.sh b/ci/autoscaler/scripts/release-autoscaler.sh
@@ -113,7 +113,7 @@ function upload_assets_and_promote(){
   gh release edit "${VERSION}" --notes-file "${build_path}/changelog.md"
 
   echo " - Publishing release ${VERSION}..."
-  gh release edit "${VERSION}" --draft=false --target="v${VERSION}"
+  gh release edit "${VERSION}" --draft=false --tag="v${VERSION}"
   echo " - Release ${VERSION} published successfully!"
 }
 
@@ -126,6 +126,27 @@ function setup_git(){
     git config --global user.name "${AUTOSCALER_CI_BOT_NAME}"
   fi
 
+  # Add GitHub's SSH host keys to known_hosts to avoid interactive prompt
+  mkdir -p ~/.ssh
+  ssh-keyscan -t ed25519,rsa github.com >> ~/.ssh/known_hosts 2>/dev/null
+
+  # Setup SSH authentication key for GitHub pushes
+  if [ -n "${AUTOSCALER_CI_BOT_SSH_KEY:-}" ]; then
+    ssh_auth_key_path="${keys_path}/autoscaler-ci-bot-ssh-key"
+    echo "$AUTOSCALER_CI_BOT_SSH_KEY" > "${ssh_auth_key_path}"
+    chmod 600 "${ssh_auth_key_path}"
+
+    # Configure SSH to use this key for GitHub
+    cat >> ~/.ssh/config <<EOF
+Host github.com
+  HostName github.com
+  User git
+  IdentityFile ${ssh_auth_key_path}
+  IdentitiesOnly yes
+EOF
+    chmod 600 ~/.ssh/config
+  fi
+
   public_key_path="${keys_path}/autoscaler-ci-bot-signing-key.pub"
   private_key_path="${keys_path}/autoscaler-ci-bot-signing-key"
   echo "$AUTOSCALER_CI_BOT_SIGNING_KEY_PUBLIC" > "${public_key_path}"
@@ -166,7 +187,20 @@ pushd "${autoscaler_dir}" > /dev/null
   if [ "${CI}" = "true" ]; then
     echo " - Creating and pushing tag v${VERSION}..."
     git tag -s -m "Release v${VERSION}" "v${VERSION}"
+
+    echo " - Fetching latest changes from remote..."
+    git fetch origin main
+
+    echo " - Checking out main branch..."
+    git checkout -B main
+
+    echo " - Rebasing local changes on top of remote..."
+    git rebase origin/main
+
+    echo " - Pushing to main branch..."
     git push origin main
+
+    echo " - Pushing tag..."
     git push origin "v${VERSION}"
   fi
 
diff --git a/ci/autoscaler/tasks/release-autoscaler.yml b/ci/autoscaler/tasks/release-autoscaler.yml
@@ -20,6 +20,9 @@ params:
   # the public part of the signing key from the ci-bot
   AUTOSCALER_CI_BOT_SIGNING_KEY_PUBLIC:
 
+  # the SSH key for GitHub authentication (push access)
+  AUTOSCALER_CI_BOT_SSH_KEY:
+
   # if set to false, the bosh release will be skipped and only the changelog & next version generated
   PERFORM_BOSH_RELEASE: true
   CI: true
diff --git a/jobs/golangapiserver/spec b/jobs/golangapiserver/spec
@@ -95,7 +95,7 @@ properties:
     default: "Autoscaler"
   autoscaler.apiserver.info.build:
     description: "Autoscaler application build number"
-    default: "15.12.0"
+    default: "15.12.1"
   autoscaler.apiserver.info.support_url:
     description: "Autoscaler application support page URL"
     default: "https://github.com/cloudfoundry/app-autoscaler-release"
diff --git a/releases/app-autoscaler/app-autoscaler-15.12.1.yml b/releases/app-autoscaler/app-autoscaler-15.12.1.yml
@@ -0,0 +1,132 @@
+name: app-autoscaler
+version: 15.12.1
+commit_hash: f6597b0ad
+uncommitted_changes: false
+jobs:
+- name: eventgenerator
+  version: 5746692409f6dba1195e1c8f0ec6aa505208b20a566abf3470f5e4897cf12ca1
+  fingerprint: 5746692409f6dba1195e1c8f0ec6aa505208b20a566abf3470f5e4897cf12ca1
+  sha1: sha256:397b8d053060435209778615e218f85bb9bc032fb760a4776f31cc542bfdc68e
+  packages:
+  - openjdk-21
+  - db
+  - eventgenerator
+  - common
+  - changeloglockcleaner
+- name: golangapiserver
+  version: fd34b8cc7b798ab66a56afd6b8a6211d6dc8995412a3cd981ae95a896d131281
+  fingerprint: fd34b8cc7b798ab66a56afd6b8a6211d6dc8995412a3cd981ae95a896d131281
+  sha1: sha256:94e15a4c17a148ba03cec50f2bd2ee1fb41588d30b734796771561b89ea3ceb5
+  packages:
+  - golang-1-linux
+  - golangapiserver
+  - db
+  - openjdk-21
+  - common
+  - changeloglockcleaner
+- name: metricsforwarder
+  version: 41b12c8dcc3a4d7f57c7f190c13d0fcb78f0ed88c12f3b7f7df849dd02eb38f7
+  fingerprint: 41b12c8dcc3a4d7f57c7f190c13d0fcb78f0ed88c12f3b7f7df849dd02eb38f7
+  sha1: sha256:1ed008b40ffe634eb70ba8c6b2ea6571a368705ace7c5b7daa82484e7f3da761
+  packages:
+  - db
+  - metricsforwarder
+  - common
+- name: operator
+  version: 590352b3c73a3660efc1563bfaa2e856ee8fbb31a6b69ec07dda9a9332b4c7af
+  fingerprint: 590352b3c73a3660efc1563bfaa2e856ee8fbb31a6b69ec07dda9a9332b4c7af
+  sha1: sha256:299e7e483167bc89ab1d0ec33bf8470e12343c726a79037d63a99685e4233bbb
+  packages:
+  - operator
+  - common
+  - db
+  - openjdk-21
+  - changeloglockcleaner
+- name: scalingengine
+  version: fc813c72ca83fb8f9d3a3ab4ecee7bffbf8375498ae92e1a3da33b317fbe2b3a
+  fingerprint: fc813c72ca83fb8f9d3a3ab4ecee7bffbf8375498ae92e1a3da33b317fbe2b3a
+  sha1: sha256:8884593ad3fe0566c02e1bbf4f156c3a1f51fa19fb70380972da0e1fc0abf33f
+  packages:
+  - openjdk-21
+  - db
+  - scalingengine
+  - common
+  - changeloglockcleaner
+- name: scheduler
+  version: cd17cd58f63018f7e1a3c3dffbe02dd18992776df7d7733c76b187cfef9d3290
+  fingerprint: cd17cd58f63018f7e1a3c3dffbe02dd18992776df7d7733c76b187cfef9d3290
+  sha1: sha256:fb689c21413ca00fc3bba7f48e17979c0bbcd95d66dc5d8b018b95d53ee59590
+  packages:
+  - scheduler
+  - db
+  - openjdk-21
+  - common
+  - changeloglockcleaner
+packages:
+- name: changeloglockcleaner
+  version: 76c189e50c2517d62dfd8ebde4de65cb41ea929848f52299aa4a97443e099f03
+  fingerprint: 76c189e50c2517d62dfd8ebde4de65cb41ea929848f52299aa4a97443e099f03
+  sha1: sha256:deaaab75af819120120a38a1c3e92916fbd2a503e2c6382011424c2de699cc21
+  dependencies:
+  - golang-1-linux
+- name: common
+  version: c5672108ea00b3612f31da4ac566aa0535510b0bc88b390fd0a5c50693b2439e
+  fingerprint: c5672108ea00b3612f31da4ac566aa0535510b0bc88b390fd0a5c50693b2439e
+  sha1: sha256:0fcc907e0419bf0925679a559f3c8a76a9e8034958c8688c25748d9088350c4c
+  dependencies: []
+- name: db
+  version: 2b12838bbe79e36dfba671502c67758c110dbd3bdcb5d51312cacc5069b0ceda
+  fingerprint: 2b12838bbe79e36dfba671502c67758c110dbd3bdcb5d51312cacc5069b0ceda
+  sha1: sha256:7825c36e4b72a9da2b3b5877ae91d06025aee28fcb952e4bca2c6d477b72b82e
+  dependencies:
+  - openjdk-21
+- name: eventgenerator
+  version: b791a2464abc114243b9da3b8010079730263e4475bffb029d8bd7fe2f30da3e
+  fingerprint: b791a2464abc114243b9da3b8010079730263e4475bffb029d8bd7fe2f30da3e
+  sha1: sha256:cbfc122a2b4af35d3de7615d570802c49a6c7d803994731317e6482f53c11fcf
+  dependencies:
+  - golang-1-linux
+- name: golang-1-linux
+  version: e75c69bba41945ce0ae901b68cdcb641b624f373fb0f63f282acc8d138ca27d2
+  fingerprint: e75c69bba41945ce0ae901b68cdcb641b624f373fb0f63f282acc8d138ca27d2
+  sha1: sha256:8476732e43fe1e00bdddf854f1bc739e175e640933126df9eaa60e54006b2bb8
+  dependencies: []
+- name: golangapiserver
+  version: 7c3ffb35e8aeef3da3c5ba76b341e7ec88c4d503c42e86e0649d149a55637882
+  fingerprint: 7c3ffb35e8aeef3da3c5ba76b341e7ec88c4d503c42e86e0649d149a55637882
+  sha1: sha256:7dbf1742c3c8d3755b5f29b12bbd198d212ab083bd902971adde740bccb373e9
+  dependencies:
+  - golang-1-linux
+- name: metricsforwarder
+  version: 254f74d717eda27866d4f7b5f7b7b59f451180eb7f848af5552b4f6b79202d2b
+  fingerprint: 254f74d717eda27866d4f7b5f7b7b59f451180eb7f848af5552b4f6b79202d2b
+  sha1: sha256:ff2245a76f4fb84305c68cf050678218040102552cd232eb221f116a7db778be
+  dependencies:
+  - golang-1-linux
+- name: openjdk-21
+  version: e69ca983abed60c2e98bf0d46549f3970ce4e0659c2dd677d1574d5a3d26a4e7
+  fingerprint: e69ca983abed60c2e98bf0d46549f3970ce4e0659c2dd677d1574d5a3d26a4e7
+  sha1: sha256:1160b99b43e54e50c99c1a75209d069125149273f8c5e8e83a0c299f974f0b20
+  dependencies: []
+- name: operator
+  version: 6c65b5a286c4ecf065928ba7b0427fb8445292415ce1b0333bee1922e94a4c75
+  fingerprint: 6c65b5a286c4ecf065928ba7b0427fb8445292415ce1b0333bee1922e94a4c75
+  sha1: sha256:aad1e68632f96bc9264123925c6d00020afce94719cf2e44de3a5fa9f20d38a1
+  dependencies:
+  - golang-1-linux
+- name: scalingengine
+  version: e34116ab0d731cecb08d658c86f09173a56ed05a7860a4846988a01fac988555
+  fingerprint: e34116ab0d731cecb08d658c86f09173a56ed05a7860a4846988a01fac988555
+  sha1: sha256:972c684e1bdd1b5807e66dec8c9b03bc0ecfca05735aedbfe46b60b7ef90158a
+  dependencies:
+  - golang-1-linux
+- name: scheduler
+  version: 8e3c23c9da3dc76447a99f1321a40d533124adb5c8f0f3f93898d4ca8b5ad3e6
+  fingerprint: 8e3c23c9da3dc76447a99f1321a40d533124adb5c8f0f3f93898d4ca8b5ad3e6
+  sha1: sha256:494cd86b8aa8619df2ad470295ec83bc5524a90ce3af94a4b822a81b86769bd0
+  dependencies:
+  - openjdk-21
+license:
+  version: 15eb386a0db48f190d29bd28058f5d0d6605f5acde7c6cfc6f014d57747e41f9
+  fingerprint: 15eb386a0db48f190d29bd28058f5d0d6605f5acde7c6cfc6f014d57747e41f9
+  sha1: sha256:6c7a834097b96efc340787fbe5876c1e366de0235def5e2b93fa016c8655535c
diff --git a/releases/app-autoscaler/index.yml b/releases/app-autoscaler/index.yml
@@ -89,6 +89,8 @@ builds:
     version: 14.1.0
   66e5289b-6c9e-4842-52c7-74c753bd9cc5:
     version: 11.4.1
+  673ed160-cba3-4ac2-7d53-3563be9d645d:
+    version: 15.12.1
   6c3ea2f6-7059-473f-77f2-42463b9722af:
     version: 7.0.0
   71482850-8e53-4ff2-7757-60595ef562d1:
